Repository: ambari Updated Branches: refs/heads/trunk b81d1df87 -> f1ce60295
AMBARI-19765. Hive2: LOGS tab is more prominently displayed than RESULTS (pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f1ce6029 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f1ce6029 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f1ce6029 Branch: refs/heads/trunk Commit: f1ce60295a82e28e18aaf5cc3816f072156668b5 Parents: b81d1df Author: pallavkul <[email protected]> Authored: Tue Jan 31 17:17:47 2017 +0530 Committer: pallavkul <[email protected]> Committed: Tue Jan 31 17:18:59 2017 +0530 ---------------------------------------------------------------------- .../main/resources/ui/app/models/worksheet.js | 3 +- .../resources/ui/app/routes/queries/query.js | 14 +++- .../src/main/resources/ui/app/services/jobs.js | 2 +- .../src/main/resources/ui/app/styles/app.scss | 2 +- .../templates/components/query-result-table.hbs | 10 +++ .../ui/app/templates/queries/query.hbs | 84 ++++++++++---------- 6 files changed, 70 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f1ce6029/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 6a77633..1787cc7 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 @@ -36,6 +36,7 @@ export default DS.Model.extend({ queryFile: DS.attr('string', {defaultValue: ""}), logFile: DS.attr('string', {defaultValue: ""}), logResults: DS.attr('string', {defaultValue: ""}), - isQueryRunning: DS.attr('boolean', {defaultValue: false}) + isQueryRunning: DS.attr('boolean', {defaultValue: false}), + isQueryResultContainer: DS.attr('boolean', {defaultValue: false}) }); http://git-wip-us.apache.org/repos/asf/ambari/blob/f1ce6029/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 753b7f7..b6434c0 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 @@ -90,7 +90,7 @@ export default Ember.Route.extend({ controller.set('showSaveHdfsModal', false); controller.set('logResults', model.get('logResults') || ''); - controller.set('showQueryEditorLog', true); + controller.set('showQueryEditorLog', false); controller.set('showQueryEditorResult', !controller.get('showQueryEditorLog')); @@ -125,6 +125,10 @@ export default Ember.Route.extend({ }, + showQueryResultContainer(){ + this.get('controller.model').set('isQueryResultContainer', true); + }, + showTables(db){ let self = this; //should we do this by writing a seperate component. @@ -149,6 +153,8 @@ export default Ember.Route.extend({ self.get('controller').set('queryResult', self.get('controller').get('queryResult')); self.get('controller.model').set('queryResult', self.get('controller').get('queryResult')); + self.send('showQueryResultContainer'); + let payload ={ "title":worksheetTitle, "hiveQueryId":null, @@ -185,7 +191,7 @@ export default Ember.Route.extend({ self.send('fetchLogs'); //Open result tab and hide log tab - self.send('showQueryEditorResult'); + //self.send('showQueryEditorResult'); }, 2 * 1000); }, (error) => { Ember.run.later(() => { @@ -469,6 +475,10 @@ export default Ember.Route.extend({ $('.editor-result-list-anchor').addClass('active'); $('.editor-result-list').addClass('active'); } + }, + + showQueryResultContainer(){ + this.get('controller.model').set('isQueryResultContainer', true); } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/f1ce6029/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js b/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js index b3c2725..453eb12 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js +++ b/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js @@ -41,7 +41,7 @@ export default Ember.Service.extend({ } else if (status === 'error') { reject(status) } else { - resolve(this.waitForJobToComplete(jobId, after, fetchDummyResult)); + resolve(this.waitForJobToComplete(jobId, after)); } }, (error) => { reject(error); http://git-wip-us.apache.org/repos/asf/ambari/blob/f1ce6029/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 17abb65..2f63854 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 @@ -38,7 +38,7 @@ .main-wrapper { padding: 5px 0; background-color: #fff; - height: 100%; + min-height: 100vh; } .fa-1-5{ http://git-wip-us.apache.org/repos/asf/ambari/blob/f1ce6029/contrib/views/hive20/src/main/resources/ui/app/templates/components/query-result-table.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/templates/components/query-result-table.hbs b/contrib/views/hive20/src/main/resources/ui/app/templates/components/query-result-table.hbs index 4fe6f43..180c43d 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/templates/components/query-result-table.hbs +++ b/contrib/views/hive20/src/main/resources/ui/app/templates/components/query-result-table.hbs @@ -16,6 +16,16 @@ * limitations under the License. }} + +{{#unless columns.length}} + <div style="position:relative"> + <div style="margin: auto;position: absolute;top: 0;left: 0;bottom: 0;right: 0;text-align: center"> + {{fa-icon "spinner fa-2" spin=true}} + </div> + </div> +{{/unless}} + + {{#if columns.length}} <div class="clearfix" style="text-align: right; padding-right:5px"> http://git-wip-us.apache.org/repos/asf/ambari/blob/f1ce6029/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 5cdc9b3..22838a4 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 @@ -36,48 +36,50 @@ </div> </div> + {{#if worksheet.isQueryResultContainer}} + <div class="query-result-container"> + <div> + <ul class="row nav nav-tabs inverse"> + <li class="editor-result-list active"> + <a href="javascript:void(0)" class="editor-result-list-anchor" {{action 'showQueryEditorResult' }}> + {{fa-icon "file-text-o"}} RESULT + </a> + </li> + <li class="log-list"> + <a href="javascript:void(0)" class="log-list-anchor active" {{action 'showQueryEditorLog' }}> + {{fa-icon "list"}} LOG + </a> + </li> + </ul> + </div> - <div> - <ul class="row nav nav-tabs inverse"> - <li class="log-list active"> - <a href="javascript:void(0)" class="log-list-anchor active" {{action 'showQueryEditorLog' }}> - <i id="ember855" aria-hidden="true" class="fa fa-list"><!----></i> LOG - </a> - </li> - <li class="editor-result-list"> - <a href="javascript:void(0)" class="editor-result-list-anchor" {{action 'showQueryEditorResult' }}> - <i id="ember866" aria-hidden="true" class="fa fa-file-text-o"><!----></i> RESULT - </a> - </li> - </ul> - </div> - - {{#if showQueryEditorLog}} - <div class="clearfix row query-editor-log" > - {{query-result-log logResults=worksheet.logResults }} - </div> - {{/if}} + {{#if showQueryEditorLog}} + <div class="clearfix row query-editor-log"> + {{query-result-log logResults=worksheet.logResults }} + </div> + {{/if}} + {{#if showQueryEditorResult}} + <div class="clearfix row query-editor-results"> + {{query-result-table + queryResult=queryResult + jobId=currentJobId + updateQuery='updateQuery' + previousPage=worksheet.previousPage + hidePreviousButton=hidePreviousButton + goNextPage='goNextPage' + goPrevPage='goPrevPage' + expandQueryResultPanel='expandQueryResultPanel' + saveToHDFS='saveToHDFS' + downloadAsCsv='downloadAsCsv' + isExportResultSuccessMessege=isExportResultSuccessMessege + isExportResultFailureMessege=isExportResultFailureMessege + showSaveHdfsModal=showSaveHdfsModal + }} + </div> + {{/if}} - {{#if showQueryEditorResult}} - <div class="clearfix row query-editor-results" > - {{query-result-table - queryResult=queryResult - jobId=currentJobId - updateQuery='updateQuery' - previousPage=worksheet.previousPage - hidePreviousButton=hidePreviousButton - goNextPage='goNextPage' - goPrevPage='goPrevPage' - expandQueryResultPanel='expandQueryResultPanel' - saveToHDFS='saveToHDFS' - downloadAsCsv='downloadAsCsv' - isExportResultSuccessMessege=isExportResultSuccessMessege - isExportResultFailureMessege=isExportResultFailureMessege - showSaveHdfsModal=showSaveHdfsModal - }} </div> {{/if}} - </div> </div> @@ -97,7 +99,8 @@ <small class="pull-right">Tables({{tableModel.tables.length}})</small> </h4> </div> - <div id={{concat 'db_body_' tableModel.dbname}} class="db-tables collapse panel-collapse {{if (eq tableModel.dbname worksheet.selectedDb) 'in'}}" role="tabpanel" + <div id={{concat 'db_body_' tableModel.dbname}} class="db-tables collapse + panel-collapse {{if (eq tableModel.dbname worksheet.selectedDb) 'in'}}" role="tabpanel" aria-labelledby={{concat 'db_heading_' tableModel.dbname}}> <div class="panel-body"> {{#if tableModel.tables.length }} @@ -145,7 +148,8 @@ <div class="modal-footer"> <button type="button" class="btn btn-default" {{action "saveWorksheetModal"}}>{{fa-icon "check"}} Save</button> - <button type="button" class="btn btn-default" {{action "closeWorksheetModal"}}>{{fa-icon "close"}} Cancel</button> + <button type="button" class="btn btn-default" {{action "closeWorksheetModal"}}>{{fa-icon "close"}}Cancel + </button> </div> </div> {{/modal-dialog}}
