Commit e02d4196f0af7cc457e4c43423cfa977cc7e110a

Authored by Vladyslav_Prykhodko
1 parent 73c4f51e

UI: added validation qr code text

@@ -29,7 +29,7 @@ import { @@ -29,7 +29,7 @@ import {
29 import { FormattedData } from '@home/components/widget/lib/maps/map-models'; 29 import { FormattedData } from '@home/components/widget/lib/maps/map-models';
30 import { DatasourceData } from '@shared/models/widget.models'; 30 import { DatasourceData } from '@shared/models/widget.models';
31 import { DataKeyType } from '@shared/models/telemetry/telemetry.models'; 31 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
32 -import { isString } from '@core/utils'; 32 +import { isNumber, isObject } from '@core/utils';
33 33
34 interface QrCodeWidgetSettings { 34 interface QrCodeWidgetSettings {
35 qrCodeTextPattern: string; 35 qrCodeTextPattern: string;
@@ -110,12 +110,11 @@ export class QrCodeWidgetComponent extends PageComponent implements OnInit, Afte @@ -110,12 +110,11 @@ export class QrCodeWidgetComponent extends PageComponent implements OnInit, Afte
110 private updateQrCodeText(newQrCodeText: string): void { 110 private updateQrCodeText(newQrCodeText: string): void {
111 if (this.qrCodeText !== newQrCodeText) { 111 if (this.qrCodeText !== newQrCodeText) {
112 this.qrCodeText = newQrCodeText; 112 this.qrCodeText = newQrCodeText;
113 - if (isString(newQrCodeText)) { 113 + if (!(isObject(newQrCodeText) || isNumber(newQrCodeText))) {
114 this.invalidQrCodeText = false; 114 this.invalidQrCodeText = false;
115 if (this.qrCodeText) { 115 if (this.qrCodeText) {
116 this.updateCanvas(); 116 this.updateCanvas();
117 } 117 }
118 - this.cd.detectChanges();  
119 } else { 118 } else {
120 this.invalidQrCodeText = true; 119 this.invalidQrCodeText = true;
121 } 120 }