Multiple fixes (Each commit is a separate fix.) (#1918)

* fixed table-sorting issue with custom-labels

* added entityLabel column for entity-table-widget"

* Added event for force-re-init of widget

ui/src/app/components/widget/widget.controller.js

@@ -780,6 +780,10 @@ export default function WidgetController($scope, $state, $timeout, $window, $ocL
             widgetContext.dashboardTimewindow = newDashboardTimewindow;
         });
 
+        $scope.$on('widgetForceReInit', function () {
+            reInit();
+        });
+
         $scope.$on("$destroy", function () {
             onDestroy();
         });

ui/src/app/locale/locale.constant-en_US.json

@@ -794,6 +794,7 @@
         "search": "Search entities",
         "selected-entities": "{ count, plural, 1 {1 entity} other {# entities} } selected",
         "entity-name": "Entity name",
+        "entity-label": "Entity label",
         "details": "Entity details",
         "no-entities-prompt": "No entities found",
         "no-data": "No data to display",

ui/src/app/widget/lib/entities-table-widget.js

@@ -67,11 +67,13 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
 
     vm.displayEntityName = true;
     vm.entityNameColumnTitle = '';
+    vm.displayEntityLabel = false;
+    vm.entityLabelColumnTitle = '';
     vm.displayEntityType = true;
     vm.actionCellDescriptors = [];
     vm.displayPagination = true;
     vm.defaultPageSize = 10;
-    vm.defaultSortOrder = 'entityName';
+    vm.defaultSortOrder = "'entityName'";
 
     vm.query = {
         order: vm.defaultSortOrder,
@@ -159,6 +161,7 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
 
         vm.searchAction.show = angular.isDefined(vm.settings.enableSearch) ? vm.settings.enableSearch : true;
         vm.displayEntityName = angular.isDefined(vm.settings.displayEntityName) ? vm.settings.displayEntityName : true;
+        vm.displayEntityLabel = angular.isDefined(vm.settings.displayEntityLabel) ? vm.settings.displayEntityLabel : false;
 
         if (vm.settings.entityNameColumnTitle && vm.settings.entityNameColumnTitle.length) {
             vm.entityNameColumnTitle = utils.customTranslation(vm.settings.entityNameColumnTitle, vm.settings.entityNameColumnTitle);
@@ -166,6 +169,12 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
             vm.entityNameColumnTitle = $translate.instant('entity.entity-name');
         }
 
+        if (vm.settings.entityLabelColumnTitle && vm.settings.entityLabelColumnTitle.length) {
+            vm.entityLabelColumnTitle = utils.customTranslation(vm.settings.entityLabelColumnTitle, vm.settings.entityLabelColumnTitle);
+        } else {
+            vm.entityLabelColumnTitle = $translate.instant('entity.entity-label');
+        }
+
         vm.displayEntityType = angular.isDefined(vm.settings.displayEntityType) ? vm.settings.displayEntityType : true;
         vm.displayPagination = angular.isDefined(vm.settings.displayPagination) ? vm.settings.displayPagination : true;
 
@@ -176,6 +185,11 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
 
         if (vm.settings.defaultSortOrder && vm.settings.defaultSortOrder.length) {
             vm.defaultSortOrder = vm.settings.defaultSortOrder;
+            if (vm.settings.defaultSortOrder.charAt(0) === "-") {
+                vm.defaultSortOrder = "-'" + vm.settings.defaultSortOrder.substring(1) + "'";
+            } else {
+                vm.defaultSortOrder = "'" + vm.settings.defaultSortOrder + "'";
+            }
         }
 
         vm.query.order = vm.defaultSortOrder;
@@ -470,6 +484,24 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
             vm.columnWidth['entityName'] = '0px';
         }
 
+        if (vm.displayEntityLabel) {
+            vm.columns.push(
+                {
+                    name: 'entityLabel',
+                    label: 'entityLabel',
+                    title: vm.entityLabelColumnTitle,
+                    display: true
+                }
+            );
+            vm.contentsInfo['entityLabel'] = {
+                useCellContentFunction: false
+            };
+            vm.stylesInfo['entityLabel'] = {
+                useCellStyleFunction: false
+            };
+            vm.columnWidth['entityLabel'] = '0px';
+        }
+
         if (vm.displayEntityType) {
             vm.columns.push(
                 {
@@ -557,6 +589,11 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
                 id: {}
             };
             entity.entityName = datasource.entityName;
+            if (datasource.entityLabel) {
+                entity.entityLabel = datasource.entityLabel;
+            } else {
+                entity.entityLabel = datasource.entityName;
+            }
             if (datasource.entityId) {
                 entity.id.id = datasource.entityId;
             }

ui/src/app/widget/lib/entities-table-widget.tpl.html

@@ -41,7 +41,7 @@
             <table md-table>
                 <thead fix-head md-head md-order="vm.query.order" md-on-reorder="vm.onReorder">
                 <tr md-row>
-                    <th ng-if="column.display" md-column md-order-by="{{ column.name }}" ng-repeat="column in vm.columns"><span>{{ column.title }}</span></th>
+                    <th ng-if="column.display" md-column md-order-by="'{{ column.label }}'" ng-repeat="column in vm.columns"><span>{{ column.title }}</span></th>
                     <th md-column class="tb-action-cell" layout="row" layout-align="end center">
                         <md-button class="md-icon-button"
                                    aria-label="{{'entity.columns-to-display' | translate}}"