浏览代码

AMBARI-10450-2. Implement Widget Browser.(xiwang)

Xi Wang 10 年之前
父节点
当前提交
073cec990d

+ 11 - 9
ambari-web/app/controllers/main/service/info/summary.js

@@ -404,15 +404,17 @@ App.MainServiceInfoSummaryController = Em.Controller.extend({
         data.items.map(function (widget) {
           var widgetType = widget.Widgets.widget_type;
           var widgetName = widget.Widgets.widget_name;
-          return Em.Object.create({
-            iconPath: "/img/widget-" + widgetType.toLowerCase() + ".png",
-            widgetName: widgetName,
-            displayName: widget.Widgets.display_name,
-            description: widget.Widgets.description,
-            widgetType: widgetType,
-            serviceName: widget.Widgets.metrics.mapProperty('service_name').uniq().join('-'),
-            added: addedWidgetsNames.contains(widgetName)
-          });
+          if (widgetType != "HEATMAP") {
+            return Em.Object.create({
+              iconPath: "/img/widget-" + widgetType.toLowerCase() + ".png",
+              widgetName: widgetName,
+              displayName: widget.Widgets.display_name,
+              description: widget.Widgets.description,
+              widgetType: widgetType,
+              serviceName: widget.Widgets.metrics.mapProperty('service_name').uniq().join('-'),
+              added: addedWidgetsNames.contains(widgetName)
+            });
+          }
         })
       );
       this.set('isAllSharedWidgetsLoaded', true);

+ 0 - 2
ambari-web/app/styles/enhanced_service_dashboard.less

@@ -358,7 +358,6 @@
       }
       .label-description {
         padding-top: 5px;
-        position: relative;
         .label-text {
           display: block;
           font-size: 14px;
@@ -380,7 +379,6 @@
       .widget-section-actions {
         position: relative;
         top: -30px;
-        left: 30%;
         .btn {
           padding: 3px 8px;
           width: 60px;

+ 2 - 3
ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs

@@ -58,7 +58,7 @@
                   <p class="label-text">{{widget.displayName}}</p>
                   <p class="description-text">{{widget.description}}</p>
                 </div>
-                <span class="widget-section-actions">
+                <div class="widget-section-actions pull-right">
                   {{#if widget.added}}
                     <button type="button" class="btn btn-primary added-btn" {{action "hideWidget" widget target="controller"}} >
                       {{t dashboard.widgets.browser.action.added}}
@@ -83,13 +83,12 @@
                       {{t dashboard.widgets.browser.action.add}}
                     </button>
                   {{/if}}
-                </span>
+                </div>
               </div>
             {{/each}}
           </div>
         {{/if}}
       </div>
-
     </div>
 
       <div {{bindAttr class="view.filteringComplete:hidden :table-overlay"}}>

+ 1 - 1
ambari-web/app/utils/ajax/ajax.js

@@ -2407,7 +2407,7 @@ var urls = {
   },
 
   'widgets.all.shared.get': {
-    real: '/widgets?Widgets/scope=CLUSTER&fields=*',
+    real: '/clusters/{clusterName}/widgets?Widgets/scope=CLUSTER&fields=*',
     mock: '/data/widget_layouts/all_shared_widgets.json'
   },