diff --git a/ui/src/app/api/alias-controller.js b/ui/src/app/api/alias-controller.js new file mode 100644 index 0000000000..779436336f --- /dev/null +++ b/ui/src/app/api/alias-controller.js @@ -0,0 +1,259 @@ +/* + * Copyright © 2016-2017 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const varsRegex = /\$\{([^\}]*)\}/g; + +export default class AliasController { + + constructor($scope, $q, $filter, utils, types, entityService, stateController, entityAliases) { + this.$scope = $scope; + this.$q = $q; + this.$filter = $filter; + this.utils = utils; + this.types = types; + this.entityService = entityService; + this.stateController = stateController; + this.entityAliases = angular.copy(entityAliases); + this.resolvedAliases = {}; + this.resolvedAliasesPromise = {}; + this.resolvedAliasesToStateEntities = {}; + } + + updateEntityAliases(newEntityAliases) { + var changedAliasIds = []; + for (var aliasId in newEntityAliases) { + var newEntityAlias = newEntityAliases[aliasId]; + var prevEntityAlias = this.entityAliases[aliasId]; + if (!angular.equals(newEntityAlias, prevEntityAlias)) { + changedAliasIds.push(aliasId); + this.setAliasUnresolved(aliasId); + } + } + for (aliasId in this.entityAliases) { + if (!newEntityAliases[aliasId]) { + changedAliasIds.push(aliasId); + this.setAliasUnresolved(aliasId); + } + } + this.entityAliases = angular.copy(newEntityAliases); + if (changedAliasIds.length) { + this.$scope.$broadcast('entityAliasesChanged', changedAliasIds); + } + } + + dashboardStateChanged() { + var newEntityId = this.stateController.getStateParams().entityId; + var changedAliasIds = []; + for (var aliasId in this.resolvedAliasesToStateEntities) { + var prevEntityId = this.resolvedAliasesToStateEntities[aliasId]; + if (!angular.equals(newEntityId, prevEntityId)) { + changedAliasIds.push(aliasId); + this.setAliasUnresolved(aliasId); + } + } + if (changedAliasIds.length) { + this.$scope.$broadcast('entityAliasesChanged', changedAliasIds); + } + } + + setAliasUnresolved(aliasId) { + delete this.resolvedAliases[aliasId]; + delete this.resolvedAliasesPromise[aliasId]; + delete this.resolvedAliasesToStateEntities[aliasId]; + } + + getEntityAliases() { + return this.entityAliases; + } + + getAliasInfo(aliasId) { + var deferred = this.$q.defer(); + var aliasInfo = this.resolvedAliases[aliasId]; + if (aliasInfo) { + deferred.resolve(aliasInfo); + return deferred.promise; + } else if (this.resolvedAliasesPromise[aliasId]) { + return this.resolvedAliasesPromise[aliasId]; + } else { + this.resolvedAliasesPromise[aliasId] = deferred.promise; + var aliasCtrl = this; + var entityAlias = this.entityAliases[aliasId]; + if (entityAlias) { + this.entityService.resolveAlias(entityAlias, this.stateController.getStateParams()).then( + function success(aliasInfo) { + aliasCtrl.resolvedAliases[aliasId] = aliasInfo; + if (entityAlias.filter.stateEntity) { + aliasCtrl.resolvedAliasesToStateEntities[aliasId] = + aliasCtrl.stateController.getStateParams().entityId; + } + deferred.resolve(aliasInfo); + }, + function fail() { + deferred.reject(); + } + ); + } else { + deferred.reject(); + } + return this.resolvedAliasesPromise[aliasId]; + } + } + + resolveDatasource(datasource) { + var deferred = this.$q.defer(); + if (datasource.type === this.types.datasourceType.entity) { + if (datasource.entityAliasId) { + this.getAliasInfo(datasource.entityAliasId).then( + function success(aliasInfo) { + datasource.aliasName = aliasInfo.alias; + if (aliasInfo.resolveMultiple) { + var resolvedEntities = aliasInfo.resolvedEntities; + if (resolvedEntities && resolvedEntities.length) { + var datasources = []; + for (var i=0;i 0 ? true : false; + datasources.push(newDatasource); + } + deferred.resolve(datasources); + } else { + deferred.reject(); + } + } else { + var entity = aliasInfo.currentEntity; + datasource.entityId = entity.id; + datasource.entityType = entity.entityType; + datasource.entityName = entity.name; + datasource.name = entity.name; + deferred.resolve([datasource]); + } + }, + function fail() { + deferred.reject(); + } + ); + } else { // entityId + datasource.aliasName = datasource.entityName; + datasource.name = datasource.entityName; + deferred.resolve([datasource]); + } + } else { // function + deferred.resolve([datasource]); + } + return deferred.promise; + } + + resolveDatasources(datasources) { + + function updateDataKeyLabel(dataKey, datasource) { + if (!dataKey.pattern) { + dataKey.pattern = angular.copy(dataKey.label); + } + var pattern = dataKey.pattern; + var label = dataKey.pattern; + var match = varsRegex.exec(pattern); + while (match !== null) { + var variable = match[0]; + var variableName = match[1]; + if (variableName === 'dsName') { + label = label.split(variable).join(datasource.name); + } else if (variableName === 'entityName') { + label = label.split(variable).join(datasource.entityName); + } else if (variableName === 'deviceName') { + label = label.split(variable).join(datasource.entityName); + } else if (variableName === 'aliasName') { + label = label.split(variable).join(datasource.aliasName); + } + match = varsRegex.exec(pattern); + } + dataKey.label = label; + } + + function updateDatasourceKeyLabels(datasource) { + for (var dk = 0; dk < datasource.dataKeys.length; dk++) { + updateDataKeyLabel(datasource.dataKeys[dk], datasource); + } + } + + var deferred = this.$q.defer(); + var newDatasources = angular.copy(datasources); + var datasorceResolveTasks = []; + var aliasCtrl = this; + newDatasources.forEach(function (datasource) { + var resolveDatasourceTask = aliasCtrl.resolveDatasource(datasource); + datasorceResolveTasks.push(resolveDatasourceTask); + }); + this.$q.all(datasorceResolveTasks).then( + function success(datasourcesArrays) { + var datasources = [].concat.apply([], datasourcesArrays); + datasources = aliasCtrl.$filter('orderBy')(datasources, '+generated'); + var index = 0; + var functionIndex = 0; + datasources.forEach(function(datasource) { + if (datasource.type === aliasCtrl.types.datasourceType.function) { + var name; + if (datasource.name && datasource.name.length) { + name = datasource.name; + } else { + functionIndex++; + name = aliasCtrl.types.datasourceType.function; + if (functionIndex > 1) { + name += ' ' + functionIndex; + } + } + datasource.name = name; + datasource.aliasName = name; + datasource.entityName = name; + } + datasource.dataKeys.forEach(function(dataKey) { + if (datasource.generated) { + dataKey._hash = Math.random(); + dataKey.color = aliasCtrl.utils.getMaterialColor(index); + } + index++; + }); + updateDatasourceKeyLabels(datasource); + }); + deferred.resolve(datasources); + }, + function fail() { + deferred.reject(); + } + ); + return deferred.promise; + } + + getInstantAliasInfo(aliasId) { + return this.resolvedAliases[aliasId]; + } + + updateCurrentAliasEntity(aliasId, currentEntity) { + var aliasInfo = this.resolvedAliases[aliasId]; + if (aliasInfo) { + var prevCurrentEntity = aliasInfo.currentEntity; + if (!angular.equals(currentEntity, prevCurrentEntity)) { + aliasInfo.currentEntity = currentEntity; + this.$scope.$broadcast('entityAliasesChanged', [aliasId]); + } + } + } + +} \ No newline at end of file diff --git a/ui/src/app/api/entity.service.js b/ui/src/app/api/entity.service.js index 891f9d83b2..8c28a9bfde 100644 --- a/ui/src/app/api/entity.service.js +++ b/ui/src/app/api/entity.service.js @@ -27,10 +27,13 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device getEntity: getEntity, getEntities: getEntities, getEntitiesByNameFilter: getEntitiesByNameFilter, - processEntityAliases: processEntityAliases, + resolveAlias: resolveAlias, + resolveAliasFilter: resolveAliasFilter, + filterAliasByEntityTypes: filterAliasByEntityTypes, + //processEntityAliases: processEntityAliases, getEntityKeys: getEntityKeys, checkEntityAlias: checkEntityAlias, - createDatasoucesFromSubscriptionsInfo: createDatasoucesFromSubscriptionsInfo, + createDatasourcesFromSubscriptionsInfo: createDatasourcesFromSubscriptionsInfo, getRelatedEntities: getRelatedEntities, saveRelatedEntity: saveRelatedEntity, getRelatedEntity: getRelatedEntity, @@ -244,81 +247,151 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device return deferred.promise; } - function entityToEntityInfo(entityType, entity) { - return { name: entity.name, entityType: entityType, id: entity.id.id }; + function entityToEntityInfo(entity) { + return { name: entity.name, entityType: entity.id.entityType, id: entity.id.id }; } - function entitiesToEntitiesInfo(entityType, entities) { + function entitiesToEntitiesInfo(entities) { var entitiesInfo = []; for (var d = 0; d < entities.length; d++) { - entitiesInfo.push(entityToEntityInfo(entityType, entities[d])); + entitiesInfo.push(entityToEntityInfo(entities[d])); } return entitiesInfo; } - function processEntityAlias(index, aliasIds, entityAliases, resolution, deferred) { - if (index < aliasIds.length) { - var aliasId = aliasIds[index]; - var entityAlias = entityAliases[aliasId]; - var alias = entityAlias.alias; - var entityFilter = entityAlias.entityFilter; - if (entityFilter.useFilter) { - var entityNameFilter = entityFilter.entityNameFilter; - getEntitiesByNameFilter(entityAlias.entityType, entityNameFilter, 100).then( - function(entities) { - if (entities && entities != null) { - var resolvedAlias = {alias: alias, entityType: entityAlias.entityType, entityId: entities[0].id.id}; - resolution.aliasesInfo.entityAliases[aliasId] = resolvedAlias; - resolution.aliasesInfo.entityAliasesInfo[aliasId] = entitiesToEntitiesInfo(entityAlias.entityType, entities); - index++; - processEntityAlias(index, aliasIds, entityAliases, resolution, deferred); - } else { - if (!resolution.error) { - resolution.error = 'dashboard.invalid-aliases-config'; + function resolveAliasFilter(filter, stateParams) { + var deferred = $q.defer(); + var result = { + entities: [], + stateEntity: false + }; + switch (filter.type) { + case types.aliasFilterType.entityList.value: + if (filter.stateEntity) { + result.stateEntity = true; + if (stateParams && stateParams.entityId) { + getEntity(stateParams.entityId.entityType, stateParams.entityId.id).then( + function success(entity) { + result.entities = [entity]; + deferred.resolve(result); + }, + function fail() { + deferred.reject(); } - index++; - processEntityAlias(index, aliasIds, entityAliases, resolution, deferred); + ); + } else { + deferred.resolve(result); + } + } else { + getEntities(filter.entityType, filter.entityList).then( + function success(entities) { + if (entities && entities.length) { + result.entities = entities; + deferred.resolve(result); + } else { + deferred.reject(); + } + }, + function fail() { + deferred.reject(); } - }); - } else { - var entityList = entityFilter.entityList; - getEntities(entityAlias.entityType, entityList).then( + ); + } + break; + case types.aliasFilterType.entityName.value: + getEntitiesByNameFilter(filter.entityType, filter.entityNameFilter, 100).then( function success(entities) { - if (entities && entities.length > 0) { - var resolvedAlias = {alias: alias, entityType: entityAlias.entityType, entityId: entities[0].id.id}; - resolution.aliasesInfo.entityAliases[aliasId] = resolvedAlias; - resolution.aliasesInfo.entityAliasesInfo[aliasId] = entitiesToEntitiesInfo(entityAlias.entityType, entities); - index++; - processEntityAlias(index, aliasIds, entityAliases, resolution, deferred); + if (entities && entities.length) { + result.entities = entities; + deferred.resolve(result); } else { - if (!resolution.error) { - resolution.error = 'dashboard.invalid-aliases-config'; - } - index++; - processEntityAlias(index, aliasIds, entityAliases, resolution, deferred); + deferred.reject(); } }, function fail() { + deferred.reject(); + } + ); + break; + //TODO: + } + return deferred.promise; + } + + function resolveAlias(entityAlias, stateParams) { + var deferred = $q.defer(); + var filter = entityAlias.filter; + resolveAliasFilter(filter, stateParams).then( + function (result) { + var entities = result.entities; + var aliasInfo = { + alias: entityAlias.alias, + resolveMultiple: filter.resolveMultiple + }; + var resolvedEntities = entitiesToEntitiesInfo(entities); + aliasInfo.resolvedEntities = resolvedEntities; + aliasInfo.currentEntity = null; + if (aliasInfo.resolvedEntities.length) { + aliasInfo.currentEntity = aliasInfo.resolvedEntities[0]; + } + deferred.resolve(aliasInfo); + }, + function fail() { + deferred.reject(); + } + ); + return deferred.promise; + } + + function filterAliasByEntityTypes(entityAlias, entityTypes) { + var filter = entityAlias.filter; + switch (filter.type) { + case types.aliasFilterType.entityList.value: + if (filter.stateEntity) { + return true; + } else { + return entityTypes.indexOf(filter.entityType) > -1 ? true : false; + } + case types.aliasFilterType.entityName.value: + return entityTypes.indexOf(filter.entityType) > -1 ? true : false; + } + //TODO: + return false; + } + + /*function processEntityAlias(index, aliasIds, entityAliases, stateParams, resolution, deferred) { + if (index < aliasIds.length) { + var aliasId = aliasIds[index]; + var entityAlias = entityAliases[aliasId]; + var alias = entityAlias.alias; + var filter = entityAlias.filter; + resolveAliasFilter(filter, stateParams).then( + function (entities) { + if (entities && entities.length) { + var entity = entities[0]; + var resolvedAlias = {alias: alias, entityType: entity.id.entityType, entityId: entity.id.id}; + resolution.aliasesInfo.entityAliases[aliasId] = resolvedAlias; + resolution.aliasesInfo.entityAliasesInfo[aliasId] = entitiesToEntitiesInfo(entities); + index++; + processEntityAlias(index, aliasIds, entityAliases, stateParams, resolution, deferred); + } else { if (!resolution.error) { resolution.error = 'dashboard.invalid-aliases-config'; } index++; - processEntityAlias(index, aliasIds, entityAliases, resolution, deferred); + processEntityAlias(index, aliasIds, entityAliases, stateParams, resolution, deferred); } - ); - } + } + ); } else { deferred.resolve(resolution); } - } + }*/ - function processEntityAliases(entityAliases) { + /*function processEntityAliases(entityAliases, stateParams) { var deferred = $q.defer(); var resolution = { - aliasesInfo: { - entityAliases: {}, - entityAliasesInfo: {} - } + aliasesInfo: {} }; var aliasIds = []; if (entityAliases) { @@ -326,9 +399,9 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device aliasIds.push(aliasId); } } - processEntityAlias(0, aliasIds, entityAliases, resolution, deferred); + processEntityAlias(0, aliasIds, entityAliases, stateParams, resolution, deferred); return deferred.promise; - } + }*/ function getEntityKeys(entityType, entityId, query, type) { var deferred = $q.defer(); @@ -354,8 +427,8 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device } } deferred.resolve(result); - }, function fail(response) { - deferred.reject(response.data); + }, function fail() { + deferred.reject(); }); return deferred.promise; } @@ -387,7 +460,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device return deferred.promise; } - function createDatasoucesFromSubscriptionsInfo(subscriptionsInfo) { + function createDatasourcesFromSubscriptionsInfo(subscriptionsInfo) { var deferred = $q.defer(); var datasources = []; processSubscriptionsInfo(0, subscriptionsInfo, datasources, deferred); diff --git a/ui/src/app/api/subscription.js b/ui/src/app/api/subscription.js index fb774a1f0a..471203c3b2 100644 --- a/ui/src/app/api/subscription.js +++ b/ui/src/app/api/subscription.js @@ -39,6 +39,9 @@ export default class Subscription { this.cafs = {}; this.registrations = []; + var subscription = this; + var deferred = this.ctx.$q.defer(); + if (this.type === this.ctx.types.widgetType.rpc.value) { this.callbacks.rpcStateChanged = this.callbacks.rpcStateChanged || function(){}; this.callbacks.onRpcSuccess = this.callbacks.onRpcSuccess || function(){}; @@ -56,7 +59,11 @@ export default class Subscription { this.rpcEnabled = false; this.executingRpcRequest = false; this.executingPromises = []; - this.initRpc(); + this.initRpc().then( + function() { + deferred.resolve(subscription); + } + ); } else { this.callbacks.onDataUpdated = this.callbacks.onDataUpdated || function(){}; this.callbacks.onDataUpdateError = this.callbacks.onDataUpdateError || function(){}; @@ -103,11 +110,36 @@ export default class Subscription { this.legendConfig.showMax === true || this.legendConfig.showAvg === true || this.legendConfig.showTotal === true); - this.initDataSubscription(); + this.initDataSubscription().then( + function success() { + deferred.resolve(subscription); + }, + function fail() { + deferred.reject(); + } + ); } + + return deferred.promise; } initDataSubscription() { + var deferred = this.ctx.$q.defer(); + var subscription = this; + this.ctx.aliasController.resolveDatasources(this.datasources).then( + function success(datasources) { + subscription.datasources = datasources; + subscription.configureData(); + deferred.resolve(); + }, + function fail() { + deferred.reject(); + } + ); + return deferred.promise; + } + + configureData() { var dataIndex = 0; for (var i = 0; i < this.datasources.length; i++) { var datasource = this.datasources[i]; @@ -199,21 +231,46 @@ export default class Subscription { } initRpc() { + var deferred = this.ctx.$q.defer(); if (this.targetDeviceAliasIds && this.targetDeviceAliasIds.length > 0) { this.targetDeviceAliasId = this.targetDeviceAliasIds[0]; - if (this.ctx.aliasesInfo.entityAliases[this.targetDeviceAliasId]) { - this.targetDeviceId = this.ctx.aliasesInfo.entityAliases[this.targetDeviceAliasId].entityId; + var subscription = this; + this.ctx.aliasController.getAliasInfo(this.targetDeviceAliasId).then( + function success(aliasInfo) { + if (aliasInfo.currentEntity && aliasInfo.currentEntity.entityType == subscription.ctx.types.entityType.device) { + subscription.targetDeviceId = aliasInfo.currentEntity.id; + if (subscription.targetDeviceId) { + subscription.rpcEnabled = true; + } else { + subscription.rpcEnabled = subscription.ctx.$scope.widgetEditMode ? true : false; + } + subscription.callbacks.rpcStateChanged(this); + deferred.resolve(); + } else { + subscription.rpcEnabled = false; + subscription.callbacks.rpcStateChanged(this); + deferred.resolve(); + } + }, + function fail () { + subscription.rpcEnabled = false; + subscription.callbacks.rpcStateChanged(this); + deferred.resolve(); + } + ); + } else { + if (this.targetDeviceIds && this.targetDeviceIds.length > 0) { + this.targetDeviceId = this.targetDeviceIds[0]; } - } else if (this.targetDeviceIds && this.targetDeviceIds.length > 0) { - this.targetDeviceId = this.targetDeviceIds[0]; - } - - if (this.targetDeviceId) { - this.rpcEnabled = true; - } else { - this.rpcEnabled = this.ctx.$scope.widgetEditMode ? true : false; + if (this.targetDeviceId) { + this.rpcEnabled = true; + } else { + this.rpcEnabled = this.ctx.$scope.widgetEditMode ? true : false; + } + this.callbacks.rpcStateChanged(this); + deferred.resolve(); } - this.callbacks.rpcStateChanged(this); + return deferred.promise; } clearRpcError() { @@ -319,11 +376,11 @@ export default class Subscription { this.onDataUpdated(); } - onAliasesChanged() { + onAliasesChanged(aliasIds) { if (this.type === this.ctx.types.widgetType.rpc.value) { - this.checkRpcTarget(); + return this.checkRpcTarget(aliasIds); } else { - this.checkSubscriptions(); + return this.checkSubscriptions(aliasIds); } } @@ -481,7 +538,7 @@ export default class Subscription { var datasource = this.datasources[i]; if (angular.isFunction(datasource)) continue; - var entityId = null; + /* var entityId = null; var entityType = null; if (datasource.type === this.ctx.types.datasourceType.entity) { var aliasName = null; @@ -513,7 +570,7 @@ export default class Subscription { } for (var dk = 0; dk < datasource.dataKeys.length; dk++) { updateDataKeyLabel(datasource.dataKeys[dk], datasource.name, entityName, aliasName); - } + }*/ var subscription = this; @@ -521,8 +578,8 @@ export default class Subscription { subscriptionType: this.type, subscriptionTimewindow: this.subscriptionTimewindow, datasource: datasource, - entityType: entityType, - entityId: entityId, + entityType: datasource.entityType, + entityId: datasource.entityId, dataUpdated: function (data, datasourceIndex, dataKeyIndex, apply) { subscription.dataUpdated(data, datasourceIndex, dataKeyIndex, apply); }, @@ -557,8 +614,13 @@ export default class Subscription { } } - checkRpcTarget() { - var deviceId = null; + checkRpcTarget(aliasIds) { + if (aliasIds.indexOf(this.targetDeviceAliasId) > -1) { + return true; + } else { + return false; + } + /*var deviceId = null; if (this.ctx.aliasesInfo.entityAliases[this.targetDeviceAliasId]) { deviceId = this.ctx.aliasesInfo.entityAliases[this.targetDeviceAliasId].entityId; } @@ -570,14 +632,20 @@ export default class Subscription { this.rpcEnabled = this.ctx.$scope.widgetEditMode ? true : false; } this.callbacks.rpcStateChanged(this); - } + }*/ } - checkSubscriptions() { + checkSubscriptions(aliasIds) { var subscriptionsChanged = false; for (var i = 0; i < this.datasourceListeners.length; i++) { var listener = this.datasourceListeners[i]; - var entityId = null; + if (listener.datasource.entityAliasId) { + if (aliasIds.indexOf(listener.datasource.entityAliasId) > -1) { + subscriptionsChanged = true; + break; + } + } + /*var entityId = null; var entityType = null; var aliasName = null; if (listener.datasource.type === this.ctx.types.datasourceType.entity) { @@ -593,12 +661,13 @@ export default class Subscription { subscriptionsChanged = true; break; } - } + }*/ } - if (subscriptionsChanged) { + return subscriptionsChanged; + /*if (subscriptionsChanged) { this.unsubscribe(); this.subscribe(); - } + }*/ } destroy() { @@ -617,7 +686,7 @@ export default class Subscription { } -const varsRegex = /\$\{([^\}]*)\}/g; +/*const varsRegex = /\$\{([^\}]*)\}/g; function updateDataKeyLabel(dataKey, dsName, entityName, aliasName) { var pattern = dataKey.pattern; @@ -638,7 +707,7 @@ function updateDataKeyLabel(dataKey, dsName, entityName, aliasName) { match = varsRegex.exec(pattern); } dataKey.label = label; -} +}*/ function calculateMin(data) { if (data.length > 0) { diff --git a/ui/src/app/common/dashboard-utils.service.js b/ui/src/app/common/dashboard-utils.service.js index 78136dfb2e..51a0215dd2 100644 --- a/ui/src/app/common/dashboard-utils.service.js +++ b/ui/src/app/common/dashboard-utils.service.js @@ -40,39 +40,75 @@ function DashboardUtils(types, utils, timeService) { return service; function validateAndUpdateEntityAliases(configuration) { + var aliasId, entityAlias; if (angular.isUndefined(configuration.entityAliases)) { configuration.entityAliases = {}; if (configuration.deviceAliases) { var deviceAliases = configuration.deviceAliases; - for (var aliasId in deviceAliases) { + for (aliasId in deviceAliases) { var deviceAlias = deviceAliases[aliasId]; - var alias = deviceAlias.alias; - var entityFilter = { - useFilter: false, - entityNameFilter: '', - entityList: [] - } - if (deviceAlias.deviceFilter) { - entityFilter.useFilter = deviceAlias.deviceFilter.useFilter; - entityFilter.entityNameFilter = deviceAlias.deviceFilter.deviceNameFilter; - entityFilter.entityList = deviceAlias.deviceFilter.deviceList; - } else if (deviceAlias.deviceId) { - entityFilter.entityList = [deviceAlias.deviceId]; - } - var entityAlias = { - id: aliasId, - alias: alias, - entityType: types.entityType.device, - entityFilter: entityFilter - }; + entityAlias = validateAndUpdateDeviceAlias(aliasId, deviceAlias); configuration.entityAliases[aliasId] = entityAlias; } delete configuration.deviceAliases; } + } else { + var entityAliases = configuration.entityAliases; + for (aliasId in entityAliases) { + entityAlias = entityAliases[aliasId]; + entityAliases[aliasId] = validateAndUpdateEntityAlias(entityAlias); + } } return configuration; } + function validateAndUpdateDeviceAlias(aliasId, deviceAlias) { + var alias = deviceAlias.alias; + var entityAlias = { + id: aliasId, + alias: alias, + filter: { + type: null, + entityType: types.entityType.device, + resolveMultiple: false + }, + } + if (deviceAlias.deviceFilter) { + entityAlias.filter.type = + deviceAlias.deviceFilter.useFilter ? types.aliasFilterType.entityName.value : types.aliasFilterType.entityList.value; + if (entityAlias.filter.type == types.aliasFilterType.entityList.value) { + entityAlias.filter.entityList = deviceAlias.deviceFilter.deviceList; + entityAlias.filter.stateEntity = false; + } else { + entityAlias.filter.entityNameFilter = deviceAlias.deviceFilter.deviceNameFilter; + } + } else { + entityAlias.filter.type = types.aliasFilterType.entityList.value; + entityAlias.filter.entityList = [deviceAlias.deviceId]; + entityAlias.filter.stateEntity = false; + } + return entityAlias; + } + + function validateAndUpdateEntityAlias(entityAlias) { + if (!entityAlias.filter) { + entityAlias.filter = { + type: entityAlias.entityFilter.useFilter ? types.aliasFilterType.entityName.value : types.aliasFilterType.entityList.value, + entityType: entityAlias.entityType, + resolveMultiple: false + } + if (entityAlias.filter.type == types.aliasFilterType.entityList.value) { + entityAlias.filter.entityList = entityAlias.entityFilter.entityList; + entityAlias.filter.stateEntity = false; + } else { + entityAlias.filter.entityNameFilter = entityAlias.entityFilter.entityNameFilter; + } + delete entityAlias.entityType; + delete entityAlias.entityFilter; + } + return entityAlias; + } + function validateAndUpdateWidget(widget) { if (!widget.config) { widget.config = {}; diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js index 44e59a260d..40b66391fd 100644 --- a/ui/src/app/common/types.constant.js +++ b/ui/src/app/common/types.constant.js @@ -65,6 +65,36 @@ export default angular.module('thingsboard.types', []) clearedUnack: "CLEARED_UNACK", clearedAck: "CLEARED_ACK" }, + aliasFilterType: { + entityList: { + value: 'entityList', + name: 'alias.filter-type-entity-list' + }, + entityName: { + value: 'entityName', + name: 'alias.filter-type-entity-name' + }, + assetType: { + value: 'assetType', + name: 'alias.filter-type-asset-type' + }, + deviceType: { + value: 'deviceType', + name: 'alias.filter-type-device-type' + }, + relationsQuery: { + value: 'relationsQuery', + name: 'alias.filter-type-relations-query' + }, + assetSearchQuery: { + value: 'assetSearchQuery', + name: 'alias.filter-type-asset-search-query' + }, + deviceSearchQuery: { + value: 'deviceSearchQuery', + name: 'alias.filter-type-device-search-query' + } + }, position: { top: { value: "top", diff --git a/ui/src/app/components/dashboard.directive.js b/ui/src/app/components/dashboard.directive.js index f26121ccea..965b83854f 100644 --- a/ui/src/app/components/dashboard.directive.js +++ b/ui/src/app/components/dashboard.directive.js @@ -52,7 +52,7 @@ function Dashboard() { bindToController: { widgets: '=', widgetLayouts: '=?', - aliasesInfo: '=', + aliasController: '=', stateController: '=', dashboardTimewindow: '=?', columns: '=', @@ -329,10 +329,6 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t $scope.$broadcast('toggleDashboardEditMode', vm.isEdit); }); - $scope.$watch('vm.aliasesInfo.entityAliases', function () { - $scope.$broadcast('entityAliasListChanged', vm.aliasesInfo); - }, true); - $scope.$on('gridster-resized', function (event, sizes, theGridster) { if (checkIsLocalGridsterElement(theGridster)) { vm.gridster = theGridster; diff --git a/ui/src/app/components/dashboard.tpl.html b/ui/src/app/components/dashboard.tpl.html index 69934ac215..8d77a6fcca 100644 --- a/ui/src/app/components/dashboard.tpl.html +++ b/ui/src/app/components/dashboard.tpl.html @@ -89,7 +89,7 @@
diff --git a/ui/src/app/components/datasource.directive.js b/ui/src/app/components/datasource.directive.js index 2c06a381ee..eb9eafc4a4 100644 --- a/ui/src/app/components/datasource.directive.js +++ b/ui/src/app/components/datasource.directive.js @@ -76,7 +76,7 @@ function Datasource($compile, $templateCache, types) { restrict: "E", require: "^ngModel", scope: { - entityAliases: '=', + aliasController: '=', widgetType: '=', functionsOnly: '=', datakeySettingsSchema: '=', diff --git a/ui/src/app/components/datasource.tpl.html b/ui/src/app/components/datasource.tpl.html index 88ff247fa0..0e91d9832e 100644 --- a/ui/src/app/components/datasource.tpl.html +++ b/ui/src/app/components/datasource.tpl.html @@ -37,7 +37,7 @@ ng-switch-when="entity" ng-required="model.type === types.datasourceType.entity" widget-type="widgetType" - entity-aliases="entityAliases" + alias-controller="aliasController" generate-data-key="generateDataKey({chip: chip, type: type})" fetch-entity-keys="fetchEntityKeys({entityAliasId: entityAliasId, query: query, type: type})" on-create-entity-alias="onCreateEntityAlias({event: event, alias: alias})"> diff --git a/ui/src/app/components/entity-alias-select.directive.js b/ui/src/app/components/entity-alias-select.directive.js index 204b83fe6a..ca2db855f0 100644 --- a/ui/src/app/components/entity-alias-select.directive.js +++ b/ui/src/app/components/entity-alias-select.directive.js @@ -31,7 +31,7 @@ export default angular.module('thingsboard.directives.entityAliasSelect', []) .name; /*@ngInject*/ -function EntityAliasSelect($compile, $templateCache, $mdConstant) { +function EntityAliasSelect($compile, $templateCache, $mdConstant, entityService) { var linker = function (scope, element, attrs, ngModelCtrl) { var template = $templateCache.get(entityAliasSelectTemplate); @@ -49,19 +49,18 @@ function EntityAliasSelect($compile, $templateCache, $mdConstant) { ngModelCtrl.$setValidity('entityAlias', valid); }; - scope.$watch('entityAliases', function () { + scope.$watch('aliasController', function () { scope.entityAliasList = []; - for (var aliasId in scope.entityAliases) { + var entityAliases = scope.aliasController.getEntityAliases(); + for (var aliasId in entityAliases) { if (scope.allowedEntityTypes) { - if (scope.allowedEntityTypes.indexOf(scope.entityAliases[aliasId].entityType) === -1) { + if (!entityService.filterAliasByEntityTypes(entityAliases[aliasId], scope.allowedEntityTypes)) { continue; } } - var entityAlias = {id: aliasId, alias: scope.entityAliases[aliasId].alias, - entityType: scope.entityAliases[aliasId].entityType, entityId: scope.entityAliases[aliasId].entityId}; - scope.entityAliasList.push(entityAlias); + scope.entityAliasList.push(entityAliases[aliasId]); } - }, true); + }); scope.$watch('entityAlias', function () { scope.updateView(); @@ -141,7 +140,7 @@ function EntityAliasSelect($compile, $templateCache, $mdConstant) { link: linker, scope: { tbRequired: '=?', - entityAliases: '=', + aliasController: '=', allowedEntityTypes: '=?', onCreateEntityAlias: '&' } diff --git a/ui/src/app/components/widget-config.directive.js b/ui/src/app/components/widget-config.directive.js index c3793be294..d5b423987f 100644 --- a/ui/src/app/components/widget-config.directive.js +++ b/ui/src/app/components/widget-config.directive.js @@ -128,13 +128,9 @@ function WidgetConfig($compile, $templateCache, $rootScope, $timeout, types, uti } else if (scope.widgetType === types.widgetType.rpc.value && scope.isDataEnabled) { if (config.targetDeviceAliasIds && config.targetDeviceAliasIds.length > 0) { var aliasId = config.targetDeviceAliasIds[0]; - if (scope.entityAliases[aliasId]) { - scope.targetDeviceAlias.value = { - id: aliasId, - alias: scope.entityAliases[aliasId].alias, - entityType: scope.entityAliases[aliasId].entityType, - entityId: scope.entityAliases[aliasId].entityId - }; + var entityAliases = scope.aliasController.getEntityAliases(); + if (entityAliases[aliasId]) { + scope.targetDeviceAlias.value = entityAliases[aliasId]; } else { scope.targetDeviceAlias.value = null; } @@ -395,7 +391,7 @@ function WidgetConfig($compile, $templateCache, $rootScope, $timeout, types, uti widgetType: '=', widgetSettingsSchema: '=', datakeySettingsSchema: '=', - entityAliases: '=', + aliasController: '=', functionsOnly: '=', fetchEntityKeys: '&', onCreateEntityAlias: '&', diff --git a/ui/src/app/components/widget-config.tpl.html b/ui/src/app/components/widget-config.tpl.html index 808e07b487..0500e91949 100644 --- a/ui/src/app/components/widget-config.tpl.html +++ b/ui/src/app/components/widget-config.tpl.html @@ -60,7 +60,7 @@ style="padding: 0 0 0 10px; margin: 5px;"> diff --git a/ui/src/app/components/widget.controller.js b/ui/src/app/components/widget.controller.js index 6fc4bba646..103ad138e4 100644 --- a/ui/src/app/components/widget.controller.js +++ b/ui/src/app/components/widget.controller.js @@ -22,7 +22,7 @@ import Subscription from '../api/subscription'; /*@ngInject*/ export default function WidgetController($scope, $timeout, $window, $element, $q, $log, $injector, $filter, tbRaf, types, utils, timeService, datasourceService, entityService, deviceService, visibleRect, isEdit, stDiff, dashboardTimewindow, - dashboardTimewindowApi, widget, aliasesInfo, stateController, widgetType) { + dashboardTimewindowApi, widget, aliasController, stateController, widgetType) { var vm = this; @@ -37,6 +37,7 @@ export default function WidgetController($scope, $timeout, $window, $element, $q $scope.executingRpcRequest = false; var gridsterItemInited = false; + var subscriptionInited = false; var cafs = {}; @@ -149,7 +150,7 @@ export default function WidgetController($scope, $timeout, $window, $element, $q dashboardTimewindowApi: dashboardTimewindowApi, types: types, stDiff: stDiff, - aliasesInfo: aliasesInfo + aliasController: aliasController }; var widgetTypeInstance; @@ -203,8 +204,13 @@ export default function WidgetController($scope, $timeout, $window, $element, $q vm.gridsterItemInitialized = gridsterItemInitialized; - initialize(); - + initialize().then( + function(){ + if (checkSize()) { + onInit(); + } + } + ); /* options = { @@ -233,28 +239,42 @@ export default function WidgetController($scope, $timeout, $window, $element, $q } } - entityService.createDatasoucesFromSubscriptionsInfo(subscriptionsInfo).then( + entityService.createDatasourcesFromSubscriptionsInfo(subscriptionsInfo).then( function (datasources) { options.datasources = datasources; - var subscription = createSubscription(options, subscribe); - if (useDefaultComponents) { - defaultSubscriptionOptions(subscription, options); - } - deferred.resolve(subscription); + createSubscription(options, subscribe).then( + function success(subscription) { + if (useDefaultComponents) { + defaultSubscriptionOptions(subscription, options); + } + deferred.resolve(subscription); + }, + function fail() { + deferred.reject(); + } + ); } ); return deferred.promise; } function createSubscription(options, subscribe) { + var deferred = $q.defer(); options.dashboardTimewindow = dashboardTimewindow; - var subscription = - new Subscription(subscriptionContext, options); - widgetContext.subscriptions[subscription.id] = subscription; - if (subscribe) { - subscription.subscribe(); - } - return subscription; + new Subscription(subscriptionContext, options).then( + function success(subscription) { + widgetContext.subscriptions[subscription.id] = subscription; + if (subscribe) { + subscription.subscribe(); + } + deferred.resolve(subscription); + }, + function fail() { + deferred.reject(); + } + ); + + return deferred.promise; } function defaultComponentsOptions(options) { @@ -310,8 +330,8 @@ export default function WidgetController($scope, $timeout, $window, $element, $q } function createDefaultSubscription() { - var subscription; var options; + var deferred = $q.defer(); if (widget.type !== types.widgetType.rpc.value && widget.type !== types.widgetType.static.value) { options = { type: widget.type, @@ -319,16 +339,23 @@ export default function WidgetController($scope, $timeout, $window, $element, $q }; defaultComponentsOptions(options); - subscription = createSubscription(options); - - defaultSubscriptionOptions(subscription, options); + createSubscription(options).then( + function success(subscription) { + defaultSubscriptionOptions(subscription, options); - // backward compatibility + // backward compatibility - widgetContext.datasources = subscription.datasources; - widgetContext.data = subscription.data; - widgetContext.hiddenData = subscription.hiddenData; - widgetContext.timeWindow = subscription.timeWindow; + widgetContext.datasources = subscription.datasources; + widgetContext.data = subscription.data; + widgetContext.hiddenData = subscription.hiddenData; + widgetContext.timeWindow = subscription.timeWindow; + widgetContext.defaultSubscription = subscription; + deferred.resolve(); + }, + function fail() { + deferred.reject(); + } + ); } else if (widget.type === types.widgetType.rpc.value) { $scope.loadingData = false; @@ -356,24 +383,27 @@ export default function WidgetController($scope, $timeout, $window, $element, $q $scope.rpcRejection = null; } } - subscription = createSubscription(options); + createSubscription(options).then( + function success(subscription) { + widgetContext.defaultSubscription = subscription; + deferred.resolve(); + }, + function fail() { + deferred.reject(); + } + ); } else if (widget.type === types.widgetType.static.value) { $scope.loadingData = false; + deferred.resolve(); + } else { + deferred.resolve(); } - if (subscription) { - widgetContext.defaultSubscription = subscription; - } + return deferred.promise; } function initialize() { - if (!vm.useCustomDatasources) { - createDefaultSubscription(); - } else { - $scope.loadingData = false; - } - $scope.$on('toggleDashboardEditMode', function (event, isEdit) { onEditModeChanged(isEdit); }); @@ -398,11 +428,14 @@ export default function WidgetController($scope, $timeout, $window, $element, $q onMobileModeChanged(newIsMobile); }); - $scope.$on('entityAliasListChanged', function (event, aliasesInfo) { - subscriptionContext.aliasesInfo = aliasesInfo; + $scope.$on('entityAliasesChanged', function (event, aliasIds) { + var subscriptionChanged = false; for (var id in widgetContext.subscriptions) { var subscription = widgetContext.subscriptions[id]; - subscription.onAliasesChanged(); + subscriptionChanged = subscriptionChanged || subscription.onAliasesChanged(aliasIds); + } + if (subscriptionChanged && !vm.useCustomDatasources) { + reInit(); } }); @@ -410,6 +443,44 @@ export default function WidgetController($scope, $timeout, $window, $element, $q removeResizeListener(widgetContext.$containerParent[0], onResize); // eslint-disable-line no-undef onDestroy(); }); + + var deferred = $q.defer(); + if (!vm.useCustomDatasources) { + createDefaultSubscription().then( + function success() { + subscriptionInited = true; + deferred.resolve(); + }, + function fail() { + subscriptionInited = true; + deferred.reject(); + } + ); + } else { + $scope.loadingData = false; + subscriptionInited = true; + deferred.resolve(); + } + return deferred.promise; + } + + function reInit() { + onDestroy(); + if (!vm.useCustomDatasources) { + createDefaultSubscription().then( + function success() { + subscriptionInited = true; + onInit(); + }, + function fail() { + subscriptionInited = true; + onInit(); + } + ); + } else { + subscriptionInited = true; + onInit(); + } } function handleWidgetException(e) { @@ -418,7 +489,9 @@ export default function WidgetController($scope, $timeout, $window, $element, $q } function onInit() { - if (!widgetContext.inited) { + if (!widgetContext.inited && + subscriptionInited && + gridsterItemInited) { widgetContext.inited = true; try { widgetTypeInstance.onInit(); @@ -462,7 +535,7 @@ export default function WidgetController($scope, $timeout, $window, $element, $q handleWidgetException(e); } }); - } else if (gridsterItemInited) { + } else { onInit(); } } @@ -544,6 +617,7 @@ export default function WidgetController($scope, $timeout, $window, $element, $q var subscription = widgetContext.subscriptions[id]; subscription.destroy(); } + subscriptionInited = false; widgetContext.subscriptions = []; if (widgetContext.inited) { widgetContext.inited = false; diff --git a/ui/src/app/dashboard/add-widget.controller.js b/ui/src/app/dashboard/add-widget.controller.js index 2f23cf9f38..586fb46fc4 100644 --- a/ui/src/app/dashboard/add-widget.controller.js +++ b/ui/src/app/dashboard/add-widget.controller.js @@ -20,12 +20,13 @@ import entityAliasesTemplate from '../entity/entity-aliases.tpl.html'; /* eslint-enable import/no-unresolved, import/default */ /*@ngInject*/ -export default function AddWidgetController($scope, widgetService, entityService, $mdDialog, $q, $document, types, dashboard, aliasesInfo, widget, widgetInfo) { +export default function AddWidgetController($scope, widgetService, entityService, $mdDialog, $q, $document, types, dashboard, + aliasController, widget, widgetInfo) { var vm = this; vm.dashboard = dashboard; - vm.aliasesInfo = aliasesInfo; + vm.aliasController = aliasController; vm.widget = widget; vm.widgetInfo = widgetInfo; @@ -85,7 +86,7 @@ export default function AddWidgetController($scope, widgetService, entityService } function cancel () { - $mdDialog.cancel({aliasesInfo: vm.aliasesInfo}); + $mdDialog.cancel(); } function add () { @@ -94,23 +95,39 @@ export default function AddWidgetController($scope, widgetService, entityService vm.widget.config = vm.widgetConfig.config; vm.widget.config.mobileOrder = vm.widgetConfig.layout.mobileOrder; vm.widget.config.mobileHeight = vm.widgetConfig.layout.mobileHeight; - $mdDialog.hide({widget: vm.widget, aliasesInfo: vm.aliasesInfo}); + $mdDialog.hide({widget: vm.widget}); } } function fetchEntityKeys (entityAliasId, query, type) { - var entityAlias = vm.aliasesInfo.entityAliases[entityAliasId]; - if (entityAlias && entityAlias.entityId) { - return entityService.getEntityKeys(entityAlias.entityType, entityAlias.entityId, query, type); - } else { - return $q.when([]); - } + var deferred = $q.defer(); + vm.aliasController.getAliasInfo(entityAliasId).then( + function success(aliasInfo) { + var entity = aliasInfo.currentEntity; + if (entity) { + entityService.getEntityKeys(entity.entityType, entity.id, query, type).then( + function success(keys) { + deferred.resolve(keys); + }, + function fail() { + deferred.resolve([]); + } + ); + } else { + deferred.resolve([]); + } + }, + function fail() { + deferred.resolve([]); + } + ); + return deferred.promise; } function createEntityAlias (event, alias, allowedEntityTypes) { var deferred = $q.defer(); - var singleEntityAlias = {id: null, alias: alias, entityType: types.entityType.device, entityFilter: null}; + var singleEntityAlias = {id: null, alias: alias, filter: {}}; $mdDialog.show({ controller: 'EntityAliasesController', @@ -130,16 +147,9 @@ export default function AddWidgetController($scope, widgetService, entityService skipHide: true, targetEvent: event }).then(function (singleEntityAlias) { - vm.dashboard.configuration.entityAliases[singleEntityAlias.id] = - { alias: singleEntityAlias.alias, entityType: singleEntityAlias.entityType, entityFilter: singleEntityAlias.entityFilter }; - entityService.processEntityAliases(vm.dashboard.configuration.entityAliases).then( - function(resolution) { - if (!resolution.error) { - vm.aliasesInfo = resolution.aliasesInfo; - } - deferred.resolve(singleEntityAlias); - } - ); + vm.dashboard.configuration.entityAliases[singleEntityAlias.id] = singleEntityAlias; + vm.aliasController.updateEntityAliases(vm.dashboard.configuration.entityAliases); + deferred.resolve(singleEntityAlias); }, function () { deferred.reject(); }); diff --git a/ui/src/app/dashboard/add-widget.tpl.html b/ui/src/app/dashboard/add-widget.tpl.html index 870e20346a..761776057b 100644 --- a/ui/src/app/dashboard/add-widget.tpl.html +++ b/ui/src/app/dashboard/add-widget.tpl.html @@ -37,7 +37,7 @@ ng-model="vm.widgetConfig" widget-settings-schema="vm.settingsSchema" datakey-settings-schema="vm.dataKeySettingsSchema" - entity-aliases="vm.aliasesInfo.entityAliases" + alias-controller="vm.aliasController" functions-only="vm.functionsOnly" fetch-entity-keys="vm.fetchEntityKeys(entityAliasId, query, type)" on-create-entity-alias="vm.createEntityAlias(event, alias, allowedEntityTypes)" diff --git a/ui/src/app/dashboard/dashboard.controller.js b/ui/src/app/dashboard/dashboard.controller.js index 31892a6ce4..195184b4ff 100644 --- a/ui/src/app/dashboard/dashboard.controller.js +++ b/ui/src/app/dashboard/dashboard.controller.js @@ -24,8 +24,10 @@ import selectTargetLayoutTemplate from './layouts/select-target-layout.tpl.html' /* eslint-enable import/no-unresolved, import/default */ +import AliasController from '../api/alias-controller'; + /*@ngInject*/ -export default function DashboardController(types, dashboardUtils, widgetService, userService, +export default function DashboardController(types, utils, dashboardUtils, widgetService, userService, dashboardService, timeService, entityService, itembuffer, importExport, hotkeys, $window, $rootScope, $scope, $element, $state, $stateParams, $mdDialog, $mdMedia, $timeout, $document, $q, $translate, $filter) { @@ -349,7 +351,13 @@ export default function DashboardController(types, dashboardUtils, widgetService dashboardService.getDashboard($stateParams.dashboardId) .then(function success(dashboard) { vm.dashboard = dashboardUtils.validateAndUpdateDashboard(dashboard); - entityService.processEntityAliases(vm.dashboard.configuration.entityAliases) + vm.dashboardConfiguration = vm.dashboard.configuration; + vm.dashboardCtx.dashboard = vm.dashboard; + vm.dashboardCtx.dashboardTimewindow = vm.dashboardConfiguration.timewindow; + vm.dashboardCtx.aliasController = new AliasController($scope, $q, $filter, utils, + types, entityService, vm.dashboardCtx.stateController, vm.dashboardConfiguration.entityAliases); + + /* entityService.processEntityAliases(vm.dashboard.configuration.entityAliases) .then( function(resolution) { if (resolution.error && !isTenantAdmin()) { @@ -362,7 +370,7 @@ export default function DashboardController(types, dashboardUtils, widgetService vm.dashboardCtx.dashboardTimewindow = vm.dashboardConfiguration.timewindow; } } - ); + );*/ }, function fail() { vm.configurationError = true; }); @@ -373,6 +381,7 @@ export default function DashboardController(types, dashboardUtils, widgetService var layoutsData = dashboardUtils.getStateLayoutsData(vm.dashboard, state); if (layoutsData) { vm.dashboardCtx.state = state; + vm.dashboardCtx.aliasController.dashboardStateChanged(); var layoutVisibilityChanged = false; for (var l in vm.layouts) { var layout = vm.layouts[l]; @@ -916,7 +925,7 @@ export default function DashboardController(types, dashboardUtils, widgetService templateUrl: addWidgetTemplate, locals: { dashboard: vm.dashboard, - aliasesInfo: vm.dashboardCtx.aliasesInfo, + aliasController: vm.dashboardCtx.aliasController, widget: newWidget, widgetInfo: widgetTypeInfo }, @@ -930,10 +939,8 @@ export default function DashboardController(types, dashboardUtils, widgetService } }).then(function (result) { var widget = result.widget; - vm.dashboardCtx.aliasesInfo = result.aliasesInfo; addWidget(widget); - }, function (rejection) { - vm.dashboardCtx.aliasesInfo = rejection.aliasesInfo; + }, function () { }); } } @@ -1025,7 +1032,7 @@ export default function DashboardController(types, dashboardUtils, widgetService notifyDashboardUpdated(); } - function showAliasesResolutionError(error) { +/* function showAliasesResolutionError(error) { var alert = $mdDialog.alert() .parent(angular.element($document[0].body)) .clickOutsideToClose(true) @@ -1037,20 +1044,10 @@ export default function DashboardController(types, dashboardUtils, widgetService alert._options.fullscreen = true; $mdDialog.show(alert); - } + }*/ function entityAliasesUpdated() { - var deferred = $q.defer(); - entityService.processEntityAliases(vm.dashboard.configuration.entityAliases) - .then( - function(resolution) { - if (resolution.aliasesInfo) { - vm.dashboardCtx.aliasesInfo = resolution.aliasesInfo; - } - deferred.resolve(); - } - ); - return deferred.promise; + vm.dashboardCtx.aliasController.updateEntityAliases(vm.dashboard.configuration.entityAliases); } function notifyDashboardUpdated() { diff --git a/ui/src/app/dashboard/dashboard.tpl.html b/ui/src/app/dashboard/dashboard.tpl.html index 8338612484..202268fa5e 100644 --- a/ui/src/app/dashboard/dashboard.tpl.html +++ b/ui/src/app/dashboard/dashboard.tpl.html @@ -57,8 +57,7 @@ + alias-controller="vm.dashboardCtx.aliasController"> @@ -179,7 +178,7 @@
diff --git a/ui/src/app/dashboard/edit-widget.directive.js b/ui/src/app/dashboard/edit-widget.directive.js index 7cba4ee6c5..4bd4e3dfff 100644 --- a/ui/src/app/dashboard/edit-widget.directive.js +++ b/ui/src/app/dashboard/edit-widget.directive.js @@ -68,18 +68,34 @@ export default function EditWidgetDirective($compile, $templateCache, types, wid }); scope.fetchEntityKeys = function (entityAliasId, query, type) { - var entityAlias = scope.aliasesInfo.entityAliases[entityAliasId]; - if (entityAlias && entityAlias.entityId) { - return entityService.getEntityKeys(entityAlias.entityType, entityAlias.entityId, query, type); - } else { - return $q.when([]); - } + var deferred = $q.defer(); + scope.aliasController.getAliasInfo(entityAliasId).then( + function success(aliasInfo) { + var entity = aliasInfo.currentEntity; + if (entity) { + entityService.getEntityKeys(entity.entityType, entity.id, query, type).then( + function success(keys) { + deferred.resolve(keys); + }, + function fail() { + deferred.resolve([]); + } + ); + } else { + deferred.resolve([]); + } + }, + function fail() { + deferred.resolve([]); + } + ); + return deferred.promise; }; scope.createEntityAlias = function (event, alias, allowedEntityTypes) { var deferred = $q.defer(); - var singleEntityAlias = {id: null, alias: alias, entityType: types.entityType.device, entityFilter: null}; + var singleEntityAlias = {id: null, alias: alias, filter: {}}; $mdDialog.show({ controller: 'EntityAliasesController', @@ -99,16 +115,9 @@ export default function EditWidgetDirective($compile, $templateCache, types, wid skipHide: true, targetEvent: event }).then(function (singleEntityAlias) { - scope.dashboard.configuration.entityAliases[singleEntityAlias.id] = - { alias: singleEntityAlias.alias, entityType: singleEntityAlias.entityType, entityFilter: singleEntityAlias.entityFilter }; - entityService.processEntityAliases(scope.dashboard.configuration.entityAliases).then( - function(resolution) { - if (!resolution.error) { - scope.aliasesInfo = resolution.aliasesInfo; - } - deferred.resolve(singleEntityAlias); - } - ); + scope.dashboard.configuration.entityAliases[singleEntityAlias.id] = singleEntityAlias; + scope.aliasController.updateEntityAliases(scope.dashboard.configuration.entityAliases); + deferred.resolve(singleEntityAlias); }, function () { deferred.reject(); }); @@ -124,7 +133,7 @@ export default function EditWidgetDirective($compile, $templateCache, types, wid link: linker, scope: { dashboard: '=', - aliasesInfo: '=', + aliasController: '=', widget: '=', widgetLayout: '=', theForm: '=' diff --git a/ui/src/app/dashboard/edit-widget.tpl.html b/ui/src/app/dashboard/edit-widget.tpl.html index 279d3113a8..a9ff0b6d4d 100644 --- a/ui/src/app/dashboard/edit-widget.tpl.html +++ b/ui/src/app/dashboard/edit-widget.tpl.html @@ -21,7 +21,7 @@ is-data-enabled="isDataEnabled" widget-settings-schema="settingsSchema" datakey-settings-schema="dataKeySettingsSchema" - entity-aliases="aliasesInfo.entityAliases" + alias-controller="aliasController" functions-only="functionsOnly" fetch-entity-keys="fetchEntityKeys(entityAliasId, query, type)" on-create-entity-alias="createEntityAlias(event, alias, allowedEntityTypes)" diff --git a/ui/src/app/dashboard/layouts/dashboard-layout.tpl.html b/ui/src/app/dashboard/layouts/dashboard-layout.tpl.html index ea848585bf..4a4b25ea30 100644 --- a/ui/src/app/dashboard/layouts/dashboard-layout.tpl.html +++ b/ui/src/app/dashboard/layouts/dashboard-layout.tpl.html @@ -45,7 +45,7 @@ widget-layouts="vm.layoutCtx.widgetLayouts" columns="vm.layoutCtx.gridSettings.columns" margins="vm.layoutCtx.gridSettings.margins" - aliases-info="vm.dashboardCtx.aliasesInfo" + alias-controller="vm.dashboardCtx.aliasController" state-controller="vm.dashboardCtx.stateController" dashboard-timewindow="vm.dashboardCtx.dashboardTimewindow" is-edit="vm.isEdit" diff --git a/ui/src/app/entity/aliases-entity-select-panel.controller.js b/ui/src/app/entity/aliases-entity-select-panel.controller.js index 4128f948d5..8439269c1e 100644 --- a/ui/src/app/entity/aliases-entity-select-panel.controller.js +++ b/ui/src/app/entity/aliases-entity-select-panel.controller.js @@ -15,17 +15,30 @@ */ /*@ngInject*/ -export default function AliasesEntitySelectPanelController(mdPanelRef, $scope, types, entityAliases, entityAliasesInfo, onEntityAliasesUpdate) { +export default function AliasesEntitySelectPanelController(mdPanelRef, $scope, types, aliasController, onEntityAliasesUpdate) { var vm = this; vm._mdPanelRef = mdPanelRef; - vm.entityAliases = entityAliases; - vm.entityAliasesInfo = entityAliasesInfo; + vm.aliasController = aliasController; vm.onEntityAliasesUpdate = onEntityAliasesUpdate; + vm.entityAliases = {}; + vm.entityAliasesInfo = {}; - $scope.$watch('vm.entityAliases', function () { + vm.currentAliasEntityChanged = currentAliasEntityChanged; + + var allEntityAliases = vm.aliasController.getEntityAliases(); + for (var aliasId in allEntityAliases) { + var aliasInfo = vm.aliasController.getInstantAliasInfo(aliasId); + if (aliasInfo && !aliasInfo.resolveMultiple && aliasInfo.currentEntity) { + vm.entityAliasesInfo[aliasId] = angular.copy(aliasInfo); + } + } + + function currentAliasEntityChanged(aliasId, currentEntity) { + vm.aliasController.updateCurrentAliasEntity(aliasId, currentEntity); if (onEntityAliasesUpdate) { - onEntityAliasesUpdate(vm.entityAliases); + onEntityAliasesUpdate(); } - }, true); + } + } diff --git a/ui/src/app/entity/aliases-entity-select-panel.tpl.html b/ui/src/app/entity/aliases-entity-select-panel.tpl.html index d9c5f2ff11..edc8e5ade9 100644 --- a/ui/src/app/entity/aliases-entity-select-panel.tpl.html +++ b/ui/src/app/entity/aliases-entity-select-panel.tpl.html @@ -18,12 +18,12 @@
-
+
- - - - {{entityInfo.name}} + + + + {{resolvedEntity.name}} diff --git a/ui/src/app/entity/aliases-entity-select.directive.js b/ui/src/app/entity/aliases-entity-select.directive.js index 7512409f12..7e174ef0d7 100644 --- a/ui/src/app/entity/aliases-entity-select.directive.js +++ b/ui/src/app/entity/aliases-entity-select.directive.js @@ -29,7 +29,7 @@ import aliasesEntitySelectPanelTemplate from './aliases-entity-select-panel.tpl. /*@ngInject*/ export default function AliasesEntitySelectDirective($compile, $templateCache, $mdMedia, types, $mdPanel, $document, $translate) { - var linker = function (scope, element, attrs, ngModelCtrl) { + var linker = function (scope, element, attrs) { /* tbAliasesEntitySelect (ng-model) * { @@ -81,10 +81,8 @@ export default function AliasesEntitySelectDirective($compile, $templateCache, $ position: position, fullscreen: false, locals: { - 'entityAliases': angular.copy(scope.model), - 'entityAliasesInfo': scope.entityAliasesInfo, - 'onEntityAliasesUpdate': function (entityAliases) { - scope.model = entityAliases; + 'aliasController': scope.aliasController, + 'onEntityAliasesUpdate': function () { scope.updateView(); } }, @@ -97,40 +95,31 @@ export default function AliasesEntitySelectDirective($compile, $templateCache, $ } scope.updateView = function () { - var value = angular.copy(scope.model); - ngModelCtrl.$setViewValue(value); updateDisplayValue(); } - ngModelCtrl.$render = function () { - if (ngModelCtrl.$viewValue) { - var value = ngModelCtrl.$viewValue; - scope.model = angular.copy(value); - updateDisplayValue(); - } - } - function updateDisplayValue() { var displayValue; var singleValue = true; var currentAliasId; - for (var aliasId in scope.model) { - if (!currentAliasId) { - currentAliasId = aliasId; - } else { - singleValue = false; - break; + var entityAliases = scope.aliasController.getEntityAliases(); + for (var aliasId in entityAliases) { + var entityAlias = entityAliases[aliasId]; + if (!entityAlias.filter.resolveMultiple) { + var resolvedAlias = scope.aliasController.getInstantAliasInfo(aliasId); + if (resolvedAlias && resolvedAlias.currentEntity) { + if (!currentAliasId) { + currentAliasId = aliasId; + } else { + singleValue = false; + break; + } + } } } if (singleValue && currentAliasId) { - var entityId = scope.model[currentAliasId].entityId; - var entitiesInfo = scope.entityAliasesInfo[currentAliasId]; - for (var i=0;i
- - - +
- entity.alias - entity.type - entity.entities + entity.alias + alias.entity-filter
@@ -53,23 +48,17 @@
{{$index + 1}}.
- +
entity.alias-required
-
- - -
-
+
+ allowed-entity-types="vm.allowedEntityTypes" + ng-model="entityAlias.filter" + on-matching-entity-change="vm.onFilterEntityChanged(entity, stateEntity, entityAlias)">
+ + + +
+

{{ (vm.isAdd ? 'alias.create-entity-filter' : 'alias.edit-entity-filter') | translate }}

+ + + + +
+
+ + + +
+
+
+ + + + + {{type.name | translate}} + + +
+
alias.filter-type-required
+
+
+
+ {{ 'alias.use-state-entity' | translate }} + + + + + +
+
+ + + + + +
+
entity.entity-name-filter-required
+
+ +
+
+ +
+
+
+
+ + + + {{ 'action.save' | translate }} + + {{ 'action.cancel' | translate }} + + +
\ No newline at end of file diff --git a/ui/src/app/entity/entity-filter.directive.js b/ui/src/app/entity/entity-filter.directive.js index b1d92c6cc2..beded8a162 100644 --- a/ui/src/app/entity/entity-filter.directive.js +++ b/ui/src/app/entity/entity-filter.directive.js @@ -17,13 +17,16 @@ /* eslint-disable import/no-unresolved, import/default */ import entityFilterTemplate from './entity-filter.tpl.html'; +import entityFilterDialogTemplate from './entity-filter-dialog.tpl.html'; /* eslint-enable import/no-unresolved, import/default */ +import EntityFilterDialogController from './entity-filter-dialog.controller'; + import './entity-filter.scss'; /*@ngInject*/ -export default function EntityFilterDirective($compile, $templateCache, $q, entityService) { +export default function EntityFilterDirective($compile, $templateCache, $q, $document, $mdDialog, types) { var linker = function (scope, element, attrs, ngModelCtrl) { @@ -31,8 +34,9 @@ export default function EntityFilterDirective($compile, $templateCache, $q, enti element.html(template); scope.ngModelCtrl = ngModelCtrl; + scope.types = types; - scope.fetchEntities = function(searchText, limit) { + /* scope.fetchEntities = function(searchText, limit) { var deferred = $q.defer(); entityService.getEntitiesByNameFilter(scope.entityType, searchText, limit).then(function success(result) { if (result) { @@ -44,13 +48,13 @@ export default function EntityFilterDirective($compile, $templateCache, $q, enti deferred.reject(); }); return deferred.promise; - } + }*/ scope.updateValidity = function() { if (ngModelCtrl.$viewValue) { var value = ngModelCtrl.$viewValue; - var valid; - if (value.useFilter) { + ngModelCtrl.$setValidity('filter', value.type ? true : false); + /*if (value.useFilter) { ngModelCtrl.$setValidity('entityList', true); if (angular.isDefined(value.entityNameFilter) && value.entityNameFilter.length > 0) { ngModelCtrl.$setValidity('entityNameFilter', true); @@ -64,18 +68,22 @@ export default function EntityFilterDirective($compile, $templateCache, $q, enti ngModelCtrl.$setValidity('entityNameFilterDeviceMatch', true); valid = angular.isDefined(value.entityList) && value.entityList.length > 0; ngModelCtrl.$setValidity('entityList', valid); - } + }*/ + } } ngModelCtrl.$render = function () { - destroyWatchers(); - scope.model = { - useFilter: false, - entityList: [], - entityNameFilter: '' - } + //destroyWatchers(); if (ngModelCtrl.$viewValue) { + scope.model = angular.copy(ngModelCtrl.$viewValue); + } else { + scope.model = { + type: null, + resolveMultiple: false + } + } + /* if (ngModelCtrl.$viewValue) { var value = ngModelCtrl.$viewValue; var model = scope.model; model.useFilter = value.useFilter === true ? true: false; @@ -96,10 +104,52 @@ export default function EntityFilterDirective($compile, $templateCache, $q, enti } } ) + }*/ + } + + scope.$watch('model.resolveMultiple', function () { + if (ngModelCtrl.$viewValue) { + var value = ngModelCtrl.$viewValue; + value.resolveMultiple = scope.model.resolveMultiple; + ngModelCtrl.$setViewValue(value); + scope.updateValidity(); } + }); + + scope.editFilter = function($event) { + openEntityFilterDialog($event, false); + } + + scope.createFilter = function($event) { + openEntityFilterDialog($event, true); } - function updateMatchingEntity() { + function openEntityFilterDialog($event, isAdd) { + $mdDialog.show({ + controller: EntityFilterDialogController, + controllerAs: 'vm', + templateUrl: entityFilterDialogTemplate, + locals: { + isAdd: isAdd, + allowedEntityTypes: scope.allowedEntityTypes, + filter: angular.copy(scope.model) + }, + parent: angular.element($document[0].body), + fullscreen: true, + skipHide: true, + targetEvent: $event + }).then(function (result) { + scope.model = result.filter; + ngModelCtrl.$setViewValue(result.filter); + scope.updateValidity(); + if (scope.onMatchingEntityChange) { + scope.onMatchingEntityChange({entity: result.entity, stateEntity: result.stateEntity}); + } + }, function () { + }); + } + + /* function updateMatchingEntity() { if (scope.model.useFilter) { scope.model.matchingEntity = scope.model.matchingFilterEntity; } else { @@ -206,7 +256,7 @@ export default function EntityFilterDirective($compile, $templateCache, $q, enti } } }); - } + }*/ $compile(element.contents())(scope); @@ -217,8 +267,7 @@ export default function EntityFilterDirective($compile, $templateCache, $q, enti require: "^ngModel", link: linker, scope: { - entityType: '=', - isEdit: '=', + allowedEntityTypes: '=?', onMatchingEntityChange: '&' } }; diff --git a/ui/src/app/entity/entity-filter.tpl.html b/ui/src/app/entity/entity-filter.tpl.html index 7e49ba943f..9a5337a7a8 100644 --- a/ui/src/app/entity/entity-filter.tpl.html +++ b/ui/src/app/entity/entity-filter.tpl.html @@ -17,7 +17,7 @@ -->
-
+ +
+
{{ types.aliasFilterType[model.type].name | translate }}
+ + + {{ 'alias.edit-entity-filter' | translate }} + + + edit + + +
+ + + add + + {{ 'alias.create-entity-filter' | translate }} + +
- - + +
\ No newline at end of file diff --git a/ui/src/app/entity/entity-list.directive.js b/ui/src/app/entity/entity-list.directive.js new file mode 100644 index 0000000000..0863153046 --- /dev/null +++ b/ui/src/app/entity/entity-list.directive.js @@ -0,0 +1,130 @@ +/* + * Copyright © 2016-2017 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* eslint-disable import/no-unresolved, import/default */ + +import entityListTemplate from './entity-list.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + +import './entity-list.scss'; + +/*@ngInject*/ +export default function EntityListDirective($compile, $templateCache, $q, $mdUtil, entityService) { + + var linker = function (scope, element, attrs, ngModelCtrl) { + + var template = $templateCache.get(entityListTemplate); + element.html(template); + + scope.ngModelCtrl = ngModelCtrl; + + scope.$watch('tbRequired', function () { + scope.updateValidity(); + }); + + scope.fetchEntities = function(searchText, limit) { + var deferred = $q.defer(); + entityService.getEntitiesByNameFilter(scope.entityType, searchText, limit).then( + function success(result) { + if (result) { + deferred.resolve(result); + } else { + deferred.resolve([]); + } + }, + function fail() { + deferred.reject(); + } + ); + return deferred.promise; + } + + scope.updateValidity = function() { + var value = ngModelCtrl.$viewValue; + var valid = !scope.tbRequired || value && value.length > 0; + ngModelCtrl.$setValidity('entityList', valid); + } + + ngModelCtrl.$render = function () { + destroyWatchers(); + var value = ngModelCtrl.$viewValue; + scope.entityList = []; + if (value && value.length > 0) { + entityService.getEntities(scope.entityType, value).then(function (entities) { + scope.entityList = entities; + initWatchers(); + }); + } else { + initWatchers(); + } + } + + function initWatchers() { + scope.entityTypeDeregistration = scope.$watch('entityType', function (newEntityType, prevEntityType) { + if (!angular.equals(newEntityType, prevEntityType)) { + scope.entityList = []; + } + }); + scope.entityListDeregistration = scope.$watch('entityList', function () { + var ids = []; + if (scope.entityList && scope.entityList.length > 0) { + for (var i=0;i + + + + {{item.name}} + + + entity.no-entities-matching + + + + + {{$chip.name}} + + + + +
\ No newline at end of file diff --git a/ui/src/app/entity/index.js b/ui/src/app/entity/index.js index e8cc43797d..6be118f8ad 100644 --- a/ui/src/app/entity/index.js +++ b/ui/src/app/entity/index.js @@ -19,6 +19,7 @@ import EntityTypeSelectDirective from './entity-type-select.directive'; import EntitySubtypeSelectDirective from './entity-subtype-select.directive'; import EntitySubtypeAutocompleteDirective from './entity-subtype-autocomplete.directive'; import EntityAutocompleteDirective from './entity-autocomplete.directive'; +import EntityListDirective from './entity-list.directive'; import EntitySelectDirective from './entity-select.directive'; import EntityFilterDirective from './entity-filter.directive'; import AliasesEntitySelectPanelController from './aliases-entity-select-panel.controller'; @@ -38,6 +39,7 @@ export default angular.module('thingsboard.entity', []) .directive('tbEntitySubtypeSelect', EntitySubtypeSelectDirective) .directive('tbEntitySubtypeAutocomplete', EntitySubtypeAutocompleteDirective) .directive('tbEntityAutocomplete', EntityAutocompleteDirective) + .directive('tbEntityList', EntityListDirective) .directive('tbEntitySelect', EntitySelectDirective) .directive('tbEntityFilter', EntityFilterDirective) .directive('tbAliasesEntitySelect', AliasesEntitySelectDirective) diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index fcde13c9a4..a23845eb1c 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -112,6 +112,25 @@ export default angular.module('thingsboard.locale', []) "no-alarms-matching": "No alarms matching '{{entity}}' were found.", "alarm-required": "Alarm is required" }, + "alias": { + "filter-type-entity-list": "Entity list", + "filter-type-entity-name": "Entity name", + "filter-type-asset-type": "Asset type", + "filter-type-device-type": "Device type", + "filter-type-relations-query": "Relations query", + "filter-type-asset-search-query": "Asset search query", + "filter-type-device-search-query": "Device search query", + "entity-filter": "Entity filter", + "create-entity-filter": "Create entity filter", + "edit-entity-filter": "Edit entity filter", + "entity-filter-required": "Entity filter is required.", + "resolve-multiple": "Multiple", + "filter-type": "Filter type", + "filter-type-required": "Filter type is required.", + "use-state-entity": "Use state entity", + "state-entity": "State entity", + "entity-filter-no-entity-matched": "No entities matching specified filter were found.", + }, "asset": { "asset": "Asset", "assets": "Assets", diff --git a/ui/src/app/services/item-buffer.service.js b/ui/src/app/services/item-buffer.service.js index afb63bf049..3aa48097fe 100644 --- a/ui/src/app/services/item-buffer.service.js +++ b/ui/src/app/services/item-buffer.service.js @@ -264,14 +264,9 @@ function ItemBuffer($q, bufferStore, types, utils, dashboardUtils) { } dashboardUtils.addWidgetToLayout(theDashboard, targetState, targetLayout, widget, originalColumns, originalSize, row, column); if (callAliasUpdateFunction) { - onAliasesUpdateFunction().then( - function() { - deferred.resolve(theDashboard); - } - ); - } else { - deferred.resolve(theDashboard); + onAliasesUpdateFunction(); } + deferred.resolve(theDashboard); return deferred.promise; }