Răsfoiți Sursa

HUE-7420 [jb] Fix mini Impala jb expand + Styling

jdesjean 8 ani în urmă
părinte
comite
8390502fb0

+ 2 - 2
apps/jobbrowser/src/jobbrowser/apis/query_api.py

@@ -167,8 +167,8 @@ class QueryApi(Api):
 
 
   def _query(self, appid):
   def _query(self, appid):
     query = self.api.get_query(query_id=appid)
     query = self.api.get_query(query_id=appid)
-    query['summary'] = query.get('summary').strip()
-    query['plan'] = query.get('plan').strip()
+    query['summary'] = query.get('summary').strip() if query.get('summary') else ''
+    query['plan'] = query.get('plan').strip() if query.get('plan') else ''
     return query
     return query
 
 
   def _query_profile(self, appid):
   def _query_profile(self, appid):

+ 1 - 1
apps/jobbrowser/src/jobbrowser/static/jobbrowser/css/jobbrowser-embeddable.css

@@ -14,4 +14,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
- */.jobbrowser-mini .span12.no-margin{margin-left:0 !important}.jobbrowser-full .content-panel-inner{padding:10px}.jobbrowser-full .jb-breadcrumbs{margin-bottom:0}.jobbrowser-full .jb-panel{padding-left:10px;padding-right:10px}.jobbrowser-components .hue-uncheck::before{padding-left:2px}.jobbrowser-components .tab-content{padding:10px;border:none !important}.jobbrowser-components .hue-breadcrumbs-bar{padding:0}.jobbrowser-components .hue-breadcrumbs-bar li{padding:12px}.jobbrowser-components .hue-breadcrumbs-bar li:first-child{padding-left:0;padding-right:0}.jobbrowser-components .hue-breadcrumbs-bar a{color:#0B7FAD !important;display:inline !important}.jobbrowser-components .divider{color:#C8C8C8;padding-right:12px}.jobbrowser-components .app-icon{vertical-align:text-top}.jobbrowser-components .sidebar-nav .progress{margin-bottom:0}.jobbrowser-components .sidebar-nav .nav-list>li>a{margin-top:0 !important;margin-bottom:0 !important}.jobbrowser-components .sidebar-nav .nav-list li:not(.nav-header){text-overflow:ellipsis;overflow-x:hidden;white-space:nowrap}.jobbrowser-components .query-plan{border:1px solid #DCDCDC}
+ */.jobbrowser-mini .span12.no-margin{margin-left:0 !important}.jobbrowser-full .content-panel-inner{padding:10px}.jobbrowser-full .jb-breadcrumbs{margin-bottom:0}.jobbrowser-full .jb-panel{padding-left:10px;padding-right:10px}.jobbrowser-components .hue-uncheck::before{padding-left:2px}.jobbrowser-components .tab-content{padding:10px;border:none !important}.jobbrowser-components .hue-breadcrumbs-bar{padding:0}.jobbrowser-components .hue-breadcrumbs-bar li{padding:12px}.jobbrowser-components .hue-breadcrumbs-bar li:first-child{padding-left:0;padding-right:0}.jobbrowser-components .hue-breadcrumbs-bar a{color:#0B7FAD !important;display:inline !important}.jobbrowser-components .divider{color:#C8C8C8;padding-right:12px}.jobbrowser-components .app-icon{vertical-align:text-top}.jobbrowser-components .sidebar-nav .progress{margin-bottom:0}.jobbrowser-components .sidebar-nav .nav-list>li>a{margin-top:0 !important;margin-bottom:0 !important}.jobbrowser-components .sidebar-nav .nav-list li:not(.nav-header){text-overflow:ellipsis;overflow-x:hidden;white-space:nowrap}.jobbrowser-components .query-plan{border:1px solid #DCDCDC}.jobbrowser-components .node rect{stroke:#424242;fill:#FFFFFF}.jobbrowser-components .edgePath path{stroke:#424242;fill:#424242;stroke-width:1.5px}.jobbrowser-components .data-list{padding-left:0}.jobbrowser-components .data-list .data-header{float:left;width:65px;text-align:right;padding:0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.jobbrowser-components .nav-list>li>a,.jobbrowser-components .data-list .nav-header.data-header{padding:0;margin:0 7px 0 0 !important}

+ 30 - 0
apps/jobbrowser/src/jobbrowser/static/jobbrowser/less/jobbrowser-embeddable.less

@@ -92,4 +92,34 @@
   .query-plan {
   .query-plan {
     border: 1px solid @cui-gray-300
     border: 1px solid @cui-gray-300
   }
   }
+
+  .node rect {
+    stroke: @cui-gray-800;
+    fill: @cui-white;
+  }
+
+  .edgePath path {
+    stroke: @cui-gray-800;
+    fill: @cui-gray-800;
+    stroke-width: 1.5px;
+  }
+
+  .data-list {
+    padding-left: 0;
+  }
+
+  .data-list .data-header {
+    float: left;
+    width: 65px;
+    text-align: right;
+    padding:0px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+
+  .nav-list > li > a, .data-list .nav-header.data-header {
+    padding:0px;
+    margin:0px 7px 0px 0px !important;
+  }
 }
 }

+ 5 - 5
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -1910,12 +1910,12 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 
 
             crumbs.push({'id': vm.job().id(), 'name': vm.job().name(), 'type': vm.job().type()});
             crumbs.push({'id': vm.job().id(), 'name': vm.job().name(), 'type': vm.job().type()});
             vm.resetBreadcrumbs(crumbs);
             vm.resetBreadcrumbs(crumbs);
-            if (vm.job().type() === 'queries' && !$("#queries-page-plan${ SUFFIX }").parent().children().hasClass("active")) {
-              //show is still bound to old job, setTimeout allows knockout model change event done at begining of this method to sends it's notification
-              setTimeout(function () {
+            //show is still bound to old job, setTimeout allows knockout model change event done at begining of this method to sends it's notification
+            setTimeout(function () {
+              if (vm.job().type() === 'queries' && !$("#queries-page-plan${ SUFFIX }").parent().children().hasClass("active")) {
                 $("a[href=\'#queries-page-plan${ SUFFIX }\']").tab("show");
                 $("a[href=\'#queries-page-plan${ SUFFIX }\']").tab("show");
-              }, 0)
-            }
+              }
+            }, 0);
             %if not is_mini:
             %if not is_mini:
             if (vm.job().type() === 'workflow' && !vm.job().workflowGraphLoaded) {
             if (vm.job().type() === 'workflow' && !vm.job().workflowGraphLoaded) {
               vm.job().updateWorkflowGraph();
               vm.job().updateWorkflowGraph();

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
desktop/libs/notebook/src/notebook/static/notebook/css/notebook.css


+ 0 - 19
desktop/libs/notebook/src/notebook/static/notebook/less/notebook.less

@@ -261,25 +261,6 @@
     padding-left: 0;
     padding-left: 0;
   }
   }
 
 
-  .data-list {
-    padding-left: 0;
-  }
-
-  .data-list .data-header {
-    float: left;
-    width: 65px;
-    text-align: right;
-    padding:0px;
-    margin:0px 7px 0px 0px !important;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-  }
-
-  .nav-list > li > a, .data-list .data-header {
-    padding:0px;
-  }
-
   .dropdown-menu li {
   .dropdown-menu li {
     font-size: 14px;
     font-size: 14px;
   }
   }

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff