Browse Source

AMBARI-5175. Tez DAG vertex operation hover should show full operation name (alexantonenko)

Alex Antonenko 11 years ago
parent
commit
eb99f753de

+ 0 - 17
ambari-web/app/templates/main/jobs/hive_job_details.hbs

@@ -200,23 +200,6 @@
                       </tr>
                     {{/if}}
                   </table>
-                  <p>{{t jobs.hive.tez.operatorPlan}}</p>
-                  <table id="operator-table" class="table table-bordered table-striped">
-                    <thead>
-                      <tr>
-                        <th>{{t common.name}}</th>
-                        <th>{{t common.value}}</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      {{#each keys in view.operatorPlan}}
-                        <tr>
-                          <td>{{keys.name}}</td>
-                          <td>{{keys.value}}</td>
-                        </tr>
-                      {{/each}}
-                    </tbody>
-                  </table>
                 </div>
               </div>
             </div>

+ 2 - 1
ambari-web/app/templates/main/jobs/hover_op_table.hbs

@@ -1,3 +1,4 @@
+<p>{{content.operationName}}</p>
 <table id="hover-op-table" class="table table-bordered">
     <thead>
     <tr>
@@ -6,7 +7,7 @@
     </tr>
     </thead>
     <tbody>
-    {{#each keys in content}}
+    {{#each keys in content.operatorPlanObj}}
         <tr>
             <td>
               {{keys.name}}

+ 6 - 4
ambari-web/app/views/main/jobs/hive_job_details_tez_dag_view.js

@@ -665,12 +665,14 @@ App.MainHiveJobDetailsTezDagView = Em.View.extend({
             opCount[op] = opCount[op]+1;
           }
           return opCount[op];
-        }).on('mousedown', function(op) {
-          var operatorPlanObj = self.createOperationPlanObj(n.name, op);
-          self.get('parentView').set('operatorPlan', operatorPlanObj);
         }).on('mouseover', function(op) {
+          var viewContent = {
+            operationName: op,
+            operatorPlanObj: []
+          };
           var operatorPlanObj = self.createOperationPlanObj(n.name, op);
-          var template = App.HoverOpTable.create({content: operatorPlanObj}) ;
+          viewContent.operatorPlanObj = operatorPlanObj;
+          var template = App.HoverOpTable.create({content: viewContent}) ;
           $(this).find('.svg-tooltip').attr('title', template.renderToBuffer().string()).tooltip('fixTitle').tooltip('show');
           })
 

+ 0 - 1
ambari-web/app/views/main/jobs/hive_job_details_view.js

@@ -26,7 +26,6 @@ App.MainHiveJobDetailsView = Em.View.extend({
   templateName : require('templates/main/jobs/hive_job_details'),
 
   selectedVertex : null,
-  operatorPlan: [],
   content : null,
   zoomScaleFrom : 1,
   zoomScaleTo: 2,