#391

Author: mgramin

src/main/kotlin/com/github/mgramin/sqlboot/model/connection/Endpoint.kt

@@ -42,6 +42,8 @@ interface Endpoint {
 
     fun properties(): Map<String, Any>
 
+    fun confDir(): String
+
     @Deprecated("Move to SQLResourceType")
     fun getDataSource(): DataSource
 

src/main/kotlin/com/github/mgramin/sqlboot/model/connection/FakeEndpoint.kt

@@ -50,4 +50,8 @@ class FakeEndpoint : Endpoint {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
+    override fun confDir(): String {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
 }

src/main/kotlin/com/github/mgramin/sqlboot/model/connection/SimpleEndpoint.kt

@@ -43,13 +43,16 @@ import org.apache.tomcat.jdbc.pool.DataSource
 open class SimpleEndpoint(
         var name: String? = null,
         var host: String? = null,
+        var confDir: String? = null,
         var properties: Map<String, Any>? = null
 ) : Endpoint {
 
     override fun name() = name!!
 
     override fun host() = host!!
 
+    override fun confDir() = confDir!!
+
     override fun properties(): Map<String, Any> = properties!!
 
     private var dataSource: DataSource? = null

src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceType.kt

@@ -78,7 +78,7 @@ class FsResourceType(
     fun resourceTypes() = resourceTypes
 
     private val resourceTypes: List<ResourceType> =
-            walk(FileSystemResource(endpoints.first().properties()["fs_base_folder"].toString()).file.path)
+            walk(FileSystemResource(endpoints.first().confDir()).file.path)
 
     private fun walk(path: String) =
             File(path)

src/main/malewicz/src/components/CodeViewComponent.vue

@@ -1,28 +1,32 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
-    <v-dialog v-model="show" width="1200">
-        <template v-slot:activator="{ on }">
-            <v-btn icon v-on="on">
-                <v-icon>build</v-icon>
-            </v-btn>
-        </template>
-        <v-card>
-            <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-divider></v-divider>
-            <v-card-actions>
-                <v-spacer></v-spacer>
-                <v-btn color="primary" flat @click="show = false">Close</v-btn>
-            </v-card-actions>
-        </v-card>
-    </v-dialog>
+  <v-dialog v-model="show" width="1200">
+    <template v-slot:activator="{ on }">
+      <v-btn icon v-on="on">
+        <v-icon>build</v-icon>
+      </v-btn>
+    </template>
+    <v-card>
+      <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-divider></v-divider>
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn color="primary" flat @click="show = false">Close</v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
 </template>
 <script>
 export default {
   name: 'CodeViewComponent',
+  data () {
+    return {
+      show: false
+    }
+  },
   props: {
-    show: {},
     meta: {}
   }
 }

src/main/malewicz/src/components/ColumnsComponent.vue

@@ -1,39 +1,39 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
-    <v-dialog v-model="show" width="1000">
-        <template v-slot:activator="{ on }">
-            <v-btn icon v-on="on">
-                <v-icon>settings</v-icon>
-            </v-btn>
+  <v-dialog v-model="show" width="1000">
+    <template v-slot:activator="{ on }">
+      <v-btn icon v-on="on">
+        <v-icon>settings</v-icon>
+      </v-btn>
+    </template>
+    <v-card>
+      <v-card-title class="headline grey lighten-2" primary-title>Columns</v-card-title>
+      <v-card-text>
+        <template>
+          <v-data-table :items="meta.metadata" class="elevation-1" hide-actions>
+            <template v-slot:headers="props">
+              <tr>
+                <th>Visible</th>
+                <th>Name</th>
+                <th>Description</th>
+              </tr>
+            </template>
+            <template v-slot:items="props">
+              <td>
+                <v-checkbox v-model="props.item.properties.visible"/>
+              </td>
+              <td>{{ props.item.properties.label }}</td>
+              <td>{{ props.item.properties.description }}</td>
+            </template>
+          </v-data-table>
         </template>
-        <v-card>
-            <v-card-title class="headline grey lighten-2" primary-title>Columns</v-card-title>
-            <v-card-text>
-                <template>
-                    <v-data-table :items="meta.metadata" class="elevation-1" hide-actions>
-                        <template v-slot:headers="props">
-                            <tr>
-                                <th>Visible</th>
-                                <th>Name</th>
-                                <th>Description</th>
-                            </tr>
-                        </template>
-                        <template v-slot:items="props">
-                            <td>
-                                <v-checkbox v-model="props.item.properties.visible"/>
-                            </td>
-                            <td>{{ props.item.properties.label }}</td>
-                            <td>{{ props.item.properties.description }}</td>
-                        </template>
-                    </v-data-table>
-                </template>
-            </v-card-text>
-            <v-divider></v-divider>
-            <v-card-actions>
-                <v-spacer></v-spacer>
-                <v-btn color="primary" flat @click="show = false">Close</v-btn>
-            </v-card-actions>
-        </v-card>
-    </v-dialog>
+      </v-card-text>
+      <v-divider></v-divider>
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn color="primary" flat @click="show = false">Close</v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
 </template>
 <script>
 export default {

src/main/malewicz/src/components/FilterComponent.vue

@@ -1,5 +1,6 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
   <v-dialog v-model="show" width="600">
+    {{localFilter}}
     <template v-slot:activator="{ on }">
       <v-btn icon v-on="on">
         <v-icon>search</v-icon>
@@ -11,15 +12,16 @@
         <template>
           <v-form ref="form">
                   <span v-for="item in meta.metadata" v-bind:key="item.name">
+                    <span v-if="item.name === 'endpoint'"></span>
                     <span v-if="item.properties.datatype === 'time'"></span>
                       <v-combobox v-if="item.properties.values"
-                                  v-model='selected[item.name]'
+                                  v-model='localFilter[item.name]'
                                   :label="item.properties.label"
                                   :items="item.properties.values"
                                   clearable>
                       </v-combobox>
                       <v-text-field v-else
-                                    v-model='selected[item.name]'
+                                    v-model='localFilter[item.name]'
                                     :label="item.properties.label"
                                     clearable
                                     filled>
@@ -40,18 +42,38 @@
 <script>
 export default {
   name: 'FilterComponent',
-  data () {
+  data: function () {
     return {
       show: false,
-      selected: {}
+      localFilter: {}
     }
   },
   props: {
     meta: {}
   },
   methods: {
     setFilter () {
-      this.$store.commit('setFilter', this.selected)
+      for (const propName in this.$data.localFilter) {
+        if (this.$data.localFilter[propName] === null || this.$data.localFilter[propName] === undefined) {
+          delete this.$data.localFilter[propName]
+        }
+      }
+      this.$store.commit('setFilter', this.$data.localFilter)
+    }
+  },
+  computed: {
+    stateFilter () {
+      return this.$store.getters.getFilter
+    }
+  },
+  watch: {
+    stateFilter: {
+      handler (newVal) {
+        if (newVal.uri && Object.entries(newVal.uri).length === 0 && newVal.uri.constructor === Object) {
+          this.$data.localFilter = {}
+        }
+      },
+      deep: true
     }
   }
 }

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

@@ -1,26 +1,26 @@
 <template>
 
-    <v-app id="inspire">
-
-      <v-toolbar color="green" dark fixed app clipped-right>
-        <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
-      </v-toolbar>
-
-      <v-navigation-drawer fixed v-model="drawer" app>
-        <ConnectionsListPanel/>
-        <TypesListPanel/>
-      </v-navigation-drawer>
-
-      <v-content>
-        <component v-bind:is="panel"></component>
-      </v-content>
-
-      <v-footer color="green" class="white--text" app>
-        <span class="pa-3">CrocInc/sql-boot</span>
-        <v-spacer></v-spacer>
-        <span class="pa-3">&copy; 2019</span>
-      </v-footer>
-    </v-app>
+  <v-app id="inspire">
+
+    <v-toolbar color="green" dark fixed app clipped-right>
+      <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
+    </v-toolbar>
+
+    <v-navigation-drawer fixed v-model="drawer" app>
+      <ConnectionsListPanel/>
+      <TypesListPanel/>
+    </v-navigation-drawer>
+
+    <v-content>
+      <component v-bind:is="panel"></component>
+    </v-content>
+
+    <v-footer color="green" class="white--text" app>
+      <span class="pa-3">CrocInc/sql-boot</span>
+      <v-spacer></v-spacer>
+      <span class="pa-3">&copy; 2019</span>
+    </v-footer>
+  </v-app>
 
 </template>
 

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

@@ -7,26 +7,27 @@
 
     <v-list two-line>
       <div v-for="tag in allTags()" v-bind:key="tag">
-      <v-list-group v-if="typesByTag(tag).length > 0" prepend-icon="bookmark_border">
-        <template v-slot:activator>
-          <v-list-tile>
-            <v-list-tile-title>{{tag}}</v-list-tile-title>
-          </v-list-tile>
-        </template>
-
-        <v-tooltip right v-for="item in typesByTag(tag)" :key="item.name">
-          <template v-slot:activator="{ on }">
-            <v-list-tile v-on="on" @click="setType(item.name)" v-if="item.properties.title">
-              <v-list-tile-avatar>
-                <v-icon v-bind:class="item.properties.icon_class">{{ item.properties.icon || "not_interested" }}</v-icon>
-              </v-list-tile-avatar>
-              <v-list-tile-content>{{ item.properties.title }}</v-list-tile-content>
+        <v-list-group v-if="typesByTag(tag).length > 0" prepend-icon="bookmark_border">
+          <template v-slot:activator>
+            <v-list-tile>
+              <v-list-tile-title>{{tag}}</v-list-tile-title>
             </v-list-tile>
           </template>
-          <span v-if="item.properties.description">{{ item.properties.description }}</span>
-          <span v-else>{{ item.properties.title }}</span>
-        </v-tooltip>
-      </v-list-group>
+
+          <v-tooltip right v-for="item in typesByTag(tag)" :key="item.name">
+            <template v-slot:activator="{ on }">
+              <v-list-tile v-on="on" @click="setType(item.name)" v-if="item.properties.title">
+                <v-list-tile-avatar>
+                  <v-icon v-bind:class="item.properties.icon_class">{{ item.properties.icon || 'not_interested' }}
+                  </v-icon>
+                </v-list-tile-avatar>
+                <v-list-tile-content>{{ item.properties.title }}</v-list-tile-content>
+              </v-list-tile>
+            </template>
+            <span v-if="item.properties.description">{{ item.properties.description }}</span>
+            <span v-else>{{ item.properties.title }}</span>
+          </v-tooltip>
+        </v-list-group>
       </div>
     </v-list>
 
@@ -42,17 +43,23 @@ export default {
   methods: {
     allTags () {
       return this.$store.getters.getTypes
-        .map(v => { return v.properties.tags })
+        .map(v => {
+          return v.properties.tags
+        })
         .filter(el => el === 0 || Boolean(el))
-        .map(v => { return v.split(',') })
+        .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') })
+        .filter(v => {
+          return v.properties.tags.includes(tag) && v.properties.tags.includes('ui')
+        })
     },
     onlyUnique (value, index, self) {
       return self.indexOf(value) === index