#347

Author: mgramin

src/main/malewicz/package.json

@@ -27,7 +27,6 @@
     "vue-notification": "^1.3.16",
     "vue-router": "^3.0.1",
     "vue-sse": "^1.0.2",
-    "vue-tree-navigation": "^4.0.1",
     "vuetify": "^1.5.14",
     "vuex": "^3.0.1"
   },

src/main/malewicz/src/components/ConnectionsListPanel.vue

@@ -6,7 +6,7 @@
     <v-list>
       <v-list-tile v-for="item in connections" :key="item.name">
         <v-list-tile-action>
-          <v-checkbox v-model="$store.state.uri.newConnections" :value="item.name"/>
+          <v-checkbox v-model="$store.state.uri.connections" :value="item.name"/>
         </v-list-tile-action>
         <v-list-tile-content>
           <v-list-tile-title>{{ item.name }}</v-list-tile-title>
@@ -27,12 +27,9 @@
     created: function () {
         this.$http.get(this.$store.state.uri.host + '/endpoints').then(
           response => {
-            this.connections = response.body.filter(v => {
-              return v.properties.visible !== false
-            })
+            this.connections = response.body.filter(v => { return v.properties.visible !== false })
           }
         )
     }
-
   }
 </script>

src/main/malewicz/src/components/HelloWorld.vue

@@ -42,11 +42,9 @@
     name: 'HelloWorld',
     components: {ObjectsTablePanel, ConnectionsListPanel, TypesListPanel},
     watch: {
-
       $route(to, from) {
         this.$store.commit('changeUri', to.fullPath)
       },
-
       getSimpleUri: function (newUri, oldUri) {
         this.$router.push({path: '/' + newUri})
       }
@@ -57,9 +55,7 @@
       }
     },
     created: function () {
-      // if (this.$router.currentRoute.fullPath && this.$router.currentRoute.fullPath !== '/') {
         this.$store.commit('changeUri', this.$router.currentRoute.fullPath)
-      // }
     }
   }
 

src/main/malewicz/src/components/ObjectsTablePanel.vue

@@ -46,15 +46,17 @@
           </v-btn>
         </template>
         <v-card>
-          <v-card-title class="headline grey lighten-2" primary-title>
-            Privacy Policy
-          </v-card-title>
+          <v-card-title class="headline grey lighten-2" primary-title>SQL-query</v-card-title>
           <v-card-text>
             <pre v-highlightjs="meta.query" class="text-sm-left"><code class="sql"></code></pre>
           </v-card-text>
         </v-card>
       </v-dialog>
 
+      <v-btn @click="call()" icon>
+        <v-icon>refresh</v-icon>
+      </v-btn>
+
     </v-toolbar>
 
 
@@ -81,6 +83,7 @@
             {{ JSON.parse(props.item[met.name].value).label }}
           </v-chip>
         </a>
+        <pre v-else-if="met.properties.format==='sql'" v-highlightjs="props.item[met.name]" class="text-sm-left"><code class="sql"></code></pre>
         <span v-else-if="met.properties.datatype">{{ props.item[met.name] | formatDate }}</span>
         <span v-else>{{ props.item[met.name] }}</span>
       </td>
