Quellcode durchsuchen

AMBARI-19931. HiveView2.0: DB panel shows up on Query result full screen (pallavkul)

pallavkul vor 8 Jahren
Ursprung
Commit
027c0848f7

+ 38 - 5
contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js

@@ -24,6 +24,9 @@ export default Ember.Route.extend({
   jobs: Ember.inject.service(),
   savedQueries: Ember.inject.service(),
 
+  isQueryEdidorPaneExpanded: false,
+  isQueryResultPanelExpanded: false,
+
   beforeModel(){
     let existingWorksheets = this.store.peekAll('worksheet');
     existingWorksheets.setEach('selected', false);
@@ -161,7 +164,6 @@ export default Ember.Route.extend({
       this.get('controller.model').set('selectedDb', db);
     },
 
-
     visualExplainQuery(){
       this.get('controller').set('isVisualExplainQuery', true );
       this.send('executeQuery');
@@ -389,15 +391,46 @@ export default Ember.Route.extend({
     },
 
     expandQueryEdidorPanel(){
+
+      if(!this.get('isQueryEdidorPaneExpanded')){
+        this.set('isQueryEdidorPaneExpanded', true);
+      } else {
+        this.set('isQueryEdidorPaneExpanded', false);
+      }
       Ember.$('.query-editor-panel').toggleClass('query-editor-full-width');
       Ember.$('.database-panel').toggleClass("hide");
+
     },
 
     expandQueryResultPanel(){
-      Ember.$('.query-editor-panel').toggleClass('query-editor-full-width');
-      Ember.$('.query-editor-container').toggleClass("hide");
-      Ember.$('.database-panel').toggleClass("hide");
-      this.send('adjustPanelSize');
+
+      if(!this.get('isQueryResultPanelExpanded')){
+
+        if(!this.get('isQueryEdidorPaneExpanded')){
+          Ember.$('.query-editor-container').addClass("hide");
+          Ember.$('.database-panel').addClass("hide");
+          Ember.$('.query-editor-panel').addClass('query-editor-full-width');
+        } else {
+
+          Ember.$('.query-editor-container').addClass("hide");
+        }
+        this.set('isQueryResultPanelExpanded', true);
+
+      } else {
+
+        if(!this.get('isQueryEdidorPaneExpanded')){
+          Ember.$('.query-editor-container').removeClass("hide");
+          Ember.$('.database-panel').removeClass("hide");
+          Ember.$('.query-editor-panel').removeClass('query-editor-full-width');
+        } else {
+
+          Ember.$('.query-editor-container').removeClass("hide");
+
+        }
+        this.set('isQueryResultPanelExpanded', false);
+
+      }
+
     },
 
     adjustPanelSize(){

+ 0 - 2
contrib/views/hive20/src/main/resources/ui/app/services/query.js

@@ -80,6 +80,4 @@ export default Ember.Service.extend({
     });
   }
 
-
-
 });

+ 0 - 1
contrib/views/hive20/src/main/resources/ui/app/styles/app.scss

@@ -322,7 +322,6 @@ pre {
 }
 
 .query-result-table {
-  border-top: 1px solid darken($database-search-background, 25%);
   padding-top:10px;
 }
 

+ 2 - 2
contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs

@@ -54,12 +54,12 @@
         <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' }}>
+              <a href="javascript:void(0)" class="editor-result-list-anchor active" {{action 'showQueryEditorResult' }}>
                 {{fa-icon "file-text-o"}}&nbsp;&nbsp;RESULT
               </a>
             </li>
             <li class="log-list">
-              <a href="javascript:void(0)" class="log-list-anchor active" {{action 'showQueryEditorLog' }}>
+              <a href="javascript:void(0)" class="log-list-anchor" {{action 'showQueryEditorLog' }}>
                 {{fa-icon "list"}}&nbsp;&nbsp;LOG
               </a>
             </li>