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

Merge pull request #5373 from ArtemDzhereleiko/bug-fix/photo-camera-input/empty-datasource

Browse Source 
[3.3.2] UI: Fixed Photo Camera input widget has error if entity is empty
This commit is contained in:
Igor Kulikov 2021-10-21 15:47:20 +03:00 committed by GitHub
commit fa98ac0f84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui-ngx/src/app/modules/home/components/widget/lib/photo-camera-input.component.ts
View File

@ -117,6 +117,7 @@ export class PhotoCameraInputWidgetComponent extends PageComponent implements On
updatePhoto = false; updatePhoto = false;
previewPhoto: SafeUrl; previewPhoto: SafeUrl;
lastPhoto: SafeUrl; lastPhoto: SafeUrl;
datasourceDetected = false;
private static hasGetUserMedia(): boolean { private static hasGetUserMedia(): boolean {
return !!(window.navigator.mediaDevices && window.navigator.mediaDevices.getUserMedia); return !!(window.navigator.mediaDevices && window.navigator.mediaDevices.getUserMedia);
@ -148,14 +149,16 @@ export class PhotoCameraInputWidgetComponent extends PageComponent implements On
this.width = this.settings.maxWidth ? this.settings.maxWidth : 640; this.width = this.settings.maxWidth ? this.settings.maxWidth : 640;
this.height = this.settings.maxHeight ? this.settings.maxWidth : 480; this.height = this.settings.maxHeight ? this.settings.maxWidth : 480;
this.datasourceDetected = this.ctx.datasources?.length !== 0;
if (this.datasource.type === DatasourceType.entity) { if (this.datasourceDetected) {
if (this.datasource.entityType && this.datasource.entityId) { if (this.datasource.type === DatasourceType.entity) {
this.isEntityDetected = true; if (this.datasource.entityType && this.datasource.entityId) {
this.isEntityDetected = true;
}
}
if (this.datasource.dataKeys.length) {
this.dataKeyDetected = true;
} }
}
if (this.datasource.dataKeys.length) {
this.dataKeyDetected = true;
} }
this.detectAvailableDevices(); this.detectAvailableDevices();
} }