Fix according to review

Use ng-class, ng-attr-, ng-class, ng-href Move urls from switch to object (pretty)
ManageIQ · Mar 12, 2018 · b553931 · b553931
1 parent 20b0b88
commit b553931
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/app/assets/javascripts/components/widget-footer.js b/app/assets/javascripts/components/widget-footer.js
@@ -7,10 +7,10 @@ ManageIQ.angular.app.component('widgetFooter', {
   template: [
     '<div class="card-pf-footer">',
     __('Updated'),
-    "{{vm.widgetLastRun}}",
+    '{{vm.widgetLastRun}}',
     ' | ',
     __('Next'),
-    "{{vm.widgetNextRun}}",
+    '{{vm.widgetNextRun}}',
     '</div>',
   ].join("\n"),
 });
diff --git a/app/assets/javascripts/components/widget-menu.js b/app/assets/javascripts/components/widget-menu.js
@@ -17,9 +17,9 @@ ManageIQ.angular.app.component('widgetMenu', {
     '    <div ng-if="vm.shortcutsMissing()">',
     __('No shortcuts are authorized for this user, contact your Administrator'),
     '    </div>',
-    '    <tr ng-if="!vm.shortcutsMissing()" ng-repeat="shortcut in vm.widgetModel.shortcuts">',
+    '    <tr ng-repeat="shortcut in vm.widgetModel.shortcuts">',
     '      <td>',
-    '        <a title="' + __("Click to go this location") + '" href="{{shortcut.href}}">',
+    '        <a ng-attr-title="{{__("Click to go this location")}}" ng-href="{{shortcut.href}}">',
     '{{shortcut.description}}',
     '        </a>',
     '      </td>',

diff --git a/app/assets/javascripts/components/widget-wrapper.js b/app/assets/javascripts/components/widget-wrapper.js
@@ -12,6 +12,13 @@ ManageIQ.angular.app.component('widgetWrapper', {
   controller: ['$http', 'miqService', '$sce', function($http, miqService, $sce) {
     var vm = this;
 
+    var widgetTypeUrl = {
+      menu: '/dashboard/widget_menu_data/',
+      report: '/dashboard/widget_report_data/',
+      chart: '/dashboard/widget_chart_data/',
+      rss: '/dashboard/widget_rss_data/',
+    };
+
     var deferred = miqDeferred();
     vm.promise = deferred.promise;
 
@@ -37,17 +44,10 @@ ManageIQ.angular.app.component('widgetWrapper', {
     };
 
     vm.widgetUrl  = function() {
-      switch (vm.widgetType) {
-        case 'menu':
-          return '/dashboard/widget_menu_data/' + vm.widgetId;
-        case 'report':
-          return '/dashboard/widget_report_data/' + vm.widgetId;
-        case 'chart':
-          return '/dashboard/widget_chart_data/' + vm.widgetId;
-        case 'rss':
-          return '/dashboard/widget_rss_data/' + vm.widgetId;
-        default:
-          console.log('Something went wrong. There is no support for widget type of ', vm.widgetType);
+      if (widgetTypeUrl.hasOwnProperty(vm.widgetType)) {
+        return [widgetTypeUrl[vm.widgetType], vm.widgetId].join('/');
+      } else {
+        console.log('Something went wrong. There is no support for widget type of ', vm.widgetType);
       }
     };
   }],
@@ -65,7 +65,7 @@ ManageIQ.angular.app.component('widgetWrapper', {
     '    </div>',
     '    <widget-error ng-if="vm.error === true"></widget-error>',
     '    <widget-spinner ng-if="!vm.widgetModel && vm.widgetBlank == \'false\' && !vm.error"></widget-spinner>',
-    '    <div ng-if="vm.widgetBlank === \'true\' || vm.widgetModel" class="mc" id="{{vm.innerDivId}}" ng-class="{ hidden: vm.widgetModel.minimized }">',
+    '    <div ng-if="vm.widgetBlank === \'true\' || vm.widgetModel" ng-attr-id="{{vm.innerDivId}}" ng-class="{ hidden: vm.widgetModel.minimized, mc:true }">',
     '      <widget-empty ng-if="vm.widgetBlank === \'true\'"></widget-empty>',
     '      <div ng-if="vm.widgetBlank === \'false\'" ng-switch on="vm.widgetType">',
     '        <widget-menu ng-switch-when="menu" widget-id="{{vm.widgetId}}" widget-model="vm.widgetModel">',