From eebc293c0d40abb31a8ca8dec9a77fcafbf9b16b Mon Sep 17 00:00:00 2001 From: Adrian Yavorskyy Date: Wed, 1 Mar 2017 13:57:45 +0200 Subject: [PATCH] HUE-3947 [editor] Offer to manually run queries in editor when sample data timeouts --- .../core/src/desktop/static/desktop/js/ko.hue-bindings.js | 6 ++++++ desktop/core/src/desktop/templates/sql_context_popover.mako | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js b/desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js index 7f49072..5e52951 100644 --- a/desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js +++ b/desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js @@ -3842,6 +3842,12 @@ } }); + huePubSub.subscribe('sample.error.insert.click', function(popoverEntry) { + var table = popoverEntry.identifierChain[popoverEntry.identifierChain.length - 1]['name']; + var text = "SELECT * FROM " + table + " LIMIT 100"; + editor.session.insert(editor.getCursorPosition(), text); + }); + var $tableDropMenu = $el.next('.table-drop-menu'); var $identifierDropMenu = $tableDropMenu.find('.editor-drop-identifier'); diff --git a/desktop/core/src/desktop/templates/sql_context_popover.mako b/desktop/core/src/desktop/templates/sql_context_popover.mako index b87f770..6729794 100644 --- a/desktop/core/src/desktop/templates/sql_context_popover.mako +++ b/desktop/core/src/desktop/templates/sql_context_popover.mako @@ -396,7 +396,12 @@ from metadata.conf import has_navigator
-
+
+ + + ${_('Insert ')} ${_(' sample query')} ${_('at cursor')} + +
@@ -504,6 +509,7 @@ from metadata.conf import has_navigator }); }; + function TableAndColumnContextTabs(data, sourceType, defaultDatabase, isColumn, isComplex) { var self = this; self.tabs = ko.observableArray(); @@ -605,7 +611,9 @@ from metadata.conf import has_navigator template: 'sql-context-table-and-column-sample', templateData: self.sample, errorText: '${ _("There was a problem loading the samples.") }', - isColumn: isColumn + isColumn: isColumn, + title: self.title, + enableSampleError: true }); } -- 2.9.3 (Apple Git-75)