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 06055200D0A for ; Wed, 4 Oct 2017 20:50:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 044951609DD; Wed, 4 Oct 2017 18:50:10 +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 22FF11609D6 for ; Wed, 4 Oct 2017 20:50:08 +0200 (CEST) Received: (qmail 40909 invoked by uid 500); 4 Oct 2017 18:50:08 -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 40900 invoked by uid 99); 4 Oct 2017 18:50:08 -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; Wed, 04 Oct 2017 18:50:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4A9B9F56A3; Wed, 4 Oct 2017 18:50:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pallavkul@apache.org To: commits@ambari.apache.org Message-Id: <19f2cd41799c4d549f8b7e6002a95610@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-22089. Hive View 2.0 - Unable to update existing saved queries, view creates new records under saved queries tab (pallavkul) Date: Wed, 4 Oct 2017 18:50:06 +0000 (UTC) archived-at: Wed, 04 Oct 2017 18:50:10 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.6 ed1f9520c -> c523eb971 AMBARI-22089. Hive View 2.0 - Unable to update existing saved queries, view creates new records under saved queries tab (pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c523eb97 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c523eb97 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c523eb97 Branch: refs/heads/branch-2.6 Commit: c523eb9719c6c2d05acc54234426e7dd0ed269b7 Parents: ed1f952 Author: pallavkul Authored: Fri Sep 29 20:50:43 2017 +0530 Committer: pallavkul Committed: Thu Oct 5 00:19:46 2017 +0530 ---------------------------------------------------------------------- .../savedQueries/SavedQueryResourceManager.java | 17 ++++-- .../resources/ui/app/routes/queries/query.js | 63 +++++++++++++++----- .../hive20/src/main/resources/ui/yarn.lock | 2 +- 3 files changed, 61 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c523eb97/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryResourceManager.java ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryResourceManager.java b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryResourceManager.java index 3690683..fff202c 100644 --- a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryResourceManager.java +++ b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryResourceManager.java @@ -115,12 +115,17 @@ public class SavedQueryResourceManager extends PersonalCRUDResourceManager 0) ? currentQuery : ";"; + let savedQueryId = this.get('controller.model').get('id'); - let payload = {"title" : newTitle, - "dataBase": selectedDb, - "owner" : owner, - "shortQuery" : (currentQuery.length > 0) ? currentQuery : ";", - "queryFile" : queryFile, - "logFile" : logFile}; + + this.store.findAll('savedQuery').then(savedQueries => { + return savedQueries.toArray(); + }).then((existingSavedQueries) =>{ + + var queryExist = existingSavedQueries.filterBy('id', savedQueryId).get('firstObject'); + + if(queryExist){ + this.send('updateSavedQuery', queryExist.get('id')); + } else{ + this.send('addSavedQuery', selectedDb, newTitle, owner, shortQuery ); + } + + + }); + + }, + + addSavedQuery(selectedDb, newTitle, owner, shortQuery){ let newSaveQuery = this.get('store').createRecord('saved-query', { dataBase:selectedDb, title:newTitle, - queryFile: queryFile, owner: owner, - shortQuery: (currentQuery.length > 0) ? currentQuery : ";" + shortQuery: shortQuery }); - newSaveQuery.save().then((data) => { - console.log('saved query saved'); - this.get('controller.model').set('title', newTitle); this.get('controller.model').set('isQueryDirty', false); this.get('controller').set('worksheetModalSuccess', true); - Ember.run.later(() => { this.get('controller').set('showWorksheetModal', false); this.closeWorksheetAfterSave(); }, 2 * 1000); - }); }, + updateSavedQuery(savedQueryId){ + let currentQuery = this.get('controller.model').get('query'); + let selectedDb = this.get('controller.model').get('selectedDb'); + let owner = this.get('controller.model').get('owner'); + + this.get('store').findRecord('saved-query', savedQueryId ).then(savedQuery => { + savedQuery.set('shortQuery', (currentQuery.length > 0) ? currentQuery : ";"); + savedQuery.set('dataBase', selectedDb ); + savedQuery.set('owner', owner ); + + savedQuery.save().then(savedQuery => { + + this.get('controller.model').set('isQueryDirty', false); + this.get('controller').set('worksheetModalSuccess', true); + + Ember.run.later(() => { + this.get('controller').set('showWorksheetModal', false); + this.closeWorksheetAfterSave(); + }, 2 * 1000); + }) + + }); + + + }, + closeWorksheetModal(){ this.get('controller').set('showWorksheetModal', false); this.closeWorksheetAfterSave(); this.get('controller.model').set('tabDataToClose', null); - }, + }, expandQueryEdidorPanel(){ if(!this.get('isQueryEdidorPaneExpanded')){ http://git-wip-us.apache.org/repos/asf/ambari/blob/c523eb97/contrib/views/hive20/src/main/resources/ui/yarn.lock ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/yarn.lock b/contrib/views/hive20/src/main/resources/ui/yarn.lock index 477a15c..607cf81 100644 --- a/contrib/views/hive20/src/main/resources/ui/yarn.lock +++ b/contrib/views/hive20/src/main/resources/ui/yarn.lock @@ -569,7 +569,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-block-scoping@^6.23.0: +babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576" dependencies: