AMBARI-10830 Create/Edit widget wizard: Preview section should show real data. (atkach)

ambari-web/app/mixins/common/widgets/widget_mixin.js

@@ -510,26 +510,27 @@ App.WidgetPreviewMixin = Ember.Mixin.create({
   isLoaded: true,
   metrics: [],
   content: Em.Object.create({
-    widgetName: 'mock-widget',
+    id: 1,
     values: []
   }),
   drawWidget: function () {
-    this.loadMetrics();
     this.get('content').setProperties({
       'values': this.get('controller.widgetValues'),
       'properties': this.get('controller.widgetProperties'),
-      'displayName': this.get('controller.widgetName')
+      'widgetName': this.get('controller.widgetName'),
+      'metrics': this.get('controller.widgetMetrics').map(function (metric) {
+        return {
+          "name": metric.name,
+          "service_name": metric.serviceName,
+          "component_name": metric.componentName,
+          "metric_path": metric.metricPath,
+          "host_component_criteria": metric.hostComponentCriteria,
+          "category": metric.category
+        }
+      })
     });
+    this.loadMetrics();
     this._super();
   }.observes('controller.widgetProperties', 'controller.widgetValues', 'controller.widgetMetrics', 'controller.widgetName'),
-  loadMetrics: function () {
-    var metrics = [];
-    this.get('controller.widgetMetrics').forEach(function (metric) {
-      metrics.push({
-        name: metric.name,
-        data: this.get('MOCK_VALUE')
-      });
-    }, this);
-    this.set('metrics', metrics);
-  }
+  onMetricsLoaded: Em.K
 });

ambari-web/app/views/common/widget/gauge_widget_view.js

@@ -59,8 +59,8 @@ App.GaugeWidgetView = Em.View.extend(App.WidgetMixin, {
     }.property('parentView.content.properties.error_threshold'),
 
     id: function() {
-      return this.get('parentView.content.widgetName');
-    }.property('parentView.content.widgetName'),
+      return 'gauge-widget-' + this.get('parentView.content.id');
+    }.property('parentView.content.id'),
 
     existCenterText: true,
     centerTextColor: function () {

ambari-web/app/views/main/service/widgets/create/wizard_view.js

@@ -28,32 +28,13 @@ App.WidgetWizardView = Em.View.extend(App.WizardMenuMixin, {
   previewWidgetClass: function () {
     switch (this.get('controller.content.widgetType')) {
       case 'GRAPH':
-        return App.GraphWidgetView.extend(App.WidgetPreviewMixin, {
-          MOCK_VALUE: function () {
-            var nowTime = App.dateTime();
-            var mock = [];
-
-            for (var i = 0; i < 240; i++) {
-              mock.push([
-                1,
-                (nowTime + (15 * i))
-              ])
-            }
-            return mock;
-          }.property()
-        });
+        return App.GraphWidgetView.extend(App.WidgetPreviewMixin);
       case 'TEMPLATE':
-        return App.TemplateWidgetView.extend(App.WidgetPreviewMixin, {
-          MOCK_VALUE: 50
-        });
+        return App.TemplateWidgetView.extend(App.WidgetPreviewMixin);
       case 'NUMBER':
-        return App.NumberWidgetView.extend(App.WidgetPreviewMixin, {
-          MOCK_VALUE: 50
-        });
+        return App.NumberWidgetView.extend(App.WidgetPreviewMixin);
       case 'GAUGE':
-        return App.GaugeWidgetView.extend(App.WidgetPreviewMixin, {
-          MOCK_VALUE: 0.5
-        });
+        return App.GaugeWidgetView.extend(App.WidgetPreviewMixin);
       default:
         return Em.View;
     }