From 3d472baf74128f0163fa5f6df77dc3893e9e04d9 Mon Sep 17 00:00:00 2001
From: mgramin <mgramin@gmail.com>
Date: Thu, 30 May 2019 09:24:11 +0400
Subject: [PATCH] #326 fix

---
 .../src/components/ConnectionsListPanel.vue   | 16 +++++++-------
 .../malewicz/src/components/HelloWorld.vue    |  5 -----
 .../src/components/ObjectsTablePanel.vue      |  2 +-
 .../src/components/TypesListPanel.vue         | 21 ++++++++++++-------
 src/main/malewicz/src/main.js                 |  8 ++++++-
 src/main/resources/application.yml            |  2 +-
 6 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/main/malewicz/src/components/ConnectionsListPanel.vue b/src/main/malewicz/src/components/ConnectionsListPanel.vue
index c79d0823..0de4227c 100644
--- a/src/main/malewicz/src/components/ConnectionsListPanel.vue
+++ b/src/main/malewicz/src/components/ConnectionsListPanel.vue
@@ -3,9 +3,6 @@
       <li class="list-group-item list-group-item-primary">Connections:</li>
       <div v-for="connection in connections" class="list-group-item" v-bind:class="{ disabled: isDisabled(connection.health) }" :key="connection.name" >
         <label>
-          <!--<input type="checkbox" id="defaultCheck1" v-if="isActiveConnection(connection.name)" checked="checked" />-->
-          <!--<input type="checkbox" id="defaultCheck2" v-else />-->
-
           <input type="checkbox" :value="connection.name" v-model="checkedNames" />
           <i :class="connection.properties.css_class"></i>
           {{connection.name}}
@@ -31,12 +28,15 @@ export default {
     )
     this.doLoading()
   },
+  watch: {
+    connections: function (newVal, oldVal) {
+      this.$store.commit('setConnection', newVal[0].name)
+    }
+  },
   methods: {
     isDisabled (health) {
-      if (health === 'Ok') {
-        return false
-      }
-      return true
+      return health !== 'Ok';
+
     },
     doLoading () {
       this.$sse('http://localhost:8007/connections/health', { format: 'json' }) // or { format: 'plain' }
@@ -67,8 +67,6 @@ export default {
     isActiveConnection (connectionName) {
       return this.$store.state.connections.includes(connectionName)
     }
-  },
-  props: {
   }
 }
 </script>
diff --git a/src/main/malewicz/src/components/HelloWorld.vue b/src/main/malewicz/src/components/HelloWorld.vue
index 71c13231..06e43524 100644
--- a/src/main/malewicz/src/components/HelloWorld.vue
+++ b/src/main/malewicz/src/components/HelloWorld.vue
@@ -39,11 +39,6 @@ export default {
       return this.$store.getters.getSimpleUri
     }
   },
-  methods: {
-    changeUri: function (event) {
-      return this.$store.commit('changeUri', event.target.value)
-    }
-  },
   created: function () {
     if (this.$router.currentRoute.fullPath && this.$router.currentRoute.fullPath !== '/') {
       this.$store.commit('changeUri', this.$router.currentRoute.fullPath)
diff --git a/src/main/malewicz/src/components/ObjectsTablePanel.vue b/src/main/malewicz/src/components/ObjectsTablePanel.vue
index 463abd6f..ae9fd31b 100644
--- a/src/main/malewicz/src/components/ObjectsTablePanel.vue
+++ b/src/main/malewicz/src/components/ObjectsTablePanel.vue
@@ -22,7 +22,7 @@
             <li class="page-item" v-bind:class="{ active: isActivePage(4) }">
               <a class="page-link" href="#" v-on:click="setPageNumber(4)">4</a>
             </li>
-            <li class="page-item" v-bind:class="{ disabled: isActivePage(4) }">
+            <li class="page-item">
               <a class="page-link" href="#" aria-label="Next" v-on:click="nextPage">
                 <span aria-hidden="false">&raquo;</span>
                 <span class="sr-only">Next</span>
diff --git a/src/main/malewicz/src/components/TypesListPanel.vue b/src/main/malewicz/src/components/TypesListPanel.vue
index 2c8da4b0..8bbd180e 100644
--- a/src/main/malewicz/src/components/TypesListPanel.vue
+++ b/src/main/malewicz/src/components/TypesListPanel.vue
@@ -29,15 +29,20 @@ export default {
       return this.$store.commit('setType', type)
     }
   },
-  created: function () {
-    this.$http.get(this.$store.state.host + '/api/' + this.$store.state.connections + '/types').then(
-      response => {
-        this.types = response.body
-      }
-    )
+  computed: {
+    getPreparedTypesUri () {
+      this.$http.get(this.$store.getters.preparedTypesUri).then (
+        response => {
+          this.types = response.body
+        }
+      )
+      return this.$store.getters.preparedTypesUri
+    }
   },
-  props: {
-    uri: String
+  watch: {
+    getPreparedTypesUri (newVal, oldVal) {
+
+    }
   }
 }
 </script>
diff --git a/src/main/malewicz/src/main.js b/src/main/malewicz/src/main.js
index 89050495..7e7e68f2 100644
--- a/src/main/malewicz/src/main.js
+++ b/src/main/malewicz/src/main.js
@@ -32,7 +32,7 @@ Vue.config.productionTip = false
 const store = new Vuex.Store({
   state: {
     host: 'http://localhost:8007/',
-    connections: ['h2'],
+    connections: '',
     type: 'table',
     path: [''],
     page: { 'number': 1, 'size': 15 },
@@ -41,6 +41,9 @@ const store = new Vuex.Store({
     cache: false
   },
   getters: {
+    preparedTypesUri: state => {
+      return state.host + '/api/' + state.connections + '/types'
+    },
     preparedMetaUri: state => {
       return state.host + '/api/meta/' + state.connections + '/' + state.type + '/'
     },
@@ -56,6 +59,9 @@ const store = new Vuex.Store({
     }
   },
   mutations: {
+    setConnection (state, connectionName) {
+      state.connections = connectionName
+    },
     setType (state, typeName) {
       state.type = typeName
     },
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5435fdc6..19d05fe1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -23,7 +23,7 @@ conf:
           "jdbc.user": "",
           "jdbc.password": "",
           "os.query.rest.port": "8082",
-          "visible": false,
+          "visible": true,
           "description": "Embedded db for unit tests only"
         }