Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 712E1173B3 for ; Tue, 3 Nov 2015 03:13:24 +0000 (UTC) Received: (qmail 23837 invoked by uid 500); 3 Nov 2015 03:13:24 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 23796 invoked by uid 500); 3 Nov 2015 03:13:24 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 23778 invoked by uid 99); 3 Nov 2015 03:13:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Nov 2015 03:13:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 215E4E0572; Tue, 3 Nov 2015 03:13:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Tue, 03 Nov 2015 03:13:24 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ignite git commit: IGNITE-1703 Show query result. Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 3c762c5de -> c1325c896 IGNITE-1703 Show query result. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d1d30253 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1d30253 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1d30253 Branch: refs/heads/ignite-843-rc1 Commit: d1d302534eec33833bba9231ab3e4cd3d3f8b920 Parents: 3c762c5 Author: vsisko Authored: Tue Nov 3 10:07:30 2015 +0700 Committer: Alexey Kuznetsov Committed: Tue Nov 3 10:07:30 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 29 ++++++++++++++++++-- .../src/main/js/views/sql/sql.jade | 4 +-- 2 files changed, 28 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d1d30253/modules/control-center-web/src/main/js/controllers/sql-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index 5341c78..f25eef1 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -26,8 +26,6 @@ consoleModule.controller('sqlController', $scope.agentGoal = 'execute sql statements'; $scope.agentTestDriveOption = '--test-drive-sql'; - $scope.showMessage = $message.message; - $scope.joinTip = $common.joinTip; $scope.caches = []; @@ -1306,5 +1304,32 @@ consoleModule.controller('sqlController', $loading.finish('loadingCacheMetadata'); }); } + }; + + $scope.showResultQuery = function (paragraph) { + if ($common.isDefined(paragraph)) { + var title; + var queryMsg; + + switch (paragraph.queryArgs.type) { + case 'QUERY': + title = 'SQL query'; + queryMsg = paragraph.queryArgs.query; + + break; + + case 'EXPLAIN': + title = 'Explain query'; + queryMsg = paragraph.queryArgs.query; + + break; + + default: + title = 'SCAN query'; + queryMsg = 'SCAN query for cache ' + paragraph.queryArgs.cacheName + ''; + } + + $message.message(title, [queryMsg]); + } } }]); http://git-wip-us.apache.org/repos/asf/ignite/blob/d1d30253/modules/control-center-web/src/main/js/views/sql/sql.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade index aebae6a..58c739f 100644 --- a/modules/control-center-web/src/main/js/views/sql/sql.jade +++ b/modules/control-center-web/src/main/js/views/sql/sql.jade @@ -199,10 +199,8 @@ block container |  query div(ng-show='queryExecuted(paragraph) && !paragraph.refreshExecuting()') -var nextVisibleCondition = 'paragraph.queryId && (paragraph.table() || paragraph.chart() && paragraph.queryExecute() && (paragraph.timeLineSupported() || !paragraph.chartTimeLineEnabled()))' - -var queryLinkStyle = 'float: left; margin-left: 5px; margin-bottom: 5px;' hr(style='margin-top: 0; margin-bottom: 5px') - a(ng-show='paragraph.queryArgs.type != "SCAN"' style=queryLinkStyle ng-click='showMessage("Query", [paragraph.queryArgs.query])') Show query - label(ng-show='paragraph.queryArgs.type == "SCAN"' style=queryLinkStyle) Scan query + a(ng-show='paragraph.queryArgs.type' style='float: left; margin-left: 5px; margin-bottom: 5px' ng-click='showResultQuery(paragraph)') Show query i.fa.fa-chevron-circle-right(ng-show=nextVisibleCondition style='float: right;margin-right: 10px;' ng-click='nextPage(paragraph)') a(ng-show=nextVisibleCondition style='float: right; margin-bottom: 5px;margin-right: 5px;' ng-click='nextPage(paragraph)') Next