Merge pull request #443 from CrocInc/croc_repo

mgramin · web-flow · commit ed97c0a54a13 · 2020-02-14T15:31:03.000+04:00
Croc repo
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceType.kt b/src/main/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/SqlResourceType.kt
@@ -105,7 +105,7 @@ class SqlResourceType(
 
     override fun metaData(uri: Uri): List<Metadata> {
         val endpoint = endpoints
-                .filter { it.properties().containsKey("tags") && it.properties()["tags"] == "history" }
+                .filter { it.properties().containsKey("tags") && it.properties()["tags"].toString().contains("history") }
                 .ifEmpty { endpoints.filter { it.properties().containsKey("default") } }
                 .ifEmpty { endpoints }
                 .first()
diff --git a/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/CustomFilteredSelectQuery.kt b/src/main/kotlin/com/github/mgramin/sqlboot/sql/select/wrappers/CustomFilteredSelectQuery.kt
@@ -54,7 +54,7 @@ class CustomFilteredSelectQuery(
                             "int8" -> """${it.key} = ${it.value.asBigInteger}"""
                             "varchar","text","name" -> """${it.key} like '${it.value.asString.replace("'", "''")}'"""
                             "timestamptz" -> """${it.key} between '${it.value.asJsonObject["start"].asString}'::timestamptz and '${it.value.asJsonObject["end"].asString}'::timestamptz"""
-                            else -> """${it.key} = '${it.value.asString.replace("'", "''")}'"""
+                            else -> """${it.key} = '${it.value.toString().replace("'", "''")}'"""
                         }
                     }
             """select *
diff --git a/src/main/malewicz/README.md b/src/main/malewicz/README.md
@@ -1,11 +1,11 @@
 # malewicz
 
-A hackable GUI SQL-manager written on SQL itself
+# A hackable GUI SQL-manager written on SQL itself
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/1b7fb7abccda4a16a4f698f40d3bd4dc)](https://app.codacy.com/app/mgramin/malewicz?utm_source=github.com&utm_medium=referral&utm_content=sql-boot/malewicz&utm_campaign=Badge_Grade_Dashboard)
 [![Build Status](https://travis-ci.org/sql-boot/malewicz.svg?branch=master)](https://travis-ci.org/sql-boot/malewicz)
 
-:warning: This project is in early stage of development and is currently available only as a demo (online or local) based on [simple Oracle sql-scripts](https://github.com/sql-boot/sql-boot-oracle).
+:warning: This project is in early stage of development
 
 Backend powered by [sql-boot](https://github.com/sql-boot/sql-boot)
 
diff --git a/src/main/malewicz/package.json b/src/main/malewicz/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "core-js": "^2.6.5",
     "moment": "^2.24.0",
+    "pev2": "^0.1.20",
     "url-parse": "^1.4.4",
     "vue": "^2.6.11",
     "vue-ctk-date-time-picker": "^2.1.1",
@@ -19,7 +20,7 @@
     "vue-notification": "^1.3.16",
     "vue-router": "^3.0.3",
     "vue-sse": "^1.0.2",
-    "vuetify": "^2.2.6",
+    "vuetify": "^2.2.12",
     "vuex": "^3.0.1"
   },
   "devDependencies": {
diff --git a/src/main/malewicz/public/index.html b/src/main/malewicz/public/index.html
@@ -8,6 +8,16 @@
     <title>malewicz</title>
     <link rel="stylesheet" href='https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons'>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
+
+    <link
+            href="https://unpkg.com/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+            rel="stylesheet"
+    />
+    <link
+            href="https://unpkg.com/font-awesome@4.7.0/css/font-awesome.css"
+            rel="stylesheet"
+    />
+
   </head>
   <body>
     <noscript>
diff --git a/src/main/malewicz/src/components/Application.vue b/src/main/malewicz/src/components/Application.vue
@@ -36,6 +36,7 @@ import TypesListPanel from './TypesListPanel'
 import ConnectionsListPanel from './ConnectionsListPanel'
 import ObjectsTablePanel from "./ObjectsTablePanel";
 import i18n from '@/plugins/i18n';
+import pev2 from "pev2"
 
 export default {
   data: () => ({
@@ -51,7 +52,7 @@ export default {
   }),
   props: ['panel'],
   name: 'Application',
-  components: {ObjectsTablePanel, ConnectionsListPanel, TypesListPanel },
+  components: {ObjectsTablePanel, ConnectionsListPanel, TypesListPanel, pev2 },
   methods: {
     goHome() {
       return "/" + this.$store.getters.getConnections.join("|")
diff --git a/src/main/malewicz/src/components/CustomComponent.vue b/src/main/malewicz/src/components/CustomComponent.vue
@@ -43,6 +43,9 @@
     <span v-else-if="(met.type==='inet') && props.item[met.name]">
       {{ props.item[met.name].value }}
     </span>
+    <span v-else-if="(met.type==='interval') && props.item[met.name]">
+      {{ props.item[met.name].value }}
+    </span>
     <span v-else-if="met.format==='sql'">
       <CodeViewComponent :code="props.item[met.name]"/>
     </span>
diff --git a/src/main/malewicz/src/components/LightObjectsTableComponent.vue b/src/main/malewicz/src/components/LightObjectsTableComponent.vue
@@ -15,7 +15,7 @@
                   :no-data-text = "this.$t('noData')"
                   :loading-text = "this.$t('loading')"
                   :options.sync = "options"
-                  hide-default-footer="true">
+                  :hide-default-footer=true>
       <template v-slot:progress>
         <v-progress-linear color="green" :height="10" indeterminate></v-progress-linear>
       </template>
diff --git a/src/main/malewicz/src/components/ObjectsTablePanel.vue b/src/main/malewicz/src/components/ObjectsTablePanel.vue
@@ -17,7 +17,7 @@
                   :loading="isLoading"
                   :options.sync = "options"
                   :no-data-text = "this.$t('noData')"
-                  hide-default-footer
+                  :hide-default-footer = true
                   :fixed-header = "true"
                   :loading-text = "this.$t('loading')"
                   class="elevation-1">
@@ -148,6 +148,8 @@ export default {
                 this.isLoading = false
             }
         )
+      this.options.sortBy[0] = this.$store.getters.getUri.orderby.field
+      this.options.sortDesc[0] = this.$store.getters.getUri.orderby.ord === 'desc';
     },
     nextPage () {
       return this.$store.commit('nextPage')
diff --git a/src/main/malewicz/src/store/store.js b/src/main/malewicz/src/store/store.js
@@ -83,14 +83,6 @@ export const store = new Vuex.Store({
     },
     getConnections: state => {
       return state.uri.connections
-      /*let defaultConnection = state.allConnections.find(v => {
-        return v.properties.default === true
-      })
-      if (state.uri.connections.length === 0) {
-        return Object.values(defaultConnection)
-      } else {
-        return state.uri.connections
-      }*/
     },
     getFilter: state => {
       return state.uri.filter
@@ -126,12 +118,12 @@ export const store = new Vuex.Store({
         return v.name === type
       })
       const defaultSort = meta.metadata.filter(v => {
-        return v.sort
+        return v.default_sort
       }).map(v => v.name)[0]
       if (defaultSort) {
         const sortType = meta.metadata.filter(v => {
-          return v.sort
-        })[0].sort
+          return v.default_sort
+        })[0].default_sort
         state.uri = {
           connections: c,
           type: type,

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class CustomFilteredSelectQuery(`
`54`	`54`	`"int8" -> """${it.key} = ${it.value.asBigInteger}"""`
`55`	`55`	`"varchar","text","name" -> """${it.key} like '${it.value.asString.replace("'", "''")}'"""`
`56`	`56`	`"timestamptz" -> """${it.key} between '${it.value.asJsonObject["start"].asString}'::timestamptz and '${it.value.asJsonObject["end"].asString}'::timestamptz"""`
`57`		`- else -> """${it.key} = '${it.value.asString.replace("'", "''")}'"""`
	`57`	`+ else -> """${it.key} = '${it.value.toString().replace("'", "''")}'"""`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`"""select *`