Explorar el Código

AMBARI-10582. Clicking on cancel icon on the widget should hide it(XIWANG)

Xi Wang hace 10 años
padre
commit
871981252d

+ 4 - 0
ambari-web/app/controllers/main/service/info/summary.js

@@ -331,6 +331,10 @@ App.MainServiceInfoSummaryController = Em.Controller.extend({
    * @type {boolean}
    * @type {boolean}
    */
    */
   isAllSharedWidgetsLoaded: false,
   isAllSharedWidgetsLoaded: false,
+
+  /**
+   * @type {boolean}
+   */
   isMineWidgetsLoaded: false,
   isMineWidgetsLoaded: false,
 
 
   /**
   /**

+ 10 - 4
ambari-web/app/mixins/common/widget_mixin.js

@@ -316,20 +316,26 @@ App.WidgetMixin = Ember.Mixin.create({
   /*
   /*
    * make call when clicking on "remove icon" on widget
    * make call when clicking on "remove icon" on widget
    */
    */
-  hideWidget: function () {
-
+  hideWidget: function (event) {
+    this.get('controller').hideWidget(
+      {
+        context: Em.Object.create({
+          id: event.context
+        })
+      }
+    );
   },
   },
   /*
   /*
    * make call when clicking on "clone icon" on widget
    * make call when clicking on "clone icon" on widget
    */
    */
-  cloneWidget: function () {
+  cloneWidget: function (event) {
 
 
   },
   },
 
 
   /*
   /*
    * make call when clicking on "edit icon" on widget
    * make call when clicking on "edit icon" on widget
    */
    */
-  editWidget: function () {
+  editWidget: function (event) {
 
 
   }
   }
 
 

+ 1 - 1
ambari-web/app/templates/common/widget/gauge_widget.hbs

@@ -18,7 +18,7 @@
 
 
 <div class="gauge-widget thumbnail">
 <div class="gauge-widget thumbnail">
   {{#if view.isLoaded}}
   {{#if view.isLoaded}}
-    <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget target="view"}}>
+    <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
       <i class="icon-remove-sign icon-large"></i>
       <i class="icon-remove-sign icon-large"></i>
     </a>
     </a>
     <div class="caption title span9">{{view.content.displayName}}</div>
     <div class="caption title span9">{{view.content.displayName}}</div>

+ 1 - 1
ambari-web/app/templates/common/widget/graph_widget.hbs

@@ -18,7 +18,7 @@
 
 
 <div class="graph-widget thumbnail">
 <div class="graph-widget thumbnail">
   {{#if view.isLoaded}}
   {{#if view.isLoaded}}
-    <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget target="view"}}>
+    <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
       <i class="icon-remove-sign icon-large"></i>
       <i class="icon-remove-sign icon-large"></i>
     </a>
     </a>
     <div class="caption title span9">{{view.content.displayName}}</div>
     <div class="caption title span9">{{view.content.displayName}}</div>

+ 1 - 1
ambari-web/app/templates/common/widget/number_widget.hbs

@@ -18,7 +18,7 @@
 
 
 <div class="number-widget thumbnail">
 <div class="number-widget thumbnail">
   {{#if view.isLoaded}}
   {{#if view.isLoaded}}
-    <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget target="view"}}>
+    <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
       <i class="icon-remove-sign icon-large"></i>
       <i class="icon-remove-sign icon-large"></i>
     </a>
     </a>
     <div class="caption title span9">{{view.content.displayName}}</div>
     <div class="caption title span9">{{view.content.displayName}}</div>

+ 1 - 1
ambari-web/app/templates/common/widget/template_widget.hbs

@@ -18,7 +18,7 @@
 
 
 <div class="template-widget thumbnail">
 <div class="template-widget thumbnail">
   {{#if view.isLoaded}}
   {{#if view.isLoaded}}
-    <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget target="view"}}>
+    <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
       <i class="icon-remove-sign icon-large"></i>
       <i class="icon-remove-sign icon-large"></i>
     </a>
     </a>
     <div class="caption title span9">{{view.content.displayName}}</div>
     <div class="caption title span9">{{view.content.displayName}}</div>

+ 1 - 1
ambari-web/app/templates/main/service/info/summary.hbs

@@ -126,7 +126,7 @@
               <div id="widget_layout" class="row-fluid">
               <div id="widget_layout" class="row-fluid">
                 {{#each widget in controller.widgets}}
                 {{#each widget in controller.widgets}}
                   <div class="widget span2p4" {{bindAttr id="widget.id"}}>
                   <div class="widget span2p4" {{bindAttr id="widget.id"}}>
-                    {{view widget.viewClass contentBinding="widget"}}
+                    {{view widget.viewClass contentBinding="widget" idBinding="widget.id"}}
                   </div>
                   </div>
                 {{/each}}
                 {{/each}}
                 <div class="span2p4">
                 <div class="span2p4">