dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated 'validateEntityId' logic

Browse Source
This commit is contained in:
Kalutka Zhenya 2021-05-21 18:14:19 +03:00
parent 596b8cc647
commit ae7897366d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/core/utils.ts
View File

@ -438,6 +438,6 @@ export function generateSecret(length?: number): string {
return str.concat(generateSecret(length - str.length)); return str.concat(generateSecret(length - str.length));
} }
export function validateEntityId(entityId: EntityId): boolean { export function validateEntityId(entityId: EntityId | null): boolean {
return isDefinedAndNotNull(entityId.id) && entityId.id !== NULL_UUID && isDefinedAndNotNull(entityId.entityType); return isDefinedAndNotNull(entityId?.id) && entityId.id !== NULL_UUID && isDefinedAndNotNull(entityId?.entityType);
} }

2
ui-ngx/src/app/modules/home/components/widget/widget.component.ts
View File

@ -1015,7 +1015,7 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
const type = descriptor.type; const type = descriptor.type;
const targetEntityParamName = descriptor.stateEntityParamName; const targetEntityParamName = descriptor.stateEntityParamName;
let targetEntityId: EntityId; let targetEntityId: EntityId;
if (this.widgetInfo.type !== 'static' && descriptor.setEntityId && validateEntityId(entityId)) { if (descriptor.setEntityId && validateEntityId(entityId)) {
targetEntityId = entityId; targetEntityId = entityId;
} }
switch (type) { switch (type) {