Merge pull request #160 from Altinity/master

Update to verison 1.9.4
Altinity · Nov 27, 2019 · 08c152e · 08c152e
2 parents 995b21b + 04172a4
commit 08c152e
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.9.4 (2019-11-27)
+
+## Fixes:
+* Ad Hoc Filters small adjustments for numeric values
+* UI optimizations within Metric builder 
+
 # 1.9.3 (2019-10-18)
 
 ## Fixes:

diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/dist/partials/query.editor.html b/dist/partials/query.editor.html
@@ -32,32 +32,14 @@
 		</div>
 
 		<div class="gf-form-inline">
-			<div class="gf-form">
-				<label class="gf-form-label query-keyword width-10">
-                    <info-popover mode="right-absolute">
-                        Select
-                        <a href="https://clickhouse.yandex/reference_en.html#Date" target = "_blank" >EventDate</a>
-                        column for binding with Grafana's range selector
-                    </info-popover>
-                    Column:Date
-                    <i ng-if="ctrl.target.dateLoading" class="fa fa-spinner fa-spin"></i>
-				</label>
-			</div>
-
-			<div class="gf-form">
-				<metric-segment segment="ctrl.dateColDataTypeSegment"
-                                get-options="ctrl.getDateColDataTypeSegments()"
-                                on-change="ctrl.dateColDataTypeChanged()"></metric-segment>
-			</div>
-
-            <div class="gf-form width-14">
+			<div class="gf-form width-14">
                 <metric-segment-model property="ctrl.target.dateTimeType"
                                       options="ctrl.dateTimeTypeOptions" css-class="query-keyword width-14 "
                                       custom="false" select-mode="true"
                                       on-change="ctrl.dateTimeTypeChanged()">
                 </metric-segment-model>
                 <info-popover mode="right-absolute" style = "margin-right: 10px;">
-                    Select
+                    Select Event
                     <a href="https://clickhouse.yandex/reference_en.html#DateTime" target = "_blank" >DateTime</a>
                     or UInt32 column for binding with Grafana's range selector
                 </info-popover>
@@ -70,6 +52,27 @@
                 </metric-segment>
             </div>
 
+            <div class="gf-form">
+                <label class="gf-form-label query-keyword width-10">
+                    <info-popover mode="right-absolute">
+                        Select
+                        <a href="https://clickhouse.yandex/reference_en.html#Date" target = "_blank" >Date</a>
+                        column for binding with Grafana's range selector
+                    </info-popover>
+                    Column:Date
+                    <i ng-if="ctrl.target.dateLoading" class="fa fa-spinner fa-spin"></i>
+                </label>
+            </div>
+
+            <style>
+                .typeahead.dropdown-menu a {min-height: 2em;}
+            </style>
+            <div class="gf-form">
+                <metric-segment segment="ctrl.dateColDataTypeSegment"
+                                get-options="ctrl.getDateColDataTypeSegments()"
+                                on-change="ctrl.dateColDataTypeChanged()"></metric-segment>
+            </div>
+
             <div class="gf-form gf-form--grow">
                 <div class="gf-form-label gf-form-label--grow"></div>
             </div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vertamedia-clickhouse",
