Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C0DF9200C1B for ; Mon, 30 Jan 2017 16:40:26 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BF7B8160B4D; Mon, 30 Jan 2017 15:40:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4AC5D160B6C for ; Mon, 30 Jan 2017 16:40:25 +0100 (CET) Received: (qmail 72251 invoked by uid 500); 30 Jan 2017 15:40:23 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 71605 invoked by uid 99); 30 Jan 2017 15:40:23 -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; Mon, 30 Jan 2017 15:40:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DB494DFE46; Mon, 30 Jan 2017 15:40:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Mon, 30 Jan 2017 15:40:45 -0000 Message-Id: In-Reply-To: <96589e72473b4eac9d65669845a0b732@git.apache.org> References: <96589e72473b4eac9d65669845a0b732@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/30] ambari git commit: AMBARI-19753. Hive2 View - Switching tabs after executing query loses state (pallavkul) archived-at: Mon, 30 Jan 2017 15:40:27 -0000 AMBARI-19753. Hive2 View - Switching tabs after executing query loses state (pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/589f567e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/589f567e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/589f567e Branch: refs/heads/branch-dev-patch-upgrade Commit: 589f567e37800ff606f5c40eca99508ce8910899 Parents: 75c126e Author: pallavkul Authored: Mon Jan 30 15:24:03 2017 +0530 Committer: pallavkul Committed: Mon Jan 30 15:24:03 2017 +0530 ---------------------------------------------------------------------- .../src/main/resources/ui/app/models/worksheet.js | 3 ++- .../src/main/resources/ui/app/routes/queries/query.js | 12 ++++++------ .../main/resources/ui/app/templates/queries/query.hbs | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/589f567e/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js index 9021e90..6a77633 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js +++ b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js @@ -35,6 +35,7 @@ export default DS.Model.extend({ selectedMultiDb: DS.attr(), queryFile: DS.attr('string', {defaultValue: ""}), logFile: DS.attr('string', {defaultValue: ""}), - logResults: DS.attr('string', {defaultValue: ""}) + logResults: DS.attr('string', {defaultValue: ""}), + isQueryRunning: DS.attr('boolean', {defaultValue: false}) }); http://git-wip-us.apache.org/repos/asf/ambari/blob/589f567e/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js index 7d387f0..753b7f7 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js +++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js @@ -75,10 +75,10 @@ export default Ember.Route.extend({ selectedMultiDb.pushObject(selecteDBName); controller.set('worksheet', model); - controller.set('selectedTablesModels',this.get('controller.model').get('selectedTablesModels') || selectedTablesModels ); + controller.set('selectedTablesModels',model.get('selectedTablesModels') || selectedTablesModels ); - controller.set('selectedMultiDb', this.get('controller.model').get('selectedMultiDb') || selectedMultiDb); - controller.set('isQueryRunning', false); + controller.set('selectedMultiDb', model.get('selectedMultiDb') || selectedMultiDb); + controller.set('isQueryRunning', model.get('isQueryRunning')); controller.set('currentQuery', model.get('query')); controller.set('queryResult', model.get('queryResult')); controller.set('currentJobId', null); @@ -143,7 +143,7 @@ export default Ember.Route.extend({ let worksheetTitle = this.get('controller.model').get('title'); self.get('controller.model').set('jobData', []); - self.get('controller').set('isQueryRunning', true); + self.get('controller.model').set('isQueryRunning', true); //Making the result set emply every time query runs. self.get('controller').set('queryResult', self.get('controller').get('queryResult')); @@ -247,7 +247,7 @@ export default Ember.Route.extend({ self.get('controller').set('queryResult', data); self.get('controller.model').set('queryResult', data); - self.get('controller').set('isQueryRunning', false); + self.get('controller.model').set('isQueryRunning', false); let localArr = self.get('controller.model').get("jobData"); localArr.push(data); @@ -299,7 +299,7 @@ export default Ember.Route.extend({ console.log('getJob route', data ); self.get('controller').set('queryResult', data); self.get('controller.model').set('queryResult', data); - self.get('controller').set('isQueryRunning', false); + self.get('controller.model').set('isQueryRunning', false); self.get('controller.model').set('hidePreviousButton', false); let localArr = self.get('controller.model').get("jobData"); http://git-wip-us.apache.org/repos/asf/ambari/blob/589f567e/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs index 7f91d6c..5cdc9b3 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs +++ b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs @@ -30,7 +30,7 @@
- {{#if isQueryRunning}} + {{#if worksheet.isQueryRunning}} {{fa-icon "spinner fa-1-5" spin=true}} {{/if}}