Commit ae7897366d7d88629069cf40eefef314478b766f

Authored by Kalutka Zhenya
1 parent 596b8cc6

Updated 'validateEntityId' logic

@@ -438,6 +438,6 @@ export function generateSecret(length?: number): string { @@ -438,6 +438,6 @@ export function generateSecret(length?: number): string {
438 return str.concat(generateSecret(length - str.length)); 438 return str.concat(generateSecret(length - str.length));
439 } 439 }
440 440
441 -export function validateEntityId(entityId: EntityId): boolean {  
442 - return isDefinedAndNotNull(entityId.id) && entityId.id !== NULL_UUID && isDefinedAndNotNull(entityId.entityType); 441 +export function validateEntityId(entityId: EntityId | null): boolean {
  442 + return isDefinedAndNotNull(entityId?.id) && entityId.id !== NULL_UUID && isDefinedAndNotNull(entityId?.entityType);
443 } 443 }
@@ -1015,7 +1015,7 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI @@ -1015,7 +1015,7 @@ export class WidgetComponent extends PageComponent implements OnInit, AfterViewI
1015 const type = descriptor.type; 1015 const type = descriptor.type;
1016 const targetEntityParamName = descriptor.stateEntityParamName; 1016 const targetEntityParamName = descriptor.stateEntityParamName;
1017 let targetEntityId: EntityId; 1017 let targetEntityId: EntityId;
1018 - if (this.widgetInfo.type !== 'static' && descriptor.setEntityId && validateEntityId(entityId)) { 1018 + if (descriptor.setEntityId && validateEntityId(entityId)) {
1019 targetEntityId = entityId; 1019 targetEntityId = entityId;
1020 } 1020 }
1021 switch (type) { 1021 switch (type) {