-    "version": "1.9.3",
+    "version": "1.9.4",
     "description": "ClickHouse datasource for Grafana",
     "scripts": {
         "build:prod": "webpack --config webpack.config.prod.js",

diff --git a/src/partials/query.editor.html b/src/partials/query.editor.html
@@ -32,32 +32,14 @@
 		</div>
 
 		<div class="gf-form-inline">
-			<div class="gf-form">
-				<label class="gf-form-label query-keyword width-10">
-                    <info-popover mode="right-absolute">
-                        Select
-                        <a href="https://clickhouse.yandex/reference_en.html#Date" target = "_blank" >EventDate</a>
-                        column for binding with Grafana's range selector
-                    </info-popover>
-                    Column:Date
-                    <i ng-if="ctrl.target.dateLoading" class="fa fa-spinner fa-spin"></i>
-				</label>
-			</div>
-
-			<div class="gf-form">
-				<metric-segment segment="ctrl.dateColDataTypeSegment"
-                                get-options="ctrl.getDateColDataTypeSegments()"
-                                on-change="ctrl.dateColDataTypeChanged()"></metric-segment>
-			</div>
-
-            <div class="gf-form width-14">
+			<div class="gf-form width-14">
                 <metric-segment-model property="ctrl.target.dateTimeType"
                                       options="ctrl.dateTimeTypeOptions" css-class="query-keyword width-14 "
                                       custom="false" select-mode="true"
                                       on-change="ctrl.dateTimeTypeChanged()">
                 </metric-segment-model>
                 <info-popover mode="right-absolute" style = "margin-right: 10px;">
-                    Select
+                    Select Event
                     <a href="https://clickhouse.yandex/reference_en.html#DateTime" target = "_blank" >DateTime</a>
                     or UInt32 column for binding with Grafana's range selector
                 </info-popover>
@@ -70,6 +52,27 @@
                 </metric-segment>
             </div>
 
+            <div class="gf-form">
+                <label class="gf-form-label query-keyword width-10">
+                    <info-popover mode="right-absolute">
+                        Select
+                        <a href="https://clickhouse.yandex/reference_en.html#Date" target = "_blank" >Date</a>
+                        column for binding with Grafana's range selector
+                    </info-popover>
+                    Column:Date
+                    <i ng-if="ctrl.target.dateLoading" class="fa fa-spinner fa-spin"></i>
+                </label>
+            </div>
+
+            <style>
+                .typeahead.dropdown-menu a {min-height: 2em;}
+            </style>
+            <div class="gf-form">
+                <metric-segment segment="ctrl.dateColDataTypeSegment"
+                                get-options="ctrl.getDateColDataTypeSegments()"
+                                on-change="ctrl.dateColDataTypeChanged()"></metric-segment>
+            </div>
+
             <div class="gf-form gf-form--grow">
                 <div class="gf-form-label gf-form-label--grow"></div>
             </div>

diff --git a/src/plugin.json b/src/plugin.json
@@ -24,6 +24,6 @@
         "url": "https://github.com/Vertamedia/clickhouse-grafana"
       }
     ],
-    "version": "1.9.3"
+    "version": "1.9.4"
   }
 }
diff --git a/src/query_ctrl.ts b/src/query_ctrl.ts
@@ -115,6 +115,7 @@ class SqlQueryCtrl extends QueryCtrl {
     getDateColDataTypeSegments() {
         var target = this.target;
         target.dateLoading = true;
+
         return this.querySegment('DATE').then(function (response) {
             target.dateLoading = false;
             return response;
@@ -352,7 +353,8 @@ class SqlQueryCtrl extends QueryCtrl {
                     'WHERE database = \'' + this.target.database + '\' AND ' +
                     'table = \'' + this.target.table + '\' AND ' +
                     'type = \'Date\' ' +
-                    'ORDER BY name';
+                    'ORDER BY name ' +
+                    'UNION ALL SELECT \' \' AS name';
                 break;
             case 'DATETIME':
                 query = 'SELECT name ' +

diff --git a/src/sql_query.ts b/src/sql_query.ts
@@ -52,6 +52,7 @@ export default class SqlQuery {
                     ast.where = [];
                 }
                 let target = SqlQuery.target(ast.from[0], this.target);
+
                 adhocFilters.forEach(function (af) {
                     let parts = af.key.split('.');
                     /* Wildcard table, substitute current target table */
@@ -72,7 +73,7 @@ export default class SqlQuery {
                     }
                     let operator = SqlQuery.clickhouseOperator(af.operator);
                     let cond = parts[2] + " " + operator + " "
-                        + ((af.value.indexOf("'") > -1 || af.value.indexOf(", ") > -1) ? af.value : "'" + af.value + "'");
+                        + ((af.value.indexOf("'") > -1 || af.value.indexOf(", ") > -1 || af.value.match(/^\s*\d+\s*$/)) ? af.value : "'" + af.value + "'");
                     adhocCondition.push(cond);
                     if (ast.where.length > 0) {
                         // OR is not implemented