From c08b0dfa3edc79b25ebd6c99aab1dc5fc8416174 Mon Sep 17 00:00:00 2001 From: gmarz Date: Tue, 10 Jun 2014 09:01:14 -0400 Subject: [PATCH] Added the ability to specify an analyzer in the Test Analyzer action --- dist/app.js | 23 +++++++++++++++++++++-- dist/lang/en_strings.js | 5 ++++- dist/lang/fr_strings.js | 3 +++ dist/lang/pt_strings.js | 3 +++ src/app/lang/en_strings.js | 5 ++++- src/app/lang/fr_strings.js | 3 +++ src/app/lang/pt_strings.js | 3 +++ src/app/ui/nodesView/nodesView.js | 23 +++++++++++++++++++++-- 8 files changed, 62 insertions(+), 6 deletions(-) diff --git a/dist/app.js b/dist/app.js index 9c5ececd..9bafaf8f 100644 --- a/dist/app.js +++ b/dist/app.js @@ -2974,9 +2974,28 @@ }).open(); }, _testAnalyser_handler: function(index) { - this.cluster.get(index.name + "/_analyze?text=" + prompt( i18n.text("IndexCommand.TextToAnalyze") ), function(r) { - alert(JSON.stringify(r, true, " ")); + var fields = new app.ux.FieldCollection({ + fields: [ + new ui.TextField({ label: i18n.text("TestAnalyzerForm.Analyzer"), name: "analyzer", require: false}), + new ui.TextField({ label: i18n.text("TestAnalyzerForm.Text"), name: "text", require: true}) + ] }); + var dialog = new ui.DialogPanel({ + title: i18n.text("TestAnalyzerForm.Title"), + body: new ui.PanelForm({ fields: fields }), + onCommit: function( panel, args ) { + if (fields.validate()) { + var data = fields.getData(); + var params = "text=" + data["text"]; + if (data["analyzer"]) { + params += "&analyzer=" + data["analyzer"]; + } + this.cluster.get(index.name + "/_analyze?" + params, function(r) { + alert(JSON.stringify(r, true, " ")); + }); + } + }.bind(this) + }).open(); }, _deleteIndexAction_handler: function(index) { if( prompt( i18n.text("AliasForm.DeleteAliasMessage", i18n.text("Command.DELETE"), index.name ) ) === i18n.text("Command.DELETE") ) { diff --git a/dist/lang/en_strings.js b/dist/lang/en_strings.js index 0cf862ab..a30f3387 100644 --- a/dist/lang/en_strings.js +++ b/dist/lang/en_strings.js @@ -42,7 +42,7 @@ i18n.setKeys({ "IndexActionsMenu.Flush": "Flush", "IndexActionsMenu.Optimize": "Optimize...", "IndexActionsMenu.Snapshot": "Gateway Snapshot", - "IndexActionsMenu.Analyser": "Test Analyser", + "IndexActionsMenu.Analyser": "Test Analyzer", "IndexActionsMenu.Open": "Open", "IndexActionsMenu.Close": "Close", "IndexActionsMenu.Delete": "Delete...", @@ -94,6 +94,9 @@ i18n.setKeys({ "Output.CSV": "CSV", "Output.ShowSource": "Show query source", "TableResults.Summary": "Searched {0} of {1} shards. {2} hits. {3} seconds", + "TestAnalyzerForm.Title": "Test Analyzer", + "TestAnalyzerForm.Analyzer": "Analyzer", + "TestAnalyzerForm.Text": "Text", "QueryFilter.AllIndices": "All Indices", "QueryFilter.AnyValue": "any", "QueryFilter-Header-Indices": "Indices", diff --git a/dist/lang/fr_strings.js b/dist/lang/fr_strings.js index 29a7dc18..0219d5cb 100644 --- a/dist/lang/fr_strings.js +++ b/dist/lang/fr_strings.js @@ -76,6 +76,9 @@ i18n.setKeys({ "Output.Table": "Tableau", "Output.ShowSource": "Voir la requête source", "TableResults.Summary": "Recherche sur {0} des {1} shards. {2} résultats. {3} secondes", + "TestAnalyzerForm.Title": "Tester un analyseur", + "TestAnalyzerForm.Analyzer": "Analyseur", + "TestAnalyzerForm.Text": "Texte", "QueryFilter.AllIndices": "Tous les index", "QueryFilter.AnyValue": "Tout", "QueryFilter-Header-Indices": "Index", diff --git a/dist/lang/pt_strings.js b/dist/lang/pt_strings.js index 91a08df1..5570fdb4 100644 --- a/dist/lang/pt_strings.js +++ b/dist/lang/pt_strings.js @@ -89,6 +89,9 @@ i18n.setKeys({ "Output.CSV": "CSV", "Output.ShowSource": "Mostrar consulta original", "TableResults.Summary": "Buscado {0} de {1} shards. {2} resultados. {3} segundos", + "TestAnalyzerForm.Title": "Analizador de teste", + "TestAnalyzerForm.Analyzer": "Analizador", + "TestAnalyzerForm.Text": "Texto", "QueryFilter.AllIndices": "Todos os Índices", "QueryFilter.AnyValue": "qualquer", "QueryFilter-Header-Indices": "Índices", diff --git a/src/app/lang/en_strings.js b/src/app/lang/en_strings.js index 0cf862ab..a30f3387 100644 --- a/src/app/lang/en_strings.js +++ b/src/app/lang/en_strings.js @@ -42,7 +42,7 @@ i18n.setKeys({ "IndexActionsMenu.Flush": "Flush", "IndexActionsMenu.Optimize": "Optimize...", "IndexActionsMenu.Snapshot": "Gateway Snapshot", - "IndexActionsMenu.Analyser": "Test Analyser", + "IndexActionsMenu.Analyser": "Test Analyzer", "IndexActionsMenu.Open": "Open", "IndexActionsMenu.Close": "Close", "IndexActionsMenu.Delete": "Delete...", @@ -94,6 +94,9 @@ i18n.setKeys({ "Output.CSV": "CSV", "Output.ShowSource": "Show query source", "TableResults.Summary": "Searched {0} of {1} shards. {2} hits. {3} seconds", + "TestAnalyzerForm.Title": "Test Analyzer", + "TestAnalyzerForm.Analyzer": "Analyzer", + "TestAnalyzerForm.Text": "Text", "QueryFilter.AllIndices": "All Indices", "QueryFilter.AnyValue": "any", "QueryFilter-Header-Indices": "Indices", diff --git a/src/app/lang/fr_strings.js b/src/app/lang/fr_strings.js index 29a7dc18..0219d5cb 100644 --- a/src/app/lang/fr_strings.js +++ b/src/app/lang/fr_strings.js @@ -76,6 +76,9 @@ i18n.setKeys({ "Output.Table": "Tableau", "Output.ShowSource": "Voir la requête source", "TableResults.Summary": "Recherche sur {0} des {1} shards. {2} résultats. {3} secondes", + "TestAnalyzerForm.Title": "Tester un analyseur", + "TestAnalyzerForm.Analyzer": "Analyseur", + "TestAnalyzerForm.Text": "Texte", "QueryFilter.AllIndices": "Tous les index", "QueryFilter.AnyValue": "Tout", "QueryFilter-Header-Indices": "Index", diff --git a/src/app/lang/pt_strings.js b/src/app/lang/pt_strings.js index 91a08df1..5570fdb4 100644 --- a/src/app/lang/pt_strings.js +++ b/src/app/lang/pt_strings.js @@ -89,6 +89,9 @@ i18n.setKeys({ "Output.CSV": "CSV", "Output.ShowSource": "Mostrar consulta original", "TableResults.Summary": "Buscado {0} de {1} shards. {2} resultados. {3} segundos", + "TestAnalyzerForm.Title": "Analizador de teste", + "TestAnalyzerForm.Analyzer": "Analizador", + "TestAnalyzerForm.Text": "Texto", "QueryFilter.AllIndices": "Todos os Índices", "QueryFilter.AnyValue": "qualquer", "QueryFilter-Header-Indices": "Índices", diff --git a/src/app/ui/nodesView/nodesView.js b/src/app/ui/nodesView/nodesView.js index 98a23cb2..60654346 100644 --- a/src/app/ui/nodesView/nodesView.js +++ b/src/app/ui/nodesView/nodesView.js @@ -77,9 +77,28 @@ }).open(); }, _testAnalyser_handler: function(index) { - this.cluster.get(index.name + "/_analyze?text=" + prompt( i18n.text("IndexCommand.TextToAnalyze") ), function(r) { - alert(JSON.stringify(r, true, " ")); + var fields = new app.ux.FieldCollection({ + fields: [ + new ui.TextField({ label: i18n.text("TestAnalyzerForm.Analyzer"), name: "analyzer", require: false}), + new ui.TextField({ label: i18n.text("TestAnalyzerForm.Text"), name: "text", require: true}) + ] }); + var dialog = new ui.DialogPanel({ + title: i18n.text("TestAnalyzerForm.Title"), + body: new ui.PanelForm({ fields: fields }), + onCommit: function( panel, args ) { + if (fields.validate()) { + var data = fields.getData(); + var params = "text=" + data["text"]; + if (data["analyzer"]) { + params += "&analyzer=" + data["analyzer"]; + } + this.cluster.get(index.name + "/_analyze?" + params, function(r) { + alert(JSON.stringify(r, true, " ")); + }); + } + }.bind(this) + }).open(); }, _deleteIndexAction_handler: function(index) { if( prompt( i18n.text("AliasForm.DeleteAliasMessage", i18n.text("Command.DELETE"), index.name ) ) === i18n.text("Command.DELETE") ) {