Updated to top master

dlumbrer · Jul 28, 2017 · 98a4b5f · 98a4b5f
1 parent 2b59b56
commit 98a4b5f
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,12 +1,31 @@
 {
   "name": "kbn_searchtables",
-  "version": "5.4.3",
+  "version": "5.5.0-1",
+  "kibana": {
+    "version": "5.4.3"
+  },
   "authors": [
   "David Moreno Lumbreras <dmorenolumb@gmail.com>"
   ],
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/dlumbrer/kbn_searchtables"
+  },
+  "scripts": {
+    "lint": "eslint",
+    "start": "plugin-helpers start",
+    "test:server": "plugin-helpers test:server",
+    "test:browser": "plugin-helpers test:browser",
+    "build": "plugin-helpers build",
+    "postinstall": "plugin-helpers postinstall"
+  },
+  "devDependencies": {
+    "@elastic/eslint-config-kibana": "0.0.2",
+    "@elastic/plugin-helpers": "^6.0.0",
+    "babel-eslint": "4.1.8",
+    "chai": "^3.5.0",
+    "eslint": "1.10.3",
+    "eslint-plugin-mocha": "1.1.0"
   }
 }
diff --git a/public/kbn_searchtables.html b/public/kbn_searchtables.html
@@ -6,8 +6,23 @@ <h4>No results found</h4>
 
 
   <div ng-if="tableGroups" class="kbn-searchtables-container">
-    <input ng-model="inputSearch" id="inputSearch"></input>
-    <button ng-click="doSearch()">search {{inputSearch}}</button>
+
+    <div ng-hide="showInput" class="width: 100%;" align="right" id="textSearch">
+      <a ng-click="showInput = true">Search</a>
+    </div>
+
+  	<div class="kuiLocalSearch"  id="inputSearchContainer" ng-show="showInput">
+      <div class="kuiLocalSearchAssistedInput">
+        <input ng-model="inputSearch" ng-keyup="$event.keyCode == 13 && doSearch()" id="inputSearch" placeholder="Search..." class="kuiLocalSearchInput ng-touched" autocomplete="off" type="text">
+      </div>
+      <button ng-click="doSearch()" aria-label="Search" class="kuiLocalSearchButton" id="inputSearchButton">
+        <span aria-hidden="true" class="kuiIcon fa-search"></span>
+      </button>
+      <button ng-click="showInput = false" class="kuiLocalSearchButton" id="cancelSearchButton">
+        <span aria-hidden="true" class="kuiIcon kuiButton--danger fa-times"></span>
+      </button>
+    </div>
+
     <kbn-agg-table-group
       group="tableGroups"
       export-title="vis.title"

diff --git a/public/kbn_searchtables.js b/public/kbn_searchtables.js
@@ -50,7 +50,7 @@ function SearchTablesVisTypeProvider(Private) {
         showTotal: false,
         totalFunc: 'sum'
       },
-      editor: '<kbn-searchtables-params></kbn-searchtables-params>'
+      editor: '<search-tables-vis-params></search-tables-vis-params>'
     },
     implementsRenderComplete: true,
     hierarchicalData: function (vis) {
@@ -61,6 +61,7 @@ function SearchTablesVisTypeProvider(Private) {
         group: 'metrics',
         name: 'metric',
         title: 'Metric',
+        aggFilter: '!geo_centroid',
         min: 1,
         defaults: [
           { type: 'count', schema: 'metric' }

diff --git a/public/kbn_searchtables.less b/public/kbn_searchtables.less
@@ -25,3 +25,34 @@
       display: none;
     }
   }
+
+#inputSearchContainer
+{
+  width: 100%;
+}
+
+#inputSearch
+{
+  border-color: #ecf0f1;
+  border-width: 2px 0px 2px 2px;
+}
+#inputSearch:focus
+{
+  border-color: #b4bcc2;
+}
+
+#inputSearchButton
+{
+  height: 32px;
+}
+
+#cancelSearchButton
+{
+  height: 32px;
+  background-color: #D76051;
+}
+
+#textSearch
+{
+  padding-right: 20px;
+}