#347

Author: mgramin

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

@@ -4,7 +4,7 @@
       <v-toolbar-title>Connections</v-toolbar-title>
     </v-toolbar>
     <v-list>
-      <v-list-tile v-for="item in connections" :key="item.name">
+      <v-list-tile v-for="item in $store.getters.getAllConnections" :key="item.name">
         <v-list-tile-action>
           <v-checkbox v-model="$store.state.uri.connections" :value="item.name"/>
         </v-list-tile-action>
@@ -20,16 +20,7 @@
   export default {
     name: 'ConnectionsListPanel',
     data() {
-      return {
-        connections: []
-      }
-    },
-    created: function () {
-        this.$http.get(this.$store.state.host + '/endpoints').then(
-          response => {
-            this.connections = response.body.filter(v => { return v.properties.visible !== false })
-          }
-        )
+      return {}
     }
   }
 </script>

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

@@ -154,12 +154,6 @@ export default {
     completeUri() {
       return this.$store.getters.getUri
     },
-    typeUri () {
-      return this.$store.getters.preparedTypeUri
-    },
-    objectUri () {
-      return this.$store.getters.preparedUri
-    },
     message: {
       get () {
         return this.$store.getters.getPageNumber
@@ -172,35 +166,40 @@ export default {
   watch: {
     completeUri: {
       handler(newVal, oldVal) {
-        console.log("RRRRRRRRRRRRRRRRRR")
+        this.meta = []
+        // this.meta = this.$store.getters.getTypes.find( v => { return v.name === this.$store.getters.getUri.type } )
+
+        this.$http.get(this.$store.getters.preparedTypeUri).then(
+          response => {
+            this.meta = response.body[0]
+
+/*            if (Object.keys(this.$store.getters.getUri.orderby).length === 0) {
+              console.log("EMPTY!")
+              this.pagination.sortBy = 'time'
+              this.setSort('time')
+              return
+            }*/
+
+            this.items = []
+            this.isLoading = true
+            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
+              }, response => {
+                this.$notify({ group: 'foo', type: 'error', title: 'Server error', text: response })
+                this.isLoading = false
+              }
+            )
+
+          }
+        )
       },
       deep: true,
     },
-    typeUri (newValue) {
-      this.meta = []
-      this.$http.get(newValue).then(
-        response => {
-          this.meta = response.body[0]
-          // this.setSort('time')
-        }
-      )
-    },
-    objectUri (newValue) {
-      this.items = []
-      this.isLoading = true
-      this.$http.get(newValue).then(
-        response => {
-          this.items = response.body
-          if (this.items.length >= 15 && this.message === this.getPageCount()) {
-            this.increasePageCount()
-          }
-          this.isLoading = false
-        }, response => {
-          this.$notify({ group: 'foo', type: 'error', title: 'Server error', text: response })
-          this.isLoading = false
-        }
-      )
-    },
     getSort(newValue) {
       if (newValue.descending === true) {
         this.$store.commit('setSort', { "field": newValue.sortBy, "ord": "desc" })

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

@@ -37,25 +37,23 @@
   export default {
     name: 'TypesListPanel',
     data() {
-      return {
-        types: []
-      }
+      return {}
     },
     methods: {
-      typesByTag(tag) {
-        return this.types
-          .filter(el => el === 0 || Boolean(el.properties.tags))
-          .filter(v => { return v.properties.tags.includes(tag) &&  v.properties.tags.includes('ui')})
-      },
       allTags() {
-        return this.types
+        return this.$store.getters.getTypes
           .map(v => { return v.properties.tags } )
           .filter(el => el === 0 || Boolean(el))
           .map(v => { return v.split(",") } )
           .flatMap(v => v)
           .filter(this.onlyUnique)
           .filter(el => el !== 'ui')
       },
+      typesByTag(tag) {
+        return this.$store.getters.getTypes
+          .filter(el => el === 0 || Boolean(el.properties.tags))
+          .filter(v => { return v.properties.tags.includes(tag) &&  v.properties.tags.includes('ui')})
+      },
       onlyUnique(value, index, self) {
         return self.indexOf(value) === index;
       },
@@ -65,20 +63,6 @@
       setType(type) {
         this.$store.commit('skipObjectUri', type)
       }
-    },
-    computed: {
-      getPreparedTypesUri() {
-        if (this.$store.state.uri.connections.length > 0) {
-          this.$http.get(this.$store.getters.preparedTypesUri).then(
-            response => {
-              this.types = response.body
-            }
-          )
-        }
-      }
-    },
-    watch: {
-      getPreparedTypesUri(newVal, oldVal) {}
     }
   }
 </script>

src/main/malewicz/src/main.js

@@ -71,6 +71,8 @@ const store = new Vuex.Store({
     host: '',
     // host: 'http://localhost:8007/',
     pageCount: 1,
+    allConnections: [],
+    types: [],
     uri: {
       connections: [],
       type: 'table',
@@ -80,6 +82,12 @@ const store = new Vuex.Store({
     }
   },
   getters: {
+    getAllConnections: state => {
+      return state.allConnections
+    },
+    getTypes: state => {
+      return state.types
+    },
     getUri: state => {
       return state.uri
     },
@@ -113,11 +121,18 @@ const store = new Vuex.Store({
     }
   },
   mutations: {
+    setAllConnections (state, connections) {
+      state.allConnections = connections
+    },
+    setTypes (state, types) {
+      state.types = types
+    },
     setUri (state, uri) {
       state.uri = uri
     },
     skipObjectUri (state, type) {
       const c = state.uri.connections
+      state.pageCount = 1
       state.uri = { connections: c, type: type, path: [], orderby: {}, page: { number: 1, size: 15 }}
     },
     setType (state, typeName) {
@@ -183,5 +198,28 @@ new Vue({
   components: { App },
   template: '<App/>',
   store,
-  router
+  router,
+  created: function() {
+    this.$http.get(this.$store.state.host + '/endpoints').then(
+      response => {
+        this.$store.commit('setAllConnections', response.body)
+      }
+    )
+  },
+  computed: {
+    getAllConnections() {
+      return this.$store.getters.getAllConnections
+    }
+  },
+  watch: {
+    getAllConnections: {
+      handler(newVal, oldVal) {
+        this.$http.get(this.$store.state.host + '/api/' + newVal[0].name + '/types').then(
+          response => {
+            this.$store.commit('setTypes', response.body)
+          }
+        )
+      }
+    }
+  }
 }).$mount('#app')