[41/50] [abbrv] ambari git commit: AMBARI-22091.Hive view2.0 Jobs worksheets doesn't have hyperlink whereas view1.5 History worksheets had hyperlinks pointing to fetched results(Venkata Sairam)
AMBARI-22091.Hive view2.0 Jobs worksheets doesn't have hyperlink whereas view1.5 History worksheets had hyperlinks pointing to fetched results(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d4378aac Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d4378aac Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d4378aac Branch: refs/heads/branch-feature-AMBARI-20859 Commit: d4378aacbd5bd95c0367f5b8a6865ee3bbe6de04 Parents: b84cbbe Author: Venkata SairamAuthored: Sat Sep 30 09:05:33 2017 +0530 Committer: Venkata Sairam Committed: Sat Sep 30 09:05:59 2017 +0530 -- .../resources/ui/app/components/job-item.js | 49 +- .../resources/ui/app/components/jobs-browser.js | 3 + .../src/main/resources/ui/app/routes/jobs.js| 11 ++ .../main/resources/ui/app/routes/queries/new.js | 2 + .../resources/ui/app/routes/queries/query.js| 164 --- .../src/main/resources/ui/app/styles/app.scss | 8 + .../ui/app/templates/components/job-item.hbs| 2 +- .../app/templates/components/jobs-browser.hbs | 2 +- .../main/resources/ui/app/templates/jobs.hbs| 1 + 9 files changed, 177 insertions(+), 65 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/d4378aac/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js -- diff --git a/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js b/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js index 42a3411..0545624 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js +++ b/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js @@ -17,12 +17,17 @@ */ import Ember from 'ember'; +import UILoggerMixin from '../mixins/ui-logger'; -export default Ember.Component.extend({ +export default Ember.Component.extend(UILoggerMixin, { jobs: Ember.inject.service(), tagName: '', expanded: false, expandedValue: null, + store: Ember.inject.service(), + savedQueries: Ember.inject.service(), + + actions: { toggleExpandJob(jobId) { if(this.get('expanded')) { @@ -39,6 +44,48 @@ export default Ember.Component.extend({ }); } +}, +openAsWorksheet(savedQuery){ + + let hasWorksheetModel = this.get('model'), self = this; + let worksheetId; + + if (Ember.isEmpty(hasWorksheetModel)){ +worksheetId = 1; + }else { + +let isWorksheetExist = (this.get('model').filterBy('title', savedQuery.title).get('length') > 0); +if(isWorksheetExist) { + this.sendAction('openWorksheet', savedQuery, true); + return; +} + +let worksheets = this.get('model'); +worksheets.forEach((worksheet) => { + worksheet.set('selected', false); + }); +worksheetId = `worksheet${worksheets.get('length') + 1}`; + } + var isTabExisting = this.get("store").peekRecord('worksheet', savedQuery.id); + if(isTabExisting) { +self.sendAction('openWorksheet', savedQuery, true); +return; + } + this.get("savedQueries").fetchSavedQuery(savedQuery.get('queryFile')).then(function(response) { +let localWs = { + id: savedQuery.get('id'), + title: savedQuery.get('title'), + queryFile: savedQuery.get('queryFile'), + query: response.file.fileContent, + selectedDb : savedQuery.get('dataBase'), + owner: savedQuery.get('owner'), + selected: true +}; +self.sendAction('openWorksheet', localWs); + }, (error) => { +self.get('logger').danger('Failed to load the query', self.extractError(error)); +}); + } } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/d4378aac/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..ae081de 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 @@ -93,6 +93,9 @@ export default Ember.Component.extend({ clearTitleFilter() { this.set('titleFilter'); +}, +openWorksheet(worksheet, isExisitingWorksheet){ + this.sendAction("openWorksheet", worksheet, isExisitingWorksheet); } } });
ambari git commit: AMBARI-22091.Hive view2.0 Jobs worksheets doesn't have hyperlink whereas view1.5 History worksheets had hyperlinks pointing to fetched results(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 4fc5312c8 -> 6bb6dd9b0 AMBARI-22091.Hive view2.0 Jobs worksheets doesn't have hyperlink whereas view1.5 History worksheets had hyperlinks pointing to fetched results(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6bb6dd9b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6bb6dd9b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6bb6dd9b Branch: refs/heads/branch-2.5 Commit: 6bb6dd9b0f99f43d3cd937df7dc50e498b56f3fb Parents: 4fc5312 Author: Venkata SairamAuthored: Sat Sep 30 09:05:33 2017 +0530 Committer: Venkata Sairam Committed: Sat Sep 30 09:08:46 2017 +0530 -- .../resources/ui/app/components/job-item.js | 49 +- .../resources/ui/app/components/jobs-browser.js | 3 + .../src/main/resources/ui/app/routes/jobs.js| 11 ++ .../main/resources/ui/app/routes/queries/new.js | 2 + .../resources/ui/app/routes/queries/query.js| 164 --- .../src/main/resources/ui/app/styles/app.scss | 8 + .../ui/app/templates/components/job-item.hbs| 2 +- .../app/templates/components/jobs-browser.hbs | 2 +- .../main/resources/ui/app/templates/jobs.hbs| 1 + 9 files changed, 177 insertions(+), 65 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/6bb6dd9b/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js -- diff --git a/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js b/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js index 42a3411..0545624 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js +++ b/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js @@ -17,12 +17,17 @@ */ import Ember from 'ember'; +import UILoggerMixin from '../mixins/ui-logger'; -export default Ember.Component.extend({ +export default Ember.Component.extend(UILoggerMixin, { jobs: Ember.inject.service(), tagName: '', expanded: false, expandedValue: null, + store: Ember.inject.service(), + savedQueries: Ember.inject.service(), + + actions: { toggleExpandJob(jobId) { if(this.get('expanded')) { @@ -39,6 +44,48 @@ export default Ember.Component.extend({ }); } +}, +openAsWorksheet(savedQuery){ + + let hasWorksheetModel = this.get('model'), self = this; + let worksheetId; + + if (Ember.isEmpty(hasWorksheetModel)){ +worksheetId = 1; + }else { + +let isWorksheetExist = (this.get('model').filterBy('title', savedQuery.title).get('length') > 0); +if(isWorksheetExist) { + this.sendAction('openWorksheet', savedQuery, true); + return; +} + +let worksheets = this.get('model'); +worksheets.forEach((worksheet) => { + worksheet.set('selected', false); + }); +worksheetId = `worksheet${worksheets.get('length') + 1}`; + } + var isTabExisting = this.get("store").peekRecord('worksheet', savedQuery.id); + if(isTabExisting) { +self.sendAction('openWorksheet', savedQuery, true); +return; + } + this.get("savedQueries").fetchSavedQuery(savedQuery.get('queryFile')).then(function(response) { +let localWs = { + id: savedQuery.get('id'), + title: savedQuery.get('title'), + queryFile: savedQuery.get('queryFile'), + query: response.file.fileContent, + selectedDb : savedQuery.get('dataBase'), + owner: savedQuery.get('owner'), + selected: true +}; +self.sendAction('openWorksheet', localWs); + }, (error) => { +self.get('logger').danger('Failed to load the query', self.extractError(error)); +}); + } } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/6bb6dd9b/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..ae081de 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 @@ -93,6 +93,9 @@ export default Ember.Component.extend({ clearTitleFilter() { this.set('titleFilter'); +}, +openWorksheet(worksheet, isExisitingWorksheet){ + this.sendAction("openWorksheet", worksheet, isExisitingWorksheet); } } });
ambari git commit: AMBARI-22091.Hive view2.0 Jobs worksheets doesn't have hyperlink whereas view1.5 History worksheets had hyperlinks pointing to fetched results(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.6 27efa3f1a -> 9e34f4000 AMBARI-22091.Hive view2.0 Jobs worksheets doesn't have hyperlink whereas view1.5 History worksheets had hyperlinks pointing to fetched results(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9e34f400 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9e34f400 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9e34f400 Branch: refs/heads/branch-2.6 Commit: 9e34f40009cd60fd8ca3ffdcc992bda4352170ae Parents: 27efa3f Author: Venkata SairamAuthored: Sat Sep 30 09:05:33 2017 +0530 Committer: Venkata Sairam Committed: Sat Sep 30 09:06:57 2017 +0530 -- .../resources/ui/app/components/job-item.js | 49 +- .../resources/ui/app/components/jobs-browser.js | 3 + .../src/main/resources/ui/app/routes/jobs.js| 11 ++ .../main/resources/ui/app/routes/queries/new.js | 2 + .../resources/ui/app/routes/queries/query.js| 164 --- .../src/main/resources/ui/app/styles/app.scss | 8 + .../ui/app/templates/components/job-item.hbs| 2 +- .../app/templates/components/jobs-browser.hbs | 2 +- .../main/resources/ui/app/templates/jobs.hbs| 1 + 9 files changed, 177 insertions(+), 65 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/9e34f400/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js -- diff --git a/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js b/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js index 42a3411..0545624 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js +++ b/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js @@ -17,12 +17,17 @@ */ import Ember from 'ember'; +import UILoggerMixin from '../mixins/ui-logger'; -export default Ember.Component.extend({ +export default Ember.Component.extend(UILoggerMixin, { jobs: Ember.inject.service(), tagName: '', expanded: false, expandedValue: null, + store: Ember.inject.service(), + savedQueries: Ember.inject.service(), + + actions: { toggleExpandJob(jobId) { if(this.get('expanded')) { @@ -39,6 +44,48 @@ export default Ember.Component.extend({ }); } +}, +openAsWorksheet(savedQuery){ + + let hasWorksheetModel = this.get('model'), self = this; + let worksheetId; + + if (Ember.isEmpty(hasWorksheetModel)){ +worksheetId = 1; + }else { + +let isWorksheetExist = (this.get('model').filterBy('title', savedQuery.title).get('length') > 0); +if(isWorksheetExist) { + this.sendAction('openWorksheet', savedQuery, true); + return; +} + +let worksheets = this.get('model'); +worksheets.forEach((worksheet) => { + worksheet.set('selected', false); + }); +worksheetId = `worksheet${worksheets.get('length') + 1}`; + } + var isTabExisting = this.get("store").peekRecord('worksheet', savedQuery.id); + if(isTabExisting) { +self.sendAction('openWorksheet', savedQuery, true); +return; + } + this.get("savedQueries").fetchSavedQuery(savedQuery.get('queryFile')).then(function(response) { +let localWs = { + id: savedQuery.get('id'), + title: savedQuery.get('title'), + queryFile: savedQuery.get('queryFile'), + query: response.file.fileContent, + selectedDb : savedQuery.get('dataBase'), + owner: savedQuery.get('owner'), + selected: true +}; +self.sendAction('openWorksheet', localWs); + }, (error) => { +self.get('logger').danger('Failed to load the query', self.extractError(error)); +}); + } } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/9e34f400/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..ae081de 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 @@ -93,6 +93,9 @@ export default Ember.Component.extend({ clearTitleFilter() { this.set('titleFilter'); +}, +openWorksheet(worksheet, isExisitingWorksheet){ + this.sendAction("openWorksheet", worksheet, isExisitingWorksheet); } } });
ambari git commit: AMBARI-22091.Hive view2.0 Jobs worksheets doesn't have hyperlink whereas view1.5 History worksheets had hyperlinks pointing to fetched results(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk b84cbbe7e -> d4378aacb AMBARI-22091.Hive view2.0 Jobs worksheets doesn't have hyperlink whereas view1.5 History worksheets had hyperlinks pointing to fetched results(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d4378aac Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d4378aac Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d4378aac Branch: refs/heads/trunk Commit: d4378aacbd5bd95c0367f5b8a6865ee3bbe6de04 Parents: b84cbbe Author: Venkata SairamAuthored: Sat Sep 30 09:05:33 2017 +0530 Committer: Venkata Sairam Committed: Sat Sep 30 09:05:59 2017 +0530 -- .../resources/ui/app/components/job-item.js | 49 +- .../resources/ui/app/components/jobs-browser.js | 3 + .../src/main/resources/ui/app/routes/jobs.js| 11 ++ .../main/resources/ui/app/routes/queries/new.js | 2 + .../resources/ui/app/routes/queries/query.js| 164 --- .../src/main/resources/ui/app/styles/app.scss | 8 + .../ui/app/templates/components/job-item.hbs| 2 +- .../app/templates/components/jobs-browser.hbs | 2 +- .../main/resources/ui/app/templates/jobs.hbs| 1 + 9 files changed, 177 insertions(+), 65 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/d4378aac/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js -- diff --git a/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js b/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js index 42a3411..0545624 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js +++ b/contrib/views/hive20/src/main/resources/ui/app/components/job-item.js @@ -17,12 +17,17 @@ */ import Ember from 'ember'; +import UILoggerMixin from '../mixins/ui-logger'; -export default Ember.Component.extend({ +export default Ember.Component.extend(UILoggerMixin, { jobs: Ember.inject.service(), tagName: '', expanded: false, expandedValue: null, + store: Ember.inject.service(), + savedQueries: Ember.inject.service(), + + actions: { toggleExpandJob(jobId) { if(this.get('expanded')) { @@ -39,6 +44,48 @@ export default Ember.Component.extend({ }); } +}, +openAsWorksheet(savedQuery){ + + let hasWorksheetModel = this.get('model'), self = this; + let worksheetId; + + if (Ember.isEmpty(hasWorksheetModel)){ +worksheetId = 1; + }else { + +let isWorksheetExist = (this.get('model').filterBy('title', savedQuery.title).get('length') > 0); +if(isWorksheetExist) { + this.sendAction('openWorksheet', savedQuery, true); + return; +} + +let worksheets = this.get('model'); +worksheets.forEach((worksheet) => { + worksheet.set('selected', false); + }); +worksheetId = `worksheet${worksheets.get('length') + 1}`; + } + var isTabExisting = this.get("store").peekRecord('worksheet', savedQuery.id); + if(isTabExisting) { +self.sendAction('openWorksheet', savedQuery, true); +return; + } + this.get("savedQueries").fetchSavedQuery(savedQuery.get('queryFile')).then(function(response) { +let localWs = { + id: savedQuery.get('id'), + title: savedQuery.get('title'), + queryFile: savedQuery.get('queryFile'), + query: response.file.fileContent, + selectedDb : savedQuery.get('dataBase'), + owner: savedQuery.get('owner'), + selected: true +}; +self.sendAction('openWorksheet', localWs); + }, (error) => { +self.get('logger').danger('Failed to load the query', self.extractError(error)); +}); + } } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/d4378aac/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..ae081de 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 @@ -93,6 +93,9 @@ export default Ember.Component.extend({ clearTitleFilter() { this.set('titleFilter'); +}, +openWorksheet(worksheet, isExisitingWorksheet){ + this.sendAction("openWorksheet", worksheet, isExisitingWorksheet); } } });