-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/ui/src/app/entity/entity-select.directive.js b/ui/src/app/entity/entity-select.directive.js
index 705c6b8627..2778a79a17 100644
--- a/ui/src/app/entity/entity-select.directive.js
+++ b/ui/src/app/entity/entity-select.directive.js
@@ -48,6 +48,7 @@ export default function EntitySelect($compile, $templateCache) {
}
ngModelCtrl.$render = function () {
+ destroyWatchers();
if (ngModelCtrl.$viewValue) {
var value = ngModelCtrl.$viewValue;
scope.model.entityType = value.entityType;
@@ -56,19 +57,43 @@ export default function EntitySelect($compile, $templateCache) {
scope.model.entityType = null;
scope.model.entityId = null;
}
+ initWatchers();
}
- scope.$watch('model.entityType', function () {
- scope.updateView();
- });
+ function initWatchers() {
+ scope.entityTypeDeregistration = scope.$watch('model.entityType', function (newVal, prevVal) {
+ if (!angular.equals(newVal, prevVal)) {
+ scope.updateView();
+ }
+ });
+
+ scope.entityIdDeregistration = scope.$watch('model.entityId', function (newVal, prevVal) {
+ if (!angular.equals(newVal, prevVal)) {
+ scope.updateView();
+ }
+ });
- scope.$watch('model.entityId', function () {
- scope.updateView();
- });
+ scope.disabledDeregistration = scope.$watch('disabled', function (newVal, prevVal) {
+ if (!angular.equals(newVal, prevVal)) {
+ scope.updateView();
+ }
+ });
+ }
- scope.$watch('disabled', function () {
- scope.updateView();
- });
+ function destroyWatchers() {
+ if (scope.entityTypeDeregistration) {
+ scope.entityTypeDeregistration();
+ scope.entityTypeDeregistration = null;
+ }
+ if (scope.entityIdDeregistration) {
+ scope.entityIdDeregistration();
+ scope.entityIdDeregistration = null;
+ }
+ if (scope.disabledDeregistration) {
+ scope.disabledDeregistration();
+ scope.disabledDeregistration = null;
+ }
+ }
$compile(element.contents())(scope);
}
diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js
index 6513ce8821..f16fe9a850 100644
--- a/ui/src/app/locale/locale.constant.js
+++ b/ui/src/app/locale/locale.constant.js
@@ -188,6 +188,7 @@ export default angular.module('thingsboard.locale', [])
"root-state-entity": "Use dashboard state entity as root",
"root-entity": "Root entity",
"state-entity-parameter-name": "State entity parameter name",
+ "default-state-entity": "Default state entity",
"default-entity-parameter-name": "By default",
"max-relation-level": "Max relation level",
"unlimited-level": "Unlimited level",
diff --git a/ui/src/app/widget/lib/alarms-table-widget.js b/ui/src/app/widget/lib/alarms-table-widget.js
index 7618e6a829..a91c2a02af 100644
--- a/ui/src/app/widget/lib/alarms-table-widget.js
+++ b/ui/src/app/widget/lib/alarms-table-widget.js
@@ -69,6 +69,7 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia
vm.displayDetails = true;
vm.allowAcknowledgment = true;
vm.allowClear = true;
+ vm.actionCellDescriptors = [];
vm.displayPagination = true;
vm.defaultPageSize = 10;
vm.defaultSortOrder = '-'+types.alarmFields.createdTime.value;
@@ -94,6 +95,7 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia
vm.onReorder = onReorder;
vm.onPaginate = onPaginate;
vm.onRowClick = onRowClick;
+ vm.onActionButtonClick = onActionButtonClick;
vm.isCurrent = isCurrent;
vm.openAlarmDetails = openAlarmDetails;
vm.ackAlarms = ackAlarms;
@@ -157,6 +159,8 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia
vm.ctx.widgetActions = [ vm.searchAction ];
+ vm.actionCellDescriptors = vm.ctx.actionsApi.getActionDescriptors('actionCellButton');
+
if (vm.settings.alarmsTitle && vm.settings.alarmsTitle.length) {
vm.alarmsTitle = utils.customTranslation(vm.settings.alarmsTitle, vm.settings.alarmsTitle);
} else {
@@ -280,9 +284,35 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia
}
function onRowClick($event, alarm) {
+ if ($event) {
+ $event.stopPropagation();
+ }
if (vm.currentAlarm != alarm) {
vm.currentAlarm = alarm;
}
+ var descriptors = vm.ctx.actionsApi.getActionDescriptors('rowClick');
+ if (descriptors.length) {
+ var entityId;
+ var entityName;
+ if (vm.currentAlarm && vm.currentAlarm.originator) {
+ entityId = vm.currentAlarm.originator;
+ entityName = vm.currentAlarm.originatorName;
+ }
+ vm.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName);
+ }
+ }
+
+ function onActionButtonClick($event, alarm, actionDescriptor) {
+ if ($event) {
+ $event.stopPropagation();
+ }
+ var entityId;
+ var entityName;
+ if (alarm && alarm.originator) {
+ entityId = alarm.originator;
+ entityName = alarm.originatorName;
+ }
+ vm.ctx.actionsApi.handleWidgetAction($event, actionDescriptor, entityId, entityName);
}
function isCurrent(alarm) {
diff --git a/ui/src/app/widget/lib/alarms-table-widget.tpl.html b/ui/src/app/widget/lib/alarms-table-widget.tpl.html
index 942b2afb1d..b7416e95a0 100644
--- a/ui/src/app/widget/lib/alarms-table-widget.tpl.html
+++ b/ui/src/app/widget/lib/alarms-table-widget.tpl.html
@@ -64,6 +64,7 @@
| {{ key.title }} |
|
+ |
@@ -83,6 +84,19 @@
+
+
+ {{actionDescriptor.icon}}
+
+ {{ actionDescriptor.displayName }}
+
+
+ |
diff --git a/ui/src/app/widget/lib/entities-table-widget.js b/ui/src/app/widget/lib/entities-table-widget.js
index f0b5835fbe..7d97fe4559 100644
--- a/ui/src/app/widget/lib/entities-table-widget.js
+++ b/ui/src/app/widget/lib/entities-table-widget.js
@@ -107,6 +107,7 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $tra
vm.datasources = vm.subscription.datasources;
initializeConfig();
updateDatasources();
+ updateEntities();
}
});
@@ -276,16 +277,16 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $tra
}
if (vm.currentEntity != entity) {
vm.currentEntity = entity;
- var descriptors = vm.ctx.actionsApi.getActionDescriptors('rowClick');
- if (descriptors.length) {
- var entityId;
- var entityName;
- if (vm.currentEntity) {
- entityId = vm.currentEntity.id;
- entityName = vm.currentEntity.entityName;
- }
- vm.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName);
+ }
+ var descriptors = vm.ctx.actionsApi.getActionDescriptors('rowClick');
+ if (descriptors.length) {
+ var entityId;
+ var entityName;
+ if (vm.currentEntity) {
+ entityId = vm.currentEntity.id;
+ entityName = vm.currentEntity.entityName;
}
+ vm.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName);
}
}