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 37B16200C66 for ; Sun, 30 Apr 2017 17:55:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 36362160BA4; Sun, 30 Apr 2017 15:55:25 +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 09818160B9D for ; Sun, 30 Apr 2017 17:55:23 +0200 (CEST) Received: (qmail 42038 invoked by uid 500); 30 Apr 2017 15:55: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 42029 invoked by uid 99); 30 Apr 2017 15:55: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; Sun, 30 Apr 2017 15:55:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 23C5FDFD78; Sun, 30 Apr 2017 15:55:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vsairam@apache.org To: commits@ambari.apache.org Message-Id: <7aa67663e75b4681b75136635fee3c9b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: Revert "AMBARI-20139.Need to show data in sorted order in Hive view(Venkata Sairam)" Date: Sun, 30 Apr 2017 15:55:23 +0000 (UTC) archived-at: Sun, 30 Apr 2017 15:55:25 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.5 ca79dedff -> 8080f8384 Revert "AMBARI-20139.Need to show data in sorted order in Hive view(Venkata Sairam)" This reverts commit ca79dedff9feb1a0f5eedd726b3d30ee875085ad. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8080f838 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8080f838 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8080f838 Branch: refs/heads/branch-2.5 Commit: 8080f838475ea181d85761792211db13412d3d59 Parents: ca79ded Author: Venkata Sairam Authored: Sun Apr 30 21:22:59 2017 +0530 Committer: Venkata Sairam Committed: Sun Apr 30 21:22:59 2017 +0530 ---------------------------------------------------------------------- .../resources/ui/app/components/jobs-browser.js | 18 +------- .../resources/ui/app/components/setting-list.js | 9 ---- .../main/resources/ui/app/controllers/udfs.js | 2 - .../resources/ui/app/routes/savedqueries.js | 11 +---- .../src/main/resources/ui/app/routes/udfs.js | 10 +---- .../src/main/resources/ui/app/styles/app.scss | 4 -- .../app/templates/components/jobs-browser.hbs | 42 +++--------------- .../app/templates/components/setting-list.hbs | 8 +--- .../resources/ui/app/templates/savedqueries.hbs | 46 +++++--------------- .../main/resources/ui/app/templates/udfs.hbs | 38 +++++----------- 10 files changed, 33 insertions(+), 155 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8080f838/contrib/views/hive20/src/main/resources/ui/app/components/jobs-browser.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/components/jobs-browser.js b/contrib/views/hive20/src/main/resources/ui/app/components/jobs-browser.js index 7e24843..be2771c 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/components/jobs-browser.js +++ b/contrib/views/hive20/src/main/resources/ui/app/components/jobs-browser.js @@ -24,12 +24,7 @@ export default Ember.Component.extend({ maxEndTime: null, statusFilter: null, titleFilter: null, - jobId: {'asc':true}, - title: {'noSort':true}, - status: {'noSort':true}, - dateSubmitted: {'noSort':true}, - duration: {'noSort':true}, - sortProp:['id:desc'], + sortedJobs: Ember.computed.sort('jobs', function (m1, m2) { if (m1.get('dateSubmitted') < m2.get('dateSubmitted')) { return 1; @@ -47,7 +42,7 @@ export default Ember.Component.extend({ } }), - filteredJobs: Ember.computed('titleFilteredJobs', 'statusFilter', 'sortProp', function () { + filteredJobs: Ember.computed('titleFilteredJobs', 'statusFilter', function () { if (this.get('statusFilter')) { return this.get('titleFilteredJobs').filter((entry) => entry.get('status').toLowerCase() === this.get('statusFilter')); } else { @@ -55,8 +50,6 @@ export default Ember.Component.extend({ } }), - filteredJobsSorted: Ember.computed.sort('filteredJobs', 'sortProp'), - statusCounts: Ember.computed('titleFilteredJobs', function () { return this.get('titleFilteredJobs').reduce((acc, item, index) => { let status = item.get('status').toLowerCase(); @@ -71,13 +64,6 @@ export default Ember.Component.extend({ actions: { - sort(sortProp, sortField, key) { - let perm = {}; - perm[key] = true; - this.set(sortField, perm); - this.set('sortProp', [sortProp]); - }, - setDateRange(startDate, endDate) { this.sendAction('filterChanged', startDate, endDate); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/8080f838/contrib/views/hive20/src/main/resources/ui/app/components/setting-list.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/components/setting-list.js b/contrib/views/hive20/src/main/resources/ui/app/components/setting-list.js index c410a2a..72a83a3 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/components/setting-list.js +++ b/contrib/views/hive20/src/main/resources/ui/app/components/setting-list.js @@ -20,16 +20,7 @@ import Ember from 'ember'; export default Ember.Component.extend({ settings: [], - settingsConf: {'noSort':true}, - sortProp:['id:desc'], - settingsSorted: Ember.computed.sort('settings', 'sortProp'), actions: { - sort(sortProp, sortField, key) { - let perm = {}; - perm[key] = true; - this.set(sortField, perm); - this.set('sortProp', [sortProp]); - }, addNewSettings() { this.sendAction('newSettings'); } http://git-wip-us.apache.org/repos/asf/ambari/blob/8080f838/contrib/views/hive20/src/main/resources/ui/app/controllers/udfs.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/controllers/udfs.js b/contrib/views/hive20/src/main/resources/ui/app/controllers/udfs.js index 98c4dc8..dc99fd1 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/controllers/udfs.js +++ b/contrib/views/hive20/src/main/resources/ui/app/controllers/udfs.js @@ -19,6 +19,4 @@ import Ember from 'ember'; export default Ember.Controller.extend({ - "sortProp": ['id:desc'], - sortedUDF : Ember.computed.sort("udflist", "sortProp") }); http://git-wip-us.apache.org/repos/asf/ambari/blob/8080f838/contrib/views/hive20/src/main/resources/ui/app/routes/savedqueries.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/routes/savedqueries.js b/contrib/views/hive20/src/main/resources/ui/app/routes/savedqueries.js index 463768e..e896348 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/routes/savedqueries.js +++ b/contrib/views/hive20/src/main/resources/ui/app/routes/savedqueries.js @@ -34,19 +34,10 @@ export default Ember.Route.extend(UILoggerMixin, { controller.set('showDeleteSaveQueryModal', false); controller.set('selectedSavedQueryId', null); - controller.set('preview', {"noSort":true}); - controller.set('title', {"noSort":true}); - controller.set('dataBase', {"noSort":true}); - controller.set('owner', {"noSort":true}); }, actions: { - sort(sortProp, sortField, key) { - let perm = {}; - perm[key] = true; - this.get('controller').set(sortField, perm); - this.get('controller').set('sortProp', [sortProp]); - }, + deleteSavedQuery(){ let queryId = this.get('controller').get('selectedSavedQueryId'); let self = this; http://git-wip-us.apache.org/repos/asf/ambari/blob/8080f838/contrib/views/hive20/src/main/resources/ui/app/routes/udfs.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/routes/udfs.js b/contrib/views/hive20/src/main/resources/ui/app/routes/udfs.js index 2e89793..68e06a9 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/routes/udfs.js +++ b/contrib/views/hive20/src/main/resources/ui/app/routes/udfs.js @@ -44,18 +44,10 @@ export default Ember.Route.extend({ fileResourceList.push({'name':'Add New File Resource', 'action':'addNewFileResource'}); controller.set('fileResourceList', fileResourceList); }); - controller.set('name', {'noSort':true}); - controller.set('classname', {'noSort':true}); - controller.set('owner', {'noSort':true}); }, actions:{ - sort(sortProp, sortField, key) { - let perm = {}; - perm[key] = true; - this.get('controller').set(sortField, perm); - this.get('controller').set('sortProp', [sortProp]); - }, + refreshUdfList(){ this.get('store').findAll('udf').then((data) => { let udfList = []; http://git-wip-us.apache.org/repos/asf/ambari/blob/8080f838/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss index 83fac86..766157a 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss +++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss @@ -1009,7 +1009,3 @@ rect.operator__box { .button-container { margin-top: 10px; } - -.sort-icon { - padding-left: 5px; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/8080f838/contrib/views/hive20/src/main/resources/ui/app/templates/components/jobs-browser.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/templates/components/jobs-browser.hbs b/contrib/views/hive20/src/main/resources/ui/app/templates/components/jobs-browser.hbs index d29ca73..338828e 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/templates/components/jobs-browser.hbs +++ b/contrib/views/hive20/src/main/resources/ui/app/templates/components/jobs-browser.hbs @@ -54,46 +54,16 @@ - - - - - + + + + + - {{#each filteredJobsSorted as |job| }} + {{#each filteredJobs as |job| }} {{job-item job=job}} {{/each}} http://git-wip-us.apache.org/repos/asf/ambari/blob/8080f838/contrib/views/hive20/src/main/resources/ui/app/templates/components/setting-list.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/templates/components/setting-list.hbs b/contrib/views/hive20/src/main/resources/ui/app/templates/components/setting-list.hbs index 5c91550..c3f9c76 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/templates/components/setting-list.hbs +++ b/contrib/views/hive20/src/main/resources/ui/app/templates/components/setting-list.hbs @@ -19,17 +19,13 @@
Job ID - - {{#if jobId.noSort}}{{/if}} - {{#if jobId.desc}}{{/if}} - {{#if jobId.asc}}{{/if}} - - Title - - {{#if title.noSort}}{{/if}} - {{#if title.desc}}{{/if}} - {{#if title.asc}}{{/if}} - - Status - - {{#if status.noSort}}{{/if}} - {{#if status.desc}}{{/if}} - {{#if status.asc}}{{/if}} - - Start time - - {{#if dateSubmitted.noSort}}{{/if}} - {{#if dateSubmitted.desc}}{{/if}} - {{#if dateSubmitted.asc}}{{/if}} - - Duration(in seconds) - - {{#if duration.noSort}}{{/if}} - {{#if duration.desc}}{{/if}} - {{#if duration.asc}}{{/if}} - - Job IDTitleStatusStart timeDuration(in seconds) Action
- + - {{#each settingsSorted as |setting|}} + {{#each settings as |setting|}} {{yield setting}} {{/each}} http://git-wip-us.apache.org/repos/asf/ambari/blob/8080f838/contrib/views/hive20/src/main/resources/ui/app/templates/savedqueries.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/templates/savedqueries.hbs b/contrib/views/hive20/src/main/resources/ui/app/templates/savedqueries.hbs index ca533e0..ce7315f 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/templates/savedqueries.hbs +++ b/contrib/views/hive20/src/main/resources/ui/app/templates/savedqueries.hbs @@ -19,44 +19,20 @@
- {{#if sortedSavedQueries.length}} + {{#if savedQuerylist.length}} -
KEY - {{#if settingsConf.noSort}}{{/if}} - {{#if settingsConf.desc}}{{/if}} - {{#if settingsConf.asc}}{{/if}} - KEY VALUE ACTIONS
- - - - - - - +
Preview - - {{#if preview.noSort}}{{/if}} - {{#if preview.desc}}{{/if}} - {{#if preview.asc}}{{/if}} - - Title - - {{#if title.noSort}}{{/if}} - {{#if title.desc}}{{/if}} - {{#if title.asc}}{{/if}} - - Database - - {{#if dataBase.noSort}}{{/if}} - {{#if dataBase.desc}}{{/if}} - {{#if dataBase.asc}}{{/if}} - - Owner - - {{#if owner.noSort}}{{/if}} - {{#if owner.desc}}{{/if}} - {{#if owner.asc}}{{/if}} - - Action
+ + + + + + + - {{#each sortedSavedQueries as |savedQuery| }} + {{#each savedQuerylist as |savedQuery| }} @@ -71,7 +47,7 @@
PreviewTitleDatabaseOwnerAction
{{savedQuery.shortQuery}} {{savedQuery.title}}
{{/if}} - {{#unless sortedSavedQueries.length}} + {{#unless savedQuerylist.length}}
There is no saved query.
http://git-wip-us.apache.org/repos/asf/ambari/blob/8080f838/contrib/views/hive20/src/main/resources/ui/app/templates/udfs.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/templates/udfs.hbs b/contrib/views/hive20/src/main/resources/ui/app/templates/udfs.hbs index c4fe34c..f2efaca 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/templates/udfs.hbs +++ b/contrib/views/hive20/src/main/resources/ui/app/templates/udfs.hbs @@ -25,36 +25,18 @@
- {{#if sortedUDF.length}} + {{#if udflist.length}} - - - - - - - - {{#each sortedUDF as |udf| }} + + + + + + + + {{#each udflist as |udf| }} {{udf-item udf=udf fileResourceList=fileResourceList @@ -65,7 +47,7 @@
UDF Name - - {{#if name.noSort}}{{/if}} - {{#if name.desc}}{{/if}} - {{#if name.asc}}{{/if}} - - UDF Class Name - - {{#if classname.noSort}}{{/if}} - {{#if classname.desc}}{{/if}} - {{#if classname.asc}}{{/if}} - - Owner - - {{#if owner.noSort}}{{/if}} - {{#if owner.desc}}{{/if}} - {{#if owner.asc}}{{/if}} - - Action
UDF NameUDF Class NameOwnerAction
{{/if}} - {{#unless sortedUDF.length}} + {{#unless udflist.length}}
There is No UDF.