fixed an issue with $INDEX$ autocomplete

mayorova · Apr 8, 2013 · 2a310dc · 2a310dc
1 parent e1810c8
commit 2a310dc
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/kb/aliases.js b/kb/aliases.js
@@ -16,7 +16,7 @@ sense.kb.addEndpointDescription('_aliases', {
       __any_of: [
         {
           add: {
-            index: "",
+            index: "$INDEX$",
             alias: "",
             filter: {},
             routing: "1",

diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
 
   "name": "Sense (beta)",
   "description": "A JSON aware developer console to ElasticSearch.",
-  "version": "0.5.0",
+  "version": "0.5.1",
 
   "icons": {
     "16": "icons/logo16.png",

diff --git a/src/autocomplete.js b/src/autocomplete.js
@@ -336,8 +336,7 @@
       if (rules) {
         if (typeof rules == "string") {
           if (rules == "$INDEX$") {
-            if (ACTIVE_INDICES)
-              $.merge(autocompleteSet.completionTerms, ACTIVE_INDICES);
+            $.merge(autocompleteSet.completionTerms, global.sense.mappings.getIndices());
           }
           else if (rules == "$FIELD$") {
             $.merge(autocompleteSet.completionTerms,

diff --git a/tests/src/integration_tests.js b/tests/src/integration_tests.js
@@ -295,6 +295,29 @@ context_tests(
     ]
 );
 
+context_tests(
+    {
+      "index": "123"
+    },
+    MAPPING,
+    {
+      endpoints: {
+        _test: {
+          data_autocomplete_rules: {
+            index: "$INDEX$"
+          }
+        }}
+    },
+    "_test",
+    [
+      {
+        name: "$INDEX$ matching",
+        cursor: { row: 1, column: 15},
+        autoCompleteSet: { completionTerms: ["index1", "index2"] }
+      }
+    ]
+);
+
 context_tests(
     {
       "array": [