#347

Author: mgramin

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

@@ -25,12 +25,15 @@
       }
     },
     created: function () {
-      this.$http.get(this.$store.state.host + '/endpoints').then(
-        response => {
-          this.connections = response.body.filter(v => {return v.properties.visible !== false})
-          this.$store.commit('setNewConnection', response.body.map(v => { return v.name }))
-        }
-      )
+        this.$http.get(this.$store.state.host + '/endpoints').then(
+          response => {
+            this.connections = response.body.filter(v => {
+              return v.properties.visible !== false
+            })
+            this.$store.commit('setAllConnection', response.body)
+          }
+        )
     }
+
   }
 </script>

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

@@ -38,17 +38,15 @@
     left: null
   }),
 
-  props: {
-    source: String
-  },
-
     props: ['panel'],
     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})
       }

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

@@ -58,8 +58,6 @@
     </v-toolbar>
 
 
-
-
    <v-data-table
     :headers="defaultMeta"
     :items="items"
@@ -79,7 +77,9 @@
       <td v-for="met in defaultMeta">
         <a v-if="met.properties.datatype==='json' && props.item[met.name]"
            :href="'#/'+props.item['endpoint']+'/'+JSON.parse(props.item[met.name].value).link">
-          <v-chip color="green" dark>{{ JSON.parse(props.item[met.name].value).label }}</v-chip>
+          <v-chip color="green" dark>
+            {{ JSON.parse(props.item[met.name].value).label }}
+          </v-chip>
         </a>
         <span v-else-if="met.properties.datatype">{{ props.item[met.name] | formatDate }}</span>
         <span v-else>{{ props.item[met.name] }}</span>
@@ -104,32 +104,39 @@ export default {
     return {
       meta: [],
       items: [],
+      descending: false,
       pagination: {
-        rowsPerPage: -1
+        rowsPerPage: -1,
+        sortBy: ''
       },
       dialog: false,
       dialog2: false,
       isLoading: false
     }
   },
   created: function () {
-    this.isLoading = true
-    this.$http.get(this.$store.getters.preparedTypeUri).then(
-      response => {
-        this.meta = response.body[0]
-      }
-    )
-    this.$http.get(this.$store.getters.preparedUri).then(
-      response => {
-        this.items = response.body
-        if (this.items.length >= 15 && this.message === this.getPageCount()) {
-          this.increasePageCount()
+    // if (this.$store.state.allConnections.length > 0) {
+      this.isLoading = true
+      this.$http.get(this.$store.getters.preparedTypeUri).then(
+        response => {
+          this.meta = response.body[0]
         }
-        this.isLoading = false
-      }
-    )
+      )
+      this.$http.get(this.$store.getters.preparedUri).then(
+        response => {
+          this.items = response.body
+          if (this.items.length >= 15 && this.message === this.getPageCount()) {
+            this.increasePageCount()
+          }
+          this.isLoading = false
+        }
+      )
+    // }
   },
   computed: {
+    getSort () {
+      return this.pagination
+    },
     defaultMeta: function () {
       if (this.meta.metadata) {
         return this.meta.metadata.filter( v => { return v.properties.visible !== false } )
@@ -153,6 +160,15 @@ export default {
     }
   },
   watch: {
+    getSort(newValue) {
+      if (newValue.descending === true) {
+        this.$store.commit('setSort', { "field": newValue.sortBy, "ord": "desc" })
+      } else if (newValue.descending === false) {
+        this.$store.commit('setSort', { "field": newValue.sortBy, "ord": "asc" })
+      } else {
+        this.$store.commit('setSort', {})
+      }
+    },
     count (newValue) {
       this.meta = []
       this.$http.get(newValue).then(

src/main/malewicz/src/main.js

@@ -73,8 +73,9 @@ const store = new Vuex.Store({
     host: '',
     // host: 'http://localhost:8007/',
     newConnections: [],
+    allConnections: [],
     type: 'table',
-    path: [''],
+    path: [],
     page: { 'number': 1, 'size': 15, 'count': 1 },
     orderby: {},
     where: '',
@@ -114,6 +115,9 @@ const store = new Vuex.Store({
     setNewConnection (state, connectionName) {
       state.newConnections = connectionName
     },
+    setAllConnection (state, connectionName) {
+      state.allConnections = connectionName
+    },
     setType (state, typeName) {
       state.type = typeName
     },