@@ -114,7 +117,7 @@ export default {
     }
   },
   created: function () {
-    if (this.$store.state.uri.newConnections.length > 0) {
+    if (this.$store.state.uri.connections.length > 0) {
       this.isLoading = true
       this.$http.get(this.$store.getters.preparedTypeUri).then(
         response => {
@@ -143,10 +146,10 @@ export default {
         return this.meta.metadata
       }
     },
-    count () {
+    typeUri () {
       return this.$store.getters.preparedTypeUri
     },
-    uri () {
+    objectUri () {
       return this.$store.getters.preparedUri
     },
     message: {
@@ -168,7 +171,7 @@ export default {
         this.$store.commit('setSort', {})
       }
     },
-    count (newValue) {
+    typeUri (newValue) {
       this.meta = []
       this.$http.get(newValue).then(
         response => {
@@ -177,7 +180,7 @@ export default {
         }
       )
     },
-    uri (newValue) {
+    objectUri (newValue) {
       this.items = []
       this.isLoading = true
       this.$http.get(newValue).then(

src/main/malewicz/src/components/TypesListPanel.vue

@@ -72,7 +72,7 @@
     },
     computed: {
       getPreparedTypesUri() {
-        if (this.$store.state.uri.newConnections.length > 0) {
+        if (this.$store.state.uri.connections.length > 0) {
           this.$http.get(this.$store.getters.preparedTypesUri).then(
             response => {
               this.types = response.body

src/main/malewicz/src/main.js

@@ -37,7 +37,6 @@ import Vuex from 'vuex'
 import App from './App'
 import router from './router'
 import VueResource from 'vue-resource'
-import VueTreeNavigation from 'vue-tree-navigation'
 
 import Notifications from 'vue-notification'
 import JsonExcel from 'vue-json-excel'
@@ -52,7 +51,6 @@ import 'vuetify/dist/vuetify.min.css' // Ensure you are using css-loader
 
 Vue.use(VueResource)
 Vue.use(Vuex)
-Vue.use(VueTreeNavigation)
 Vue.use(Notifications)
 Vue.component('downloadExcel', JsonExcel)
 Vue.use(VueSSE)
@@ -83,19 +81,22 @@ const store = new Vuex.Store({
     }
   },
   getters: {
+    uri: state => {
+      return state.uri
+    },
     preparedTypesUri: state => {
-      return state.uri.host + '/api/' + state.uri.newConnections[0] + '/types'
+      return state.uri.host + '/api/' + state.uri.connections[0] + '/types'
     },
     preparedTypeUri: state => {
-      return state.uri.host + '/api/' + state.uri.newConnections[0] + '/types' + '/' + state.uri.type
+      return state.uri.host + '/api/' + state.uri.connections[0] + '/types' + '/' + state.uri.type
     },
     preparedUri: state => {
-      return state.uri.host + '/api/' + state.uri.newConnections.join('|') + '/' + state.uri.type + '/' + state.uri.path +
+      return state.uri.host + '/api/' + state.uri.connections.join('|') + '/' + state.uri.type + '/' + state.uri.path +
         '?page=' + state.uri.page.number + ',' + state.uri.page.size +
         (state.uri.orderby.field ? ('&orderby=' + state.uri.orderby.field + '-' + state.uri.orderby.ord) : '')
     },
     getSimpleUri: state => {
-      return state.uri.newConnections.join('|') + '/' + state.uri.type + '/' + (state.uri.path ? state.uri.path : '') +
+      return state.uri.connections.join('|') + '/' + state.uri.type + '/' + (state.uri.path ? state.uri.path : '') +
         '?page=' + state.uri.page.number + ',' + state.uri.page.size +
         (state.uri.orderby.field ? ('&orderby=' + state.uri.orderby.field + '-' + state.uri.orderby.ord) : '')
     },
@@ -109,13 +110,10 @@ const store = new Vuex.Store({
       return state.uri.page.number
     },
     getConnections: state => {
-      return state.uri.newConnections
+      return state.uri.connections
     }
   },
   mutations: {
-    setNewConnection (state, connectionName) {
-      state.uri.newConnections = connectionName
-    },
     setType (state, typeName) {
       state.uri.type = typeName
     },
@@ -150,7 +148,7 @@ const store = new Vuex.Store({
       const path = url.pathname.split('/').filter(v => v);
       const rawConnections = path[0]
       if (rawConnections) {
-        state.uri.newConnections = path[0].split('|')
+        state.uri.connections = path[0].split('|')
         state.uri.type = path[1]
         if (path[2]) {
           state.uri.path = path[2]