preview help

Netflix · Jul 19, 2017 · 4e80837 · 4e80837
1 parent 6c87244
commit 4e80837
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/app/components/customWidget/customWidget.service.js b/src/app/components/customWidget/customWidget.service.js
@@ -19,7 +19,7 @@
      'use strict';
 
      /**
-     * @name CustomWidgetService
+     * @name CustomWidgetServices
      * @desc
      */
      function CustomWidgetService($uibModal) {
@@ -56,14 +56,17 @@
             angular.extend(modalOptions, defaultModalOptions, customModalOptions);
 
             modal.controller = ['$scope','$uibModalInstance', 'widgetOptions', function ($scope, $uibModalInstance, widgetOptions) {
-                $scope.selected = '';
+                $scope.selected = {
+                  name: '',
+                  'text-oneline':''
+                };
                 $scope.widgetOptions = {};
                 angular.extend($scope.widgetOptions, widgetOptions);
                 $scope.modalOptions = modalOptions;
                 $scope.modalOptions.ok = function (result) {
-                    widgetOptions.name = $scope.selected;
-                    widgetOptions.title = $scope.selected;
-                    widgetOptions.dataModelOptions.name = $scope.selected;
+                    widgetOptions.name = $scope.selected.name;
+                    widgetOptions.title = $scope.selected.name;
+                    widgetOptions.dataModelOptions.name = $scope.selected.name;
                     $uibModalInstance.close(result);
                 };
                 $scope.modalOptions.close = function () {

diff --git a/src/app/components/customWidget/customWidgetModal.html b/src/app/components/customWidget/customWidgetModal.html
@@ -1,7 +1,7 @@
 
 <div class="modal-header">
 <!--    <button type="button" class="close" data-dismiss="modal">&times;</button>-->
-    <h4 class="modal-title">Add Custom Widget {{selected}}</h4>
+    <h4 class="modal-title">Add Custom Widget</h4>
 </div>
 <div class="modal-body">
     <!-- Add ng-model, ng-show, ng-disabled, ng-class, ng-change and delay accordingly -->
@@ -16,8 +16,9 @@ <h4 class="modal-title">Add Custom Widget {{selected}}</h4>
             <span class="input-group-addon">Select Metric</span>
             <!-- ng-repeat to be added to generate metric list and typeahead to be included -->
 <!--            <select class="form-control" name="metricName" ng-options="metricMetadata.name for metricMetadata in metricsMetadata track by metricMetadata.name" ng-model="selected" required></select>-->
-            <input type="text" name="metricName" class="form-control" uib-typeahead="metricMetadata.name for metricMetadata in metricsMetadata  | filter:$viewValue | limitTo:8" autocomplete="off" ng-model="selected" required>
+            <input type="text" name="metricName" class="form-control" uib-typeahead="metricMetadata as metricMetadata.name for metricMetadata in metricsMetadata | filter:{name:$viewValue} | limitTo:8" autocomplete="off" ng-model="selected" required>
         </div>
+      <div class="input-group input-group-lg target"><h4>{{ selected['text-oneline'] }}</h4></div>
         <div class="input-group input-group-lg target">
             <span class="input-group-addon">Type</span>
             <select id="metricList" ng-model="widgetOptions.dataModelType" class="form-control" required>

diff --git a/src/app/main/main.controller.js b/src/app/main/main.controller.js
@@ -221,7 +221,7 @@
             };
 
             CustomWidgetService.showCustomWidgetModal(customWidgetModal, {}).then(function() {
-//                console.log('customwidgetoptions', vm.customWidgetOptions);
+                console.log('customwidgetoptions', vm.customWidgetOptions);
                 widgetDefinitions.push(vm.customWidgetOptions);
 //                console.log('widgetdefs', widgetDefinitions);
                 widgetsToLoad.push(vm.customWidgetOptions);