From b4251f1411adc744bc50783a68d87768aa745433 Mon Sep 17 00:00:00 2001 From: Maksym Dudnik Date: Tue, 19 Sep 2023 10:13:50 +0300 Subject: [PATCH 1/4] Minor fixes --- .../widget/lib/gateway/gateway-connectors.component.ts | 3 ++- .../components/widget/lib/gateway/gateway-widget.models.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts index e1688357f5..3951ac83da 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts @@ -486,6 +486,7 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie const connectorName = attribute.key; const connector = this.subscription && this.subscription.data .find(data => data && data.dataKey.name === `${connectorName}_ERRORS_COUNT`); - return (connector && this.activeConnectors.includes(connectorName)) ? connector.data[0][1] : 'Inactive'; + console.log(connector) + return (connector && this.activeConnectors.includes(connectorName)) ? (connector.data[0][1] || 0) : 'Inactive'; } } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts index c08ee7dc89..d58c33079a 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts @@ -124,7 +124,7 @@ export const GatewayConnectorDefaultTypesTranslates = new Map([ ['ftp', 'FTP'], ['socket', 'SOCKET'], ['xmpp', 'XMPP'], - ['ocpp', 'OCCP'], + ['ocpp', 'OCPP'], ['custom', 'CUSTOM'] ]); From 84ba0dffc8f7364366ebdd95f997d400cbf14e6b Mon Sep 17 00:00:00 2001 From: Maksym Dudnik Date: Tue, 19 Sep 2023 10:15:05 +0300 Subject: [PATCH 2/4] Minor fixes --- .../widget/lib/gateway/gateway-connectors.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts index 3951ac83da..ec130600ac 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts @@ -486,7 +486,6 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie const connectorName = attribute.key; const connector = this.subscription && this.subscription.data .find(data => data && data.dataKey.name === `${connectorName}_ERRORS_COUNT`); - console.log(connector) return (connector && this.activeConnectors.includes(connectorName)) ? (connector.data[0][1] || 0) : 'Inactive'; } } From 961984bab17884cea226cd2785cae4188b169a99 Mon Sep 17 00:00:00 2001 From: Maksym Dudnik Date: Tue, 19 Sep 2023 13:20:40 +0300 Subject: [PATCH 3/4] Minor fixes --- ui-ngx/src/assets/locale/locale.constant-en_US.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 76c30d46ae..bf9c0118ea 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -2855,6 +2855,7 @@ "password": "MQTT password for the gateway form ThingsBoard server", "ca-cert": "Path to CA certificate file", "date-form": "Date format in log message", + "data-folder": "Path to folder, that will contains data (Relative or Absolute)", "log-format": "Log message format", "remote-log": "Enables remote logging and logs reading from the gateway", "backup-count": "If backup count is > 0, when a rollover is done, no more than backup count files are kept - the oldest ones are deleted", From 624f1021bce566a67f71c9803bc1f2adad8e1563 Mon Sep 17 00:00:00 2001 From: Maksym Dudnik Date: Tue, 19 Sep 2023 16:51:19 +0300 Subject: [PATCH 4/4] Minor fixes --- .../lib/gateway/gateway-configuration.component.html | 8 ++++++++ .../lib/gateway/gateway-configuration.component.scss | 10 ++++++++++ .../lib/gateway/gateway-configuration.component.ts | 8 ++++---- ui-ngx/src/assets/locale/locale.constant-en_US.json | 2 ++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html index 9b0b8837e2..b5b995e4d8 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html @@ -632,6 +632,10 @@ *ngIf="gatewayConfigGroup.get('thingsboard.checkingDeviceActivity.inactivityTimeoutSeconds').hasError('min')"> {{ 'gateway.inactivity-timeout-seconds-min' | translate }} + + {{ 'gateway.inactivity-timeout-seconds-pattern' | translate }} + info_outlined @@ -647,6 +651,10 @@ *ngIf="gatewayConfigGroup.get('thingsboard.checkingDeviceActivity.inactivityCheckPeriodSeconds').hasError('min')"> {{ 'gateway.inactivity-check-period-seconds-min' | translate }} + + {{ 'gateway.inactivity-check-period-seconds-pattern' | translate }} + info_outlined diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.scss index 23d725bcbf..ad4e6cea00 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.scss @@ -70,6 +70,16 @@ justify-content: flex-end; flex: 1; } + + mat-form-field { + mat-error { + display: none !important; + } + + mat-error:first-child { + display: block !important; + } + } } :host ::ng-deep { diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts index ed64c96799..c4e1257e64 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts @@ -108,8 +108,8 @@ export class GatewayConfigurationComponent implements OnInit { handleDeviceRenaming: [true, []], checkingDeviceActivity: this.fb.group({ checkDeviceInactivity: [false, []], - inactivityTimeoutSeconds: [200, [Validators.min(1), Validators.pattern(/^[^.\s]+$/)]], - inactivityCheckPeriodSeconds: [500, [Validators.min(1), Validators.pattern(/^[^.\s]+$/)]] + inactivityTimeoutSeconds: [200, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], + inactivityCheckPeriodSeconds: [500, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]] }), security: this.fb.group({ type: [SecurityTypes.ACCESS_TOKEN, [Validators.required]], @@ -187,8 +187,8 @@ export class GatewayConfigurationComponent implements OnInit { checkingDeviceActivityGroup.get('checkDeviceInactivity').valueChanges.subscribe(enabled => { checkingDeviceActivityGroup.updateValueAndValidity(); if (enabled) { - checkingDeviceActivityGroup.get('inactivityTimeoutSeconds').setValidators([Validators.min(1), Validators.required]); - checkingDeviceActivityGroup.get('inactivityCheckPeriodSeconds').setValidators([Validators.min(1), Validators.required]); + checkingDeviceActivityGroup.get('inactivityTimeoutSeconds').setValidators([Validators.min(1), Validators.required, Validators.pattern(/^-?[0-9]+$/)]); + checkingDeviceActivityGroup.get('inactivityCheckPeriodSeconds').setValidators([Validators.min(1), Validators.required, Validators.pattern(/^-?[0-9]+$/)]); } else { checkingDeviceActivityGroup.get('inactivityTimeoutSeconds').clearValidators(); checkingDeviceActivityGroup.get('inactivityCheckPeriodSeconds').clearValidators(); diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index bf9c0118ea..dd0e7eece7 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -2703,9 +2703,11 @@ "inactivity-check-period-seconds": "Inactivity check period (in sec)", "inactivity-check-period-seconds-required": "Inactivity check period is required", "inactivity-check-period-seconds-min": "Inactivity check period can not be less then 1", + "inactivity-check-period-seconds-pattern": "Inactivity check period is not valid", "inactivity-timeout-seconds": "Inactivity timeout (in sec)", "inactivity-timeout-seconds-required": "Inactivity timeout is required", "inactivity-timeout-seconds-min": "Inactivity timeout can not be less then 1", + "inactivity-timeout-seconds-pattern": "Inactivity timeout is not valid", "json-parse": "Not valid JSON.", "json-required": "Field cannot be empty.", "logs": {