{{ windowsCode }}{
+ this.deviceService.getDeviceCredentials(this.deviceId).subscribe(credentials => {
this.token = credentials.credentialsId;
this.createRunCode(HOST);
- })
+ });
}
- this.selectedOSControll = new FormControl('');
+ this.selectedOSCControl = new FormControl('');
// @ts-ignore
const platform = window.navigator?.userAgentData?.platform || window.navigator.platform,
macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'],
windowsPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE'];
if (macosPlatforms.indexOf(platform) !== -1) {
- this.selectedOSControll.setValue(OsType.macos);
+ this.selectedOSCControl.setValue(OsType.linux);
} else if (windowsPlatforms.indexOf(platform) !== -1) {
- this.selectedOSControll.setValue(OsType.windows);
+ this.selectedOSCControl.setValue(OsType.windows);
} else if (/Linux/.test(platform)) {
- this.selectedOSControll.setValue(OsType.linux);
+ this.selectedOSCControl.setValue(OsType.linux);
}
this.createRunCode(HOST);
}
createRunCode(HOST) {
- this.linuxCode = "docker run -it -v ~/.tb-gateway/logs:/thingsboard_gateway/logs -v " +
- "~/.tb-gateway/extensions:/thingsboard_gateway/extensions -v ~/.tb-gateway/config:/thingsboard_gateway/config --name tb-gateway -e host=" +
+ this.linuxCode = 'docker run -it -v ~/.tb-gateway/logs:/thingsboard_gateway/logs -v ' +
+ '~/.tb-gateway/extensions:/thingsboard_gateway/extensions -v ~/.tb-gateway/config:/thingsboard_gateway/config --name tb-gateway -e host=' +
HOST +
- " -e port=1883 -e accessToken=" +
+ ' -e port=1883 -e accessToken=' +
this.token +
- " --restart always thingsboard/tb-gateway";
- this.windowsCode = "docker run -it -v %HOMEPATH%/tb-gateway/config:/thingsboard_gateway/config -v " +
- "%HOMEPATH%/tb-gateway/extensions:/thingsboard_gateway/extensions -v %HOMEPATH%/tb-gateway/logs:/thingsboard_gateway/logs " +
- "--name tb-gateway -e host=" +
+ ' --restart always thingsboard/tb-gateway';
+ this.windowsCode = 'docker run -it -v %HOMEPATH%/tb-gateway/config:/thingsboard_gateway/config -v ' +
+ '%HOMEPATH%/tb-gateway/extensions:/thingsboard_gateway/extensions -v %HOMEPATH%/tb-gateway/logs:/thingsboard_gateway/logs ' +
+ '--name tb-gateway -e host=' +
HOST +
- " -e port=1883 -e accessToken=" +
+ ' -e port=1883 -e accessToken=' +
this.token +
- " --restart always thingsboard/tb-gateway";
- }
-
- goToDocumentationPage() {
- window.open(this.helpLink, '_blank');
+ ' --restart always thingsboard/tb-gateway';
}
onDockerCodeCopied() {
diff --git a/ui-ngx/src/app/shared/components/device/gateway-configuration.component.html b/ui-ngx/src/app/shared/components/device/gateway-configuration.component.html
new file mode 100644
index 0000000000..fb38c63a90
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/device/gateway-configuration.component.html
@@ -0,0 +1,789 @@
+
+
diff --git a/ui-ngx/src/app/shared/components/device/gateway-configuration.component.scss b/ui-ngx/src/app/shared/components/device/gateway-configuration.component.scss
new file mode 100644
index 0000000000..7d3f357589
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/device/gateway-configuration.component.scss
@@ -0,0 +1,201 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+:host {
+ width: 100%;
+ height: 100%;
+ display: block;
+
+ .mat-icon {
+ color: rgba(0, 0, 0, .12);
+ }
+
+ .mat-toolbar {
+ background: transparent;
+ color: rgba(0, 0, 0, .87) !important;
+ }
+
+ .mat-content {
+ .expansion-panel-header {
+ font-weight: 600;
+ color: rgba(0, 0, 0, .87) !important;
+ }
+
+ mat-slide-toggle {
+ margin-bottom: 16px;
+ }
+
+ mat-form-field {
+ margin-right: 15px;
+ }
+
+ .block-title {
+ font-size: 20px;
+ font-weight: 400;
+ padding-top: 16px;
+ }
+
+ .hover-cursor {
+ cursor: pointer;
+ }
+ }
+
+ .security-toggle-group {
+ padding-bottom: 0;
+ background: transparent !important;
+ margin-bottom: 15px;
+ border: none;
+
+ .mat-button-toggle {
+ border-radius: 15px;
+ border: 1px solid rgba(0, 0, 0, 0);
+ background: rgba(0, 0, 0, .05);
+ margin: 5px;
+ color: rgba(0, 0, 0, .2);
+ font-weight: 500;
+ }
+
+ .mat-button-toggle-checked {
+ border-radius: 15px;
+ border: 1px solid #305680;
+ background: white;
+ color: #305680;
+ }
+
+ ::ng-deep span {
+ text-transform: capitalize;
+ line-height: 20px;
+ font-size: 13px;
+ padding: 5px 25px;
+ }
+
+ ::ng-deep .mat-button-toggle-ripple {
+ border-radius: 15px;
+ }
+
+ ::ng-deep .mat-button-toggle-appearance-standard:not(.mat-button-toggle-disabled):hover .mat-button-toggle-focus-overlay {
+ opacity: 0 !important;
+ }
+ }
+
+ .logs-label {
+ font-weight: 500;
+ margin-bottom: 10px;
+ }
+
+ .logs-toggle-group {
+ border: none;
+ border-radius: 15px;
+ background: rgba(0, 0, 0, .05);
+ color: rgba(0, 0, 0, .2);
+ font-weight: 500;
+
+ .mat-button-toggle {
+ border: none;
+ background: rgba(0, 0, 0, .0);
+ color: rgba(0, 0, 0, .2);
+ font-weight: 500;
+ }
+
+ .mat-button-toggle-checked {
+ border-radius: 15px;
+ color: white;
+ background: #305680;
+ }
+
+ ::ng-deep span {
+ line-height: 20px;
+ font-size: 13px;
+ padding: 5px 25px;
+ }
+
+ ::ng-deep .mat-button-toggle-ripple {
+ border-radius: 15px;
+ }
+
+ ::ng-deep .mat-button-toggle-appearance-standard:not(.mat-button-toggle-disabled):hover .mat-button-toggle-focus-overlay {
+ opacity: 0 !important;
+ }
+ }
+
+ .statistics-block {
+ margin-bottom: 15px;
+ padding-left: 15px;
+ padding-top: 15px;
+ }
+
+ .first-capital {
+ text-transform: capitalize;
+ }
+
+ ::ng-deep.mat-tab-label-active {
+ color: white;
+ opacity: 1;
+ }
+
+ ::ng-deep.mat-tab-label, ::ng-deep.mat-tab-label-active {
+ min-width: 50px !important;
+ padding: 3px !important;
+ margin: 3px !important;
+ flex-grow: 1;
+ }
+
+ ::ng-deep.mat-ink-bar {
+ height: 100%;
+ z-index: -10;
+ border-radius: 5px;
+ }
+
+ ::ng-deep.pe {
+ pointer-events: all;
+ }
+
+ ::ng-deep.mat-mdc-form-field-icon-suffix {
+ z-index: 100;
+ }
+
+ .suffix-icon {
+ position: relative;
+ transform: translateY(5px);
+ }
+
+ mat-panel-title {
+ display: block;
+ padding-top: 20px;
+ }
+
+ mat-panel-title span {
+ display: block;
+ padding-left: 0;
+ padding-top: 5px;
+ }
+
+ .tb-hint {
+ font-size: 13px;
+ color: rgba(0, 0, 0, .54);
+ width: fit-content;
+ cursor: pointer;
+ text-transform: none!important;
+ }
+
+ .line-break {
+ width: 100%;
+ }
+
+ textarea {
+ resize: none;
+ }
+}
+
diff --git a/ui-ngx/src/app/shared/components/device/gateway-configuration.component.ts b/ui-ngx/src/app/shared/components/device/gateway-configuration.component.ts
new file mode 100644
index 0000000000..541e149311
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/device/gateway-configuration.component.ts
@@ -0,0 +1,589 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+/// http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { Router } from '@angular/router';
+import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { EntityId } from '@shared/models/id/entity-id';
+import { MatDialog, MatDialogRef } from '@angular/material/dialog';
+import { AttributeService } from '@core/http/attribute.service';
+import { AttributeScope } from '@shared/models/telemetry/telemetry.models';
+import {
+ GatewayRemoteConfigurationDialogComponent,
+ GatewayRemoteConfigurationDialogData
+} from '@shared/components/dialog/gateway-remote-configuration-dialog';
+import { DeviceService } from '@core/http/device.service';
+import { of } from 'rxjs';
+import { mergeMap } from 'rxjs/operators';
+import { DeviceCredentialsType } from '@shared/models/device.models';
+
+export enum StorageTypes {
+ MEMORY = 'memory',
+ FILE = 'file',
+ SQLITE = 'sqlite'
+}
+
+export enum GatewayLogLevel {
+ none = 'NONE',
+ critical = 'CRITICAL',
+ error = 'ERROR',
+ warning = 'WARNING',
+ info = 'INFO',
+ debug = 'DEBUG'
+}
+
+export enum LogSavingPeriod {
+ days = 'D',
+ hours = 'H',
+ minutes = 'M',
+ seconds = 'S'
+}
+
+export enum LocalLogsConfigs {
+ service = 'service',
+ connector = 'connector',
+ converter = 'converter',
+ tb_connection = 'tb_connection',
+ storage = 'storage',
+ extension = 'extension'
+}
+
+export const localLogsConfigLabels = new Map([
+ [LocalLogsConfigs.service, 'Service'],
+ [LocalLogsConfigs.connector, 'Connector'],
+ [LocalLogsConfigs.converter, 'Converter'],
+ [LocalLogsConfigs.tb_connection, 'TB Connection'],
+ [LocalLogsConfigs.storage, 'Storage'],
+ [LocalLogsConfigs.extension, 'Extension']
+])
+
+export const logSavingPeriodTranslations = new Map(
+ [
+ [LogSavingPeriod.days, 'gateway.logs.days'],
+ [LogSavingPeriod.hours, 'gateway.logs.hours'],
+ [LogSavingPeriod.minutes, 'gateway.logs.minutes'],
+ [LogSavingPeriod.seconds, 'gateway.logs.seconds']
+ ]
+);
+
+export const storageTypesTranslations = new Map(
+ [
+ [StorageTypes.MEMORY, 'gateway.storage-types.memory-storage'],
+ [StorageTypes.FILE, 'gateway.storage-types.file-storage'],
+ [StorageTypes.SQLITE, 'gateway.storage-types.sqlite']
+ ]
+);
+
+export enum SecurityTypes {
+ ACCESS_TOKEN = 'accessToken',
+ USERNAME_PASSWORD = 'usernamePassword',
+ TLS_ACCESS_TOKEN = 'tlsAccessToken',
+ TLS_PRIVATE_KEY = 'tlsPrivateKey'
+}
+
+export const securityTypesTranslationsMap = new Map(
+ [
+ [SecurityTypes.ACCESS_TOKEN, 'gateway.security-types.access-token'],
+ [SecurityTypes.USERNAME_PASSWORD, 'gateway.security-types.username-password'],
+ [SecurityTypes.TLS_ACCESS_TOKEN, 'gateway.security-types.tls-access-token'],
+ // [SecurityTypes.TLS_PRIVATE_KEY, 'gateway.security-types.tls-private-key'],
+ ]
+);
+
+@Component({
+ selector: 'tb-gateway-configuration',
+ templateUrl: './gateway-configuration.component.html',
+ styleUrls: ['./gateway-configuration.component.scss']
+})
+export class GatewayConfigurationComponent implements OnInit {
+
+ gatewayConfigGroup: FormGroup;
+
+ storageTypes = storageTypesTranslations;
+
+ logSavingPeriods = logSavingPeriodTranslations;
+
+ localLogsConfigLabels = localLogsConfigLabels;
+
+ securityTypes = securityTypesTranslationsMap;
+
+ gatewayLogLevel = Object.values(GatewayLogLevel);
+
+ @Input()
+ device: EntityId;
+
+ @Input()
+ dialogRef: MatDialogRef;
+
+ logSelector: FormControl;
+
+
+ constructor(protected router: Router,
+ protected store: Store,
+ protected fb: FormBuilder,
+ protected attributeService: AttributeService,
+ protected deviceService: DeviceService,
+ private cd: ChangeDetectorRef,
+ public dialog: MatDialog) {
+ }
+
+ ngOnInit() {
+ this.gatewayConfigGroup = this.fb.group({
+ thingsboard: this.fb.group({
+ host: [window.location.hostname, [Validators.required]],
+ port: [1883, [Validators.required, Validators.min(1), Validators.max(65535), Validators.pattern(/^-?[0-9]+$/)]],
+ remoteShell: [false, []],
+ remoteConfiguration: [true, []],
+ checkConnectorsConfigurationInSeconds: [60, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ statistics: this.fb.group({
+ enable: [true, []],
+ statsSendPeriodInSeconds: [3600, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ commands: this.fb.array([], [])
+ }),
+ maxPayloadSizeBytes: [1024, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ minPackSendDelayMS: [200, [Validators.required, Validators.min(0), Validators.pattern(/^-?[0-9]+$/)]],
+ minPackSizeToSend: [500, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ handleDeviceRenaming: [true, []],
+ checkingDeviceActivity: this.fb.group({
+ checkDeviceInactivity: [false, []],
+ inactivityTimeoutSeconds: [200, [Validators.min(1)]],
+ inactivityCheckPeriodSeconds: [500, [Validators.min(1)]]
+ }),
+ security: this.fb.group({
+ type: [SecurityTypes.ACCESS_TOKEN, [Validators.required]],
+ accessToken: [null, [Validators.required]],
+ clientId: [null, []],
+ username: [null, []],
+ password: [null, []],
+ caCert: [null, []],
+ cert: [null, []],
+ privateKey: [null, []],
+ }),
+ qos: [1, [Validators.min(0), Validators.max(1), Validators.required]]
+ }),
+ storage: this.fb.group({
+ type: [StorageTypes.MEMORY, [Validators.required]],
+ read_records_count: [100, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]],
+ max_records_count: [100000, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]],
+ data_folder_path: ['./data/', []],
+ max_file_count: [10, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ max_read_records_count: [10, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ max_records_per_file: [10000, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ data_file_path: ['./data/data.db', []],
+ messages_ttl_check_in_hours: [1, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ messages_ttl_in_days: [7, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+
+ }),
+ grpc: this.fb.group({
+ enabled: [false, []],
+ serverPort: [9595, [Validators.required, Validators.min(1), Validators.max(65535), Validators.pattern(/^-?[0-9]+$/)]],
+ keepAliveTimeMs: [10000, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ keepAliveTimeoutMs: [5000, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ keepalivePermitWithoutCalls: [true, []],
+ maxPingsWithoutData: [0, [Validators.required, Validators.min(0), Validators.pattern(/^-?[0-9]+$/)]],
+ minTimeBetweenPingsMs: [10000, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ minPingIntervalWithoutDataMs: [5000, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ }),
+ connectors: this.fb.array([]),
+ logs: this.fb.group({
+ dateFormat: ['%Y-%m-%d %H:%M:%S', [Validators.required]],
+ logFormat: ['%(asctime)s - |%(levelname)s| - [%(filename)s] - %(module)s - %(funcName)s - %(lineno)d - %(message)s',
+ [Validators.required]],
+ type: ['remote', [Validators.required]],
+ remote: this.fb.group({
+ enabled: [false],
+ logLevel: [GatewayLogLevel.info, [Validators.required]],
+ }),
+ local: this.fb.group({})
+ })
+ });
+
+ this.gatewayConfigGroup.get('thingsboard.remoteConfiguration').valueChanges.subscribe(enabled => {
+ if (!enabled) {
+ this.openConfigurationConfirmDialog();
+ }
+ });
+
+ this.logSelector = this.fb.control(LocalLogsConfigs.service);
+
+ for (const localLogsConfigsKey of Object.keys(LocalLogsConfigs)) {
+ this.addLocalLogConfig(localLogsConfigsKey, {});
+ }
+
+ const checkingDeviceActivityGroup = this.gatewayConfigGroup.get('thingsboard.checkingDeviceActivity') as FormGroup;
+ 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]);
+ } else {
+ checkingDeviceActivityGroup.get('inactivityTimeoutSeconds').clearValidators();
+ checkingDeviceActivityGroup.get('inactivityTimeoutSeconds').setErrors(null);
+ checkingDeviceActivityGroup.get('inactivityCheckPeriodSeconds').clearValidators();
+ checkingDeviceActivityGroup.get('inactivityCheckPeriodSeconds').setErrors(null);
+ }
+ });
+
+ const securityGroup = this.gatewayConfigGroup.get('thingsboard.security') as FormGroup;
+ securityGroup.get('type').valueChanges.subscribe(type => {
+ this.removeAllSecurityValidators();
+ if (type === SecurityTypes.ACCESS_TOKEN) {
+ securityGroup.get('accessToken').addValidators([Validators.required]);
+ securityGroup.get('accessToken').updateValueAndValidity();
+ } else if (type === SecurityTypes.TLS_PRIVATE_KEY) {
+ securityGroup.get('caCert').addValidators([Validators.required]);
+ securityGroup.get('caCert').updateValueAndValidity();
+ securityGroup.get('privateKey').addValidators([Validators.required]);
+ securityGroup.get('privateKey').updateValueAndValidity();
+ securityGroup.get('cert').addValidators([Validators.required]);
+ securityGroup.get('cert').updateValueAndValidity();
+ } else if (type === SecurityTypes.TLS_ACCESS_TOKEN) {
+ securityGroup.get('accessToken').addValidators([Validators.required]);
+ securityGroup.get('accessToken').updateValueAndValidity();
+ securityGroup.get('caCert').addValidators([Validators.required]);
+ securityGroup.get('caCert').updateValueAndValidity();
+ } else if (type === SecurityTypes.USERNAME_PASSWORD) {
+ securityGroup.get('clientId').addValidators([Validators.required]);
+ securityGroup.get('clientId').updateValueAndValidity();
+ securityGroup.get('username').addValidators([Validators.required]);
+ securityGroup.get('username').updateValueAndValidity();
+ securityGroup.get('password').addValidators([Validators.required]);
+ securityGroup.get('password').updateValueAndValidity();
+ }
+ securityGroup.updateValueAndValidity();
+ });
+
+ securityGroup.get('caCert').valueChanges.subscribe(_ => this.cd.detectChanges())
+ securityGroup.get('privateKey').valueChanges.subscribe(_ => this.cd.detectChanges())
+ securityGroup.get('cert').valueChanges.subscribe(_ => this.cd.detectChanges())
+
+ const storageGroup = this.gatewayConfigGroup.get('storage') as FormGroup;
+ storageGroup.get('type').valueChanges.subscribe(type => {
+ this.removeAllStorageValidators();
+ if (type === StorageTypes.MEMORY) {
+ storageGroup.get('read_records_count').addValidators(
+ [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]);
+ storageGroup.get('max_records_count').addValidators(
+ [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]);
+ } else if (type === StorageTypes.FILE) {
+ storageGroup.get('data_folder_path').addValidators([Validators.required]);
+ storageGroup.get('max_file_count').addValidators(
+ [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]);
+ storageGroup.get('max_read_records_count').addValidators(
+ [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]);
+ storageGroup.get('max_records_per_file').addValidators(
+ [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]);
+ } else if (type === StorageTypes.SQLITE) {
+ storageGroup.get('data_file_path').addValidators([Validators.required]);
+ storageGroup.get('messages_ttl_check_in_hours').addValidators(
+ [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]);
+ storageGroup.get('messages_ttl_in_days').addValidators(
+ [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]);
+ }
+ });
+
+ this.fetchConfigAttribute(this.device);
+ }
+
+ fetchConfigAttribute(entityId: EntityId) {
+ this.attributeService.getEntityAttributes(entityId, AttributeScope.CLIENT_SCOPE,
+ ['general_configuration', 'grpc_configuration', 'logs_configuration', 'storage_configuration', 'RemoteLoggingLevel']).pipe(
+ mergeMap(attributes => attributes.length ? of(attributes) : this.attributeService.getEntityAttributes(
+ entityId, AttributeScope.SHARED_SCOPE, ['general_configuration', 'grpc_configuration', 'logs_configuration', 'storage_configuration', 'RemoteLoggingLevel']))
+ ).subscribe(attributes => {
+ if (attributes.length) {
+ const general_configuration = attributes.find(attribute => attribute.key === 'general_configuration')?.value;
+ const grpc_configuration = attributes.find(attribute => attribute.key === 'grpc_configuration')?.value;
+ const logs_configuration = attributes.find(attribute => attribute.key === 'logs_configuration')?.value;
+ const storage_configuration = attributes.find(attribute => attribute.key === 'storage_configuration')?.value;
+ const remoteLoggingLevel = attributes.find(attribute => attribute.key === 'RemoteLoggingLevel')?.value;
+ if (general_configuration) {
+ const configObj = {thingsboard: general_configuration};
+ if (configObj.thingsboard.statistics && configObj.thingsboard.statistics.commands) {
+ for (const command of configObj.thingsboard.statistics.commands) {
+ this.addCommand(command);
+ }
+ delete configObj.thingsboard.statistics.commands;
+ }
+ this.gatewayConfigGroup.patchValue(configObj, {emitEvent: false});
+ this.gatewayConfigGroup.markAsPristine();
+ if (!configObj.thingsboard.remoteConfiguration) {
+ this.gatewayConfigGroup.disable({emitEvent: false});
+ }
+ this.checkAndFetchCredentials(configObj.thingsboard.security);
+ }
+ if (grpc_configuration) {
+ const configObj = {grpc: grpc_configuration};
+ this.gatewayConfigGroup.patchValue(configObj, {emitEvent: false});
+ }
+ if (logs_configuration) {
+ const configObj = {logs: this.logsToObj(logs_configuration)};
+ this.gatewayConfigGroup.patchValue(configObj, {emitEvent: false});
+ this.cd.detectChanges();
+ }
+ if (storage_configuration) {
+ const configObj = {storage: storage_configuration};
+ this.gatewayConfigGroup.patchValue(configObj, {emitEvent: false});
+ }
+ if (remoteLoggingLevel) {
+ const remoteLogsFormGroup = this.gatewayConfigGroup.get('logs.remote');
+ remoteLogsFormGroup.patchValue({
+ enabled: remoteLoggingLevel !== GatewayLogLevel.none,
+ logLevel: remoteLoggingLevel
+ }, {emitEvent: false});
+ remoteLogsFormGroup.markAsPristine();
+ }
+ this.cd.detectChanges();
+ } else {
+ this.checkAndFetchCredentials({});
+ }
+ });
+ }
+
+ checkAndFetchCredentials(security): void {
+ if (security.type !== SecurityTypes.TLS_PRIVATE_KEY) {
+ this.deviceService.getDeviceCredentials(this.device.id).subscribe(credentials => {
+ if (credentials.credentialsType === DeviceCredentialsType.ACCESS_TOKEN || security.type !== SecurityTypes.TLS_ACCESS_TOKEN) {
+ this.gatewayConfigGroup.get('thingsboard.security.accessToken').setValue(credentials.credentialsId);
+ } else if (credentials.credentialsType === DeviceCredentialsType.MQTT_BASIC) {
+ const parsedValue = JSON.parse(credentials.credentialsValue);
+ this.gatewayConfigGroup.get('thingsboard.security.clientId').setValue(parsedValue.clientId);
+ this.gatewayConfigGroup.get('thingsboard.security.username').setValue(parsedValue.userName);
+ this.gatewayConfigGroup.get('thingsboard.security.password').setValue(parsedValue.password);
+ } else if (credentials.credentialsType === DeviceCredentialsType.X509_CERTIFICATE ) {
+ //if sertificate is present set sertificate as present
+ }
+ });
+ }
+ }
+
+ logsToObj(logsConfig) {
+ const logsObject = {
+ local: {}
+ }
+ const logFormat = logsConfig.formatters.LogFormatter.format;
+ const dateFormat = logsConfig.formatters.LogFormatter.datefmt;
+ for (const localLogsConfigsKey of Object.keys(LocalLogsConfigs)) {
+ const handlerKey = localLogsConfigsKey + "Handler";
+ logsObject[localLogsConfigsKey] = {
+ logLevel: logsConfig.loggers[localLogsConfigsKey].level,
+ filePath: logsConfig.handlers[handlerKey].filename.split('/'+localLogsConfigsKey)[0],
+ backupCount: logsConfig.handlers[handlerKey].backupCount,
+ savingTime: logsConfig.handlers[handlerKey].interval,
+ savingPeriod: logsConfig.handlers[handlerKey].when,
+ }
+ }
+
+
+ return {local: logsObject, logFormat, dateFormat};
+ }
+
+ addCommand(command?): void {
+ const data = command || {};
+ const commandsFormArray = this.commandFormArray();
+ const commandFormGroup = this.fb.group({
+ attributeOnGateway: [data.attributeOnGateway || null, [Validators.required]],
+ command: [data.command || null, [Validators.required]],
+ timeout: [data.timeout || null, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]],
+ });
+ commandsFormArray.push(commandFormGroup);
+ }
+
+ addLocalLogConfig(name, config): void {
+ const localLogsFormGroup = this.gatewayConfigGroup.get('logs.local') as FormGroup;
+ const configGroup = this.fb.group({
+ logLevel: [config.logLevel || GatewayLogLevel.info, [Validators.required]],
+ filePath: [config.filePath || './logs', [Validators.required]],
+ backupCount: [config.backupCount || 7, [Validators.required, Validators.min(0)]],
+ savingTime: [config.savingTime || 3, [Validators.required, Validators.min(0)]],
+ savingPeriod: [config.savingPeriod || LogSavingPeriod.days, [Validators.required]]
+ });
+ localLogsFormGroup.addControl(name, configGroup);
+ }
+
+ getLogFormGroup(value: string): FormGroup {
+ return this.gatewayConfigGroup.get(`logs.local.${value}`) as FormGroup;
+ }
+
+ commandFormArray(): FormArray {
+ return this.gatewayConfigGroup.get('thingsboard.statistics.commands') as FormArray;
+ }
+
+ removeCommandControl(index: number): void {
+ this.commandFormArray().removeAt(index);
+ this.gatewayConfigGroup.markAsDirty();
+ }
+
+ removeAllSecurityValidators(): void {
+ const securityGroup = this.gatewayConfigGroup.get('thingsboard.security') as FormGroup;
+ for (const controlsKey in securityGroup.controls) {
+ if (controlsKey !== 'type') {
+ securityGroup.controls[controlsKey].clearValidators();
+ securityGroup.controls[controlsKey].setErrors(null);
+ securityGroup.controls[controlsKey].updateValueAndValidity();
+ }
+ }
+ }
+
+ removeAllStorageValidators(): void {
+ const storageGroup = this.gatewayConfigGroup.get('storage') as FormGroup;
+ for (const storageKey in storageGroup.controls) {
+ if (storageKey !== 'type') {
+ storageGroup.controls[storageKey].clearValidators();
+ storageGroup.controls[storageKey].setErrors(null);
+ storageGroup.controls[storageKey].updateValueAndValidity();
+ }
+ }
+ }
+
+ removeEmpty(obj) {
+ return Object.fromEntries(
+ Object.entries(obj)
+ .filter(([_, v]) => v != null)
+ .map(([k, v]) => [k, v === Object(v) ? this.removeEmpty(v) : v])
+ );
+ }
+
+ generateLogsFile(logsObj) {
+ const logAttrObj = {
+ version: 1,
+ disable_existing_loggers: false,
+ formatters: {
+ LogFormatter: {
+ class: "logging.Formatter",
+ format: logsObj.logFormat,
+ datefmt: logsObj.dateFormat,
+ }
+ },
+ handlers: {
+ consoleHandler: {
+ class: "logging.StreamHandler",
+ formatter: "LogFormatter",
+ level: "DEBUG",
+ stream: "ext://sys.stdout"
+ },
+ databaseHandler: {
+ class: "thingsboard_gateway.tb_utility.tb_logger.TimedRotatingFileHandler",
+ formatter: "LogFormatter",
+ filename: "./logs/database.log",
+ backupCount: 1,
+ encoding: "utf-8"
+ }
+ },
+ loggers: {
+ database: {
+ handlers: ["databaseHandler", "consoleHandler"],
+ level: "DEBUG",
+ propagate: false
+ }
+ },
+ root: {
+ level: "ERROR",
+ handlers: [
+ "consoleHandler"
+ ]
+ }
+ }
+ for (const key of Object.keys(logsObj.local)) {
+ logAttrObj.handlers[key+"Handler"] = this.createHandlerObj(logsObj.local[key], key);
+ logAttrObj.loggers[key] = this.createLoggerObj(logsObj.local[key], key);
+ }
+ return logAttrObj;
+ }
+
+ createHandlerObj(logObj, key) {
+ return {
+ class: "thingsboard_gateway.tb_utility.tb_logger.TimedRotatingFileHandler",
+ formatter: "LogFormatter",
+ filename: `${logObj.filePath}/${key}.log`,
+ backupCount: logObj.backupCount,
+ interval: logObj.savingTime,
+ when: logObj.savingPeriod,
+ encoding: "utf-8"
+ }
+ }
+
+ createLoggerObj(logObj, key) {
+ return {
+ handlers: [`${key}Handler`, "consoleHandler"],
+ level: logObj.logLevel,
+ propagate: false
+ }
+ }
+
+ saveConfig(): void {
+ const value = this.removeEmpty(this.gatewayConfigGroup.value);
+ value.thingsboard.statistics.commands = Object.values(value.thingsboard.statistics.commands);
+ const attributes = [];
+ attributes.push({
+ key: 'RemoteLoggingLevel',
+ value: value.logs.remote.enabled ? value.logs.remote.logLevel : GatewayLogLevel.none
+ });
+ delete value.connectors;
+ attributes.push({
+ key: 'logs_configuration',
+ value: this.generateLogsFile(value.logs)
+ });
+ attributes.push({
+ key: 'grpc_configuration',
+ value: value.grpc
+ });
+ attributes.push({
+ key: 'storage_configuration',
+ value: value.storage
+ });
+ attributes.push({
+ key: 'general_configuration',
+ value: value.thingsboard
+ });
+
+ this.attributeService.saveEntityAttributes(this.device, AttributeScope.SHARED_SCOPE, attributes).subscribe(_ => {
+ if (this.dialogRef) {
+ this.dialogRef.close();
+ } else {
+ this.gatewayConfigGroup.markAsPristine();
+ this.cd.detectChanges();
+ }
+ });
+ }
+
+ cancel(): void {
+ if (this.dialogRef) {
+ this.dialogRef.close();
+ }
+ }
+
+ private openConfigurationConfirmDialog(): void {
+ this.deviceService.getDevice(this.device.id).subscribe(gateway => {
+ this.dialog.open
+ (GatewayRemoteConfigurationDialogComponent, {
+ disableClose: true,
+ panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
+ data: {
+ gatewayName: gateway.name
+ }
+ }).afterClosed().subscribe(
+ (res) => {
+ if (!res) {
+ this.gatewayConfigGroup.get('thingsboard.remoteConfiguration').setValue(true, {emitEvent: false});
+ }
+ }
+ );
+ });
+ }
+}
diff --git a/ui-ngx/src/app/shared/components/device/gateway-connectors.component.html b/ui-ngx/src/app/shared/components/device/gateway-connectors.component.html
new file mode 100644
index 0000000000..387f8707d4
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/device/gateway-connectors.component.html
@@ -0,0 +1,167 @@
+
+
diff --git a/ui-ngx/src/app/shared/components/device/gateway-connectors.component.scss b/ui-ngx/src/app/shared/components/device/gateway-connectors.component.scss
new file mode 100644
index 0000000000..626f40672f
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/device/gateway-connectors.component.scss
@@ -0,0 +1,90 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+:host {
+ width: 100%;
+ height: 100%;
+ display: block;
+ overflow-x: auto;
+ padding: 0;
+
+ .connector-container {
+ width: 100%;
+
+ &>mat-card, &>div {
+ min-width: 50%;
+ }
+
+ mat-card {
+ margin: 10px;
+ padding: 10px;
+ max-width: 100%;
+ }
+ }
+
+ .tb-entity-table {
+ .tb-entity-table-content {
+ width: 100%;
+ height: 100%;
+ background: #fff;
+ overflow: hidden;
+ }
+ }
+
+ .mat-toolbar {
+ background: transparent;
+ color: rgba(0, 0, 0, .87) !important;
+ }
+
+ .mat-mdc-form-field {
+ flex-grow: 1;
+ //min-width: 200px;
+ //flex-shrink: 1;
+ }
+
+ mat-expansion-panel {
+ border: 1px solid #305680;
+ }
+
+ mat-card {
+ padding-left: 10px;
+ background: transparent;
+ }
+
+ .mat-card-selected {
+ background-color: rgba(48, 86, 128, 0.1);
+ }
+
+ .mat-mdc-slide-toggle {
+ margin: 15px;
+ }
+
+ ::ng-deep tb-json-object-edit > div {
+ flex-grow: 1;
+ }
+
+ .mat-accordion .mat-expansion-panel {
+ border-radius: 5px;
+ }
+
+ .action-btns {
+ margin: 10px 10px 0;
+ }
+
+ mat-row {
+ cursor: pointer;
+ }
+}
+
diff --git a/ui-ngx/src/app/shared/components/device/gateway-connectors.component.ts b/ui-ngx/src/app/shared/components/device/gateway-connectors.component.ts
new file mode 100644
index 0000000000..9034ced4d5
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/device/gateway-connectors.component.ts
@@ -0,0 +1,390 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+/// http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, Input, NgZone, ViewChild } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { Router } from '@angular/router';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { EntityId } from '@shared/models/id/entity-id';
+import { MatDialog } from '@angular/material/dialog';
+import { AttributeService } from '@core/http/attribute.service';
+import { DeviceService } from '@core/http/device.service';
+import { TranslateService } from '@ngx-translate/core';
+import { forkJoin, merge } from 'rxjs';
+import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models';
+import { PageComponent } from '@shared/components/page.component';
+import { PageLink } from '@shared/models/page/page-link';
+import { AttributeDatasource } from '@home/models/datasource/attribute-datasource';
+import { Direction, SortOrder } from '@shared/models/page/sort-order';
+import { MatSort } from '@angular/material/sort';
+import { tap } from 'rxjs/operators';
+import { TelemetryWebsocketService } from '@core/ws/telemetry-websocket.service';
+import { MatTableDataSource } from '@angular/material/table';
+import { GatewayLogLevel } from '@shared/components/device/gateway-configuration.component';
+import { ActionNotificationShow } from '@core/notification/notification.actions';
+import { DialogService } from '@app/core/services/dialog.service';
+import { WidgetContext } from '@home/models/widget-component.models';
+import { deepClone } from '@core/utils';
+
+
+export interface gatewayConnector {
+ name: string;
+ type: string;
+ configuration?: string;
+ configurationJson: string;
+ log_level: string;
+ key?: string;
+}
+
+
+export const GatewayConnectorDefaultTypesTranslates = new Map([
+ ['mqtt', 'MQTT'],
+ ['modbus', 'MODBUS'],
+ ['grpc', 'GRPC'],
+ ['opcua', 'OPCUA'],
+ ['opcua_asyncio', 'OPCUA ASYNCIO'],
+ ['ble', 'BLE'],
+ ['request', 'REQUEST'],
+ ['can', 'CAN'],
+ ['bacnet', 'BACNET'],
+ ['odbc', 'ODBC'],
+ ['rest', 'REST'],
+ ['snmp', 'SNMP'],
+ ['ftp', 'FTP'],
+ ['socket', 'SOCKET'],
+ ['xmpp', 'XMPP'],
+ ['ocpp', 'OCCP'],
+ ['custom', 'CUSTOM']
+]);
+
+@Component({
+ selector: 'tb-gateway-connector',
+ templateUrl: './gateway-connectors.component.html',
+ styleUrls: ['./gateway-connectors.component.scss']
+})
+export class GatewayConnectorComponent extends PageComponent implements AfterViewInit {
+
+ pageLink: PageLink;
+
+ attributeDataSource: AttributeDatasource;
+
+ inactiveConnectorsDataSource: AttributeDatasource;
+
+ dataSource: MatTableDataSource
+
+ displayedColumns = ['enabled', 'key', 'type', 'actions'];
+
+ gatewayConnectorDefaultTypes = GatewayConnectorDefaultTypesTranslates;
+
+ @Input()
+ ctx: WidgetContext;
+
+ @Input()
+ device: EntityId;
+
+ @ViewChild('searchInput') searchInputField: ElementRef;
+ @ViewChild(MatSort) sort: MatSort;
+
+ connectorForm: FormGroup;
+
+ viewsInited = false;
+
+ textSearchMode: boolean;
+
+ activeConnectors: Array;
+
+ inactiveConnectors: Array;
+
+ InitialActiveConnectors: Array;
+
+ gatewayLogLevel = Object.values(GatewayLogLevel);
+
+ activeData: Array = [];
+
+ inactiveData: Array = [];
+
+ constructor(protected router: Router,
+ protected store: Store,
+ protected fb: FormBuilder,
+ protected translate: TranslateService,
+ protected attributeService: AttributeService,
+ protected deviceService: DeviceService,
+ protected dialogService: DialogService,
+ private telemetryWsService: TelemetryWebsocketService,
+ private zone: NgZone,
+ private cd: ChangeDetectorRef,
+ public dialog: MatDialog) {
+ super(store);
+ const sortOrder: SortOrder = {property: 'key', direction: Direction.ASC};
+ this.pageLink = new PageLink(1000, 0, null, sortOrder);
+ this.attributeDataSource = new AttributeDatasource(this.attributeService, this.telemetryWsService, this.zone, this.translate);
+ this.inactiveConnectorsDataSource = new AttributeDatasource(this.attributeService, this.telemetryWsService, this.zone, this.translate);
+ this.dataSource = new MatTableDataSource([]);
+ this.connectorForm = this.fb.group({
+ name: ['', [Validators.required]],
+ type: ['', [Validators.required]],
+ log_level: ['', [Validators.required]],
+ key: ['auto'],
+ class: [''],
+ configuration: [''],
+ configurationJson: [{}, [Validators.required]]
+ })
+ this.connectorForm.disable();
+ }
+
+
+ initialConnector: gatewayConnector;
+
+ ngAfterViewInit() {
+ this.connectorForm.valueChanges.subscribe(() => {
+ this.cd.detectChanges();
+ });
+ merge(this.sort.sortChange)
+ .pipe(
+ tap(() => this.updateData())
+ )
+ .subscribe();
+
+ this.viewsInited = true;
+ if (this.device) {
+ forkJoin(this.attributeService.getEntityAttributes(this.device, AttributeScope.SHARED_SCOPE, ['active_connectors']),
+ this.attributeService.getEntityAttributes(this.device, AttributeScope.SERVER_SCOPE, ['inactive_connectors'])).subscribe(attributes => {
+ if (attributes.length) {
+ this.activeConnectors = attributes[0].length ? attributes[0][0].value : [];
+ this.inactiveConnectors = attributes[1].length ? attributes[1][0].value : [];
+ this.updateData(true);
+ } else {
+ this.activeConnectors = [];
+ this.inactiveConnectors = [];
+ this.updateData(true);
+ }
+ })
+ }
+ }
+
+ saveConnector(): void {
+ const value = this.connectorForm.value;
+ value.configuration = this.camelize(value.name) + ".json";
+ if (value.type !== 'grpc') {
+ delete value.key;
+ }
+ const attributesToSave = [{
+ key: value.name,
+ value: value
+ }];
+ const attributesToDelete = [];
+ const scope = (this.activeConnectors.includes(value.name) || !this.initialConnector) ? AttributeScope.SHARED_SCOPE : AttributeScope.SERVER_SCOPE;
+ let updateActiveConnectors = false;
+ if (this.initialConnector && this.initialConnector.name !== value.name) {
+ attributesToDelete.push({key: this.initialConnector.name});
+ updateActiveConnectors = true;
+ const activeIndex = this.activeConnectors.indexOf(this.initialConnector.name);
+ const inactiveIndex = this.inactiveConnectors.indexOf(this.initialConnector.name);
+ if (activeIndex !== -1) this.activeConnectors.splice(activeIndex, 1);
+ if (inactiveIndex !== -1) this.inactiveConnectors.splice(activeIndex, 1);
+ }
+ if (!this.activeConnectors.includes(value.name) && scope == AttributeScope.SHARED_SCOPE) {
+ this.activeConnectors.push(value.name);
+ updateActiveConnectors = true;
+ }
+ if (!this.inactiveConnectors.includes(value.name) && scope == AttributeScope.SERVER_SCOPE) {
+ this.inactiveConnectors.push(value.name);
+ updateActiveConnectors = true;
+ }
+ const tasks = [this.attributeService.saveEntityAttributes(this.device, AttributeScope.SHARED_SCOPE, attributesToSave)];
+ if (updateActiveConnectors) {
+ tasks.push(this.attributeService.saveEntityAttributes(this.device, scope, [{
+ key: scope == AttributeScope.SHARED_SCOPE ? 'active_connectors' : 'inactive_connectors',
+ value: scope == AttributeScope.SHARED_SCOPE ? this.activeConnectors : this.inactiveConnectors
+ }]));
+ }
+
+ if (attributesToDelete.length) {
+ tasks.push(this.attributeService.deleteEntityAttributes(this.device, AttributeScope.SHARED_SCOPE, attributesToDelete));
+ }
+ forkJoin(tasks).subscribe(_ => {
+ this.showToast("Update Successful")
+ this.updateData(true);
+ })
+ }
+
+ resetSortAndFilter(update: boolean = true) {
+ this.textSearchMode = false;
+ this.pageLink.textSearch = null;
+ if (this.viewsInited) {
+ const sortable = this.sort.sortables.get('key');
+ this.sort.active = sortable.id;
+ this.sort.direction = 'asc';
+ if (update) {
+ this.updateData(true);
+ }
+ }
+ }
+
+ updateData(reload: boolean = false) {
+ this.pageLink.sortOrder.property = this.sort.active;
+ this.pageLink.sortOrder.direction = Direction[this.sort.direction.toUpperCase()];
+ this.attributeDataSource.loadAttributes(this.device, AttributeScope.CLIENT_SCOPE, this.pageLink, reload).subscribe(data => {
+ this.activeData = data.data.filter(value => this.activeConnectors.includes(value.key));
+ this.combineData()
+ });
+ this.inactiveConnectorsDataSource.loadAttributes(this.device, AttributeScope.SHARED_SCOPE, this.pageLink, reload).subscribe(data => {
+ this.inactiveData = data.data.filter(value =>this.inactiveConnectors.includes(value.key));
+ this.combineData()
+ });
+ }
+
+ combineData () {
+ this.dataSource.data = [...this.activeData, ...this.inactiveData];
+ }
+
+ addAttribute(): void {
+ if (this.connectorForm.disabled) {
+ this.connectorForm.enable();
+ }
+ this.clearOutConnectorForm();
+ }
+
+ clearOutConnectorForm(): void {
+ this.connectorForm.setValue({
+ name: '',
+ type: 'mqtt',
+ log_level: GatewayLogLevel.info,
+ key: 'auto',
+ class: '',
+ configuration: '',
+ configurationJson: {}
+ })
+ this.initialConnector = null;
+ this.connectorForm.markAsPristine();
+ }
+
+ selectConnector(attribute): void {
+ if (this.connectorForm.disabled) {
+ this.connectorForm.enable();
+ }
+ const connector = typeof attribute.value === 'string' ? JSON.parse(attribute.value): attribute.value;
+ if (!connector.configuration) {
+ connector.configuration = "";
+ }
+ if (!connector.key) {
+ connector.key = 'auto';
+ }
+ this.initialConnector = connector;
+ this.connectorForm.setValue(connector);
+ this.connectorForm.markAsPristine();
+ }
+
+ showToast(message: string) {
+ this.store.dispatch(new ActionNotificationShow(
+ {
+ message,
+ type: 'success',
+ duration: 1000,
+ verticalPosition: 'top',
+ horizontalPosition: 'right',
+ target: 'dashboardRoot',
+ // panelClass: this.widgetNamespace,
+ forceDismiss: true
+ }));
+ }
+
+ returnType (attribute) {
+ const value = typeof attribute.value === 'string' ? JSON.parse(attribute.value): attribute.value;
+ return this.gatewayConnectorDefaultTypes.get(value.type)
+ }
+
+ deleteConnector(attribute: AttributeData, $event: Event): void {
+ if ($event) {
+ $event.stopPropagation();
+ }
+ const title = `Delete connector ${attribute.key}?`;
+ const content = `All connector data will be deleted.`;
+ this.dialogService.confirm(title, content, 'Cancel', 'Delete').subscribe(result => {
+ if (result) {
+ const tasks = [];
+ const scope = (this.activeConnectors.includes(attribute.key) || !this.initialConnector) ? AttributeScope.SHARED_SCOPE : AttributeScope.SERVER_SCOPE;
+ tasks.push(this.attributeService.deleteEntityAttributes(this.device, AttributeScope.SHARED_SCOPE, [attribute]));
+ const activeIndex = this.activeConnectors.indexOf(attribute.key);
+ const inactiveIndex = this.inactiveConnectors.indexOf(attribute.key);
+ if (activeIndex !== -1) this.activeConnectors.splice(activeIndex, 1);
+ if (inactiveIndex !== -1) this.inactiveConnectors.splice(activeIndex, 1);
+ tasks.push(this.attributeService.saveEntityAttributes(this.device, scope, [{
+ key: scope == AttributeScope.SHARED_SCOPE ? 'active_connectors' : 'inactive_connectors',
+ value: scope == AttributeScope.SHARED_SCOPE ? this.activeConnectors : this.inactiveConnectors
+ }]));
+ forkJoin(tasks).subscribe(_ => {
+ if (this.initialConnector ? this.initialConnector.name === attribute.key : true) {
+ this.clearOutConnectorForm();
+ this.cd.detectChanges();
+ this.connectorForm.disable();
+ }
+ this.updateData()
+ })
+ }
+ })
+ }
+
+ camelize(str): string {
+ return str.toLowerCase().replace(/\s+/g, '_');
+ }
+
+ connectorLogs(attribute: AttributeData, $event: Event): void {
+ if ($event) {
+ $event.stopPropagation();
+ }
+ attribute.value = typeof attribute.value === 'string' ? JSON.parse(attribute.value): attribute.value;
+ const params = deepClone(this.ctx.stateController.getStateParams());
+ params.targetEntityParamName = "connector_logs";
+ this.ctx.stateController.openState("connector_logs", params);
+ }
+
+ connectorRpc(attribute: AttributeData, $event: Event): void {
+ if ($event) {
+ $event.stopPropagation();
+ }
+ attribute.value = typeof attribute.value === 'string' ? JSON.parse(attribute.value): attribute.value;
+ const params = deepClone(this.ctx.stateController.getStateParams());
+ params.connector_rpc = attribute;
+ params.targetEntityParamName = "connector_rpc";
+ this.ctx.stateController.openState("connector_rpc", params);
+ }
+
+
+ enableConnector(attribute): void {
+ const wasEnabled = this.activeConnectors.includes(attribute.key);
+ if (wasEnabled) {
+ let index = this.activeConnectors.indexOf(attribute.key);
+ this.activeConnectors.splice(index, 1);
+ this.inactiveConnectors.push(attribute.key);
+ } else {
+ let index = this.inactiveConnectors.indexOf(attribute.key);
+ this.inactiveConnectors.splice(index, 1);
+ this.activeConnectors.push(attribute.key);
+ }
+ forkJoin([this.attributeService.saveEntityAttributes(this.device, AttributeScope.SHARED_SCOPE, [{
+ key: 'active_connectors',
+ value: this.activeConnectors
+ }]), this.attributeService.saveEntityAttributes(this.device, AttributeScope.SERVER_SCOPE, [{
+ key: 'inactive_connectors',
+ value: this.inactiveConnectors
+ }]),]).subscribe(_ => {
+ this.updateData();
+ })
+ }
+
+}
diff --git a/ui-ngx/src/app/shared/components/device/gateway-logs.component.html b/ui-ngx/src/app/shared/components/device/gateway-logs.component.html
new file mode 100644
index 0000000000..cc3a6d8731
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/device/gateway-logs.component.html
@@ -0,0 +1,60 @@
+
+
+ {{link.name}}
+
+
+
+ Created time
+
+ {{ attribute.ts | date:'yyyy-MM-dd HH:mm:ss'}}
+
+
+
+ Status
+
+ {{ attribute.status }}
+
+
+
+ Message
+
+ {{ attribute.message }}
+
+
+
+{{'attribute.no-telemetry-text' | translate}}
+
+
+ displayedColumns = ['ts', 'status', 'message'];
+
+ @Input()
+ ctx: WidgetContext;
+
+ @Input()
+ dialogRef: MatDialogRef;
+
+ @ViewChild('searchInput') searchInputField: ElementRef;
+ @ViewChild(MatSort) sort: MatSort;
+
+ connectorForm: FormGroup;
+
+ viewsInited = false;
+
+ textSearchMode: boolean;
+
+ activeConnectors: Array;
+
+ inactiveConnectors: Array;
+
+ InitialActiveConnectors: Array;
+
+ gatewayLogLevel = Object.values(GatewayLogLevel);
+
+ logLinks: Array;
+
+ initialConnector: GatewayConnector;
+
+ activeLink: LogLink;
+
+ gatewayLogLinks: Array = [
+ {
+ name: "General",
+ key: "LOGS"
+ }, {
+ name: "Service",
+ key: "SERVICE_LOGS"
+ },
+ {
+ name: "Connection",
+ key: "CONNECTION_LOGS"
+ }, {
+ name: "Storage",
+ key: "STORAGE_LOGS"
+ },
+ {
+ key: 'EXTENSIONS_LOGS',
+ name: "Extension"
+ }]
+
+
+ constructor(protected router: Router,
+ protected store: Store,
+ protected fb: FormBuilder,
+ protected translate: TranslateService,
+ protected attributeService: AttributeService,
+ protected deviceService: DeviceService,
+ protected dialogService: DialogService,
+ public dialog: MatDialog) {
+ super(store);
+ const sortOrder: SortOrder = {property: 'ts', direction: Direction.DESC};
+ this.pageLink = new PageLink(Number.POSITIVE_INFINITY, 0, null, sortOrder);
+ this.dataSource = new MatTableDataSource([]);
+
+ }
+
+
+ ngAfterViewInit() {
+ this.dataSource.sort = this.sort;
+ this.ctx.defaultSubscription.onTimewindowChangeFunction = timewindow => {
+ this.ctx.defaultSubscription.options.timeWindowConfig = timewindow;
+ this.ctx.defaultSubscription.updateDataSubscriptions();
+ return timewindow;
+ }
+ if (this.ctx.settings.isConnectorLog && this.ctx.settings.connectorLogState) {
+ const connector = this.ctx.stateController.getStateParams()[this.ctx.settings.connectorLogState];
+ this.logLinks = [{
+ key: `${connector.key}_LOGS`,
+ name: "Connector",
+ filterFn: (attrData)=>{
+ return !attrData.message.includes(`_converter.py`)
+ }
+ },{
+ key: `${connector.key}_LOGS`,
+ name: "Converter",
+ filterFn: (attrData)=>{
+ return attrData.message.includes(`_converter.py`)
+ }
+ }]
+ } else {
+ this.logLinks = this.gatewayLogLinks;
+ }
+ this.activeLink = this.logLinks[0];
+ this.changeSubscription();
+ }
+
+
+ updateData(sort?) {
+ if (this.ctx.defaultSubscription.data.length) {
+ let attrData = this.ctx.defaultSubscription.data[0].data.map(data => {
+ let result = {
+ ts: data[0],
+ key: this.activeLink.key,
+ message: /\[(.*)/.exec(data[1])[0],
+ status: 'INVALID LOG FORMAT'
+ };
+
+ try {
+ result.status= data[1].match(/\|(\w+)\|/)[1];
+ } catch (e) {
+ result.status = 'INVALID LOG FORMAT'
+ }
+
+ return result;
+ });
+ if (this.activeLink.filterFn) {
+ attrData = attrData.filter(data => this.activeLink.filterFn(data));
+ }
+ this.dataSource.data = attrData;
+ if (sort) {
+ this.dataSource.sortData(this.dataSource.data, this.sort);
+ }
+ }
+ }
+
+ onTabChanged(link) {
+ this.activeLink = link;
+ this.changeSubscription();
+ }
+
+ statusClass(status) {
+ switch (status) {
+ case GatewayLogLevel.debug:
+ return "status status-debug";
+ case GatewayLogLevel.warning:
+ return "status status-warning";
+ case GatewayLogLevel.error:
+ case "EXCEPTION":
+ return "status status-error";
+ case GatewayLogLevel.info:
+ default:
+ return "status status-info";
+ }
+ }
+
+ statusClassMsg(status) {
+ if (status === "EXCEPTION") {
+ return 'msg-status-exception';
+ }
+ }
+
+ changeSubscription() {
+ if (this.ctx.datasources[0].entity) {
+ this.ctx.defaultSubscription.options.datasources[0].dataKeys = [{
+ name: this.activeLink.key,
+ type: DataKeyType.timeseries,
+ settings: {}
+ }];
+ this.ctx.defaultSubscription.unsubscribe();
+ this.ctx.defaultSubscription.updateDataSubscriptions();
+ this.ctx.defaultSubscription.callbacks.onDataUpdated = () => {
+ this.updateData();
+ }
+
+ }
+ }
+
+}
diff --git a/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.html b/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.html
new file mode 100644
index 0000000000..840ca86d6d
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.html
@@ -0,0 +1,49 @@
+
+
+
+ {{'gateway.statistics.command' | translate}}
+
+
+ {{command}}
+
+
+
+
+ {{'gateway.statistics.timeout-ms' | translate}}
+
+
+ {{'widget-config.datasource-parameters' | translate}}
+ edit
+
+
+ Send
+
+
+ Result
+
+
diff --git a/ui-ngx/src/app/modules/home/components/gateway/gateway-list.component.scss b/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.scss
similarity index 59%
rename from ui-ngx/src/app/modules/home/components/gateway/gateway-list.component.scss
rename to ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.scss
index 09f06ae6b5..421ac5a153 100644
--- a/ui-ngx/src/app/modules/home/components/gateway/gateway-list.component.scss
+++ b/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.scss
@@ -1,5 +1,5 @@
/**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,25 +16,33 @@
:host {
width: 100%;
height: 100%;
- display: block;
- .tb-table-widget {
- .table-container {
- position: relative;
+ overflow-x: auto;
+ display: flex;
+ flex-direction: column;
+ padding: 0;
+
+ .command-form {
+ width: 100%;
+ flex-wrap: nowrap;
+ padding: 0 15px;
+ margin-bottom: 5px;
+
+ &>button {
+ margin-top: 10px;
}
- .mat-table {
- .mat-row {
- &.invisible {
- visibility: hidden;
- }
- }
+
+ ::ng-deep.mat-mdc-form-field-icon-suffix {
+ z-index: 100;
}
- span.no-data-found {
- position: absolute;
- top: 60px;
- bottom: 0;
- left: 0;
- right: 0;
+ }
+
+ .result-block {
+ padding: 0 15px;
+
+ &>span {
+ font-weight: 600;
}
}
+
}
diff --git a/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.ts b/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.ts
new file mode 100644
index 0000000000..ab29766fd0
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/device/gateway-service-rpc.component.ts
@@ -0,0 +1,128 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+/// http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { AfterViewInit, Component, Input } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { Router } from '@angular/router';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { MatDialog, MatDialogRef } from '@angular/material/dialog';
+import { AttributeService } from '@core/http/attribute.service';
+import { DeviceService } from '@core/http/device.service';
+import { TranslateService } from '@ngx-translate/core';
+import { PageComponent } from "@shared/components/page.component";
+import { DialogService } from '@app/core/services/dialog.service';
+import { WidgetContext } from '@home/models/widget-component.models';
+import { ContentType } from '@shared/models/constants';
+import {
+ JsonObjectEditDialogComponent,
+ JsonObjectEditDialogData
+} from '@shared/components/dialog/json-object-edit-dialog.component';
+
+
+@Component({
+ selector: 'tb-gateway-service-rpc',
+ templateUrl: './gateway-service-rpc.component.html',
+ styleUrls: ['./gateway-service-rpc.component.scss']
+})
+export class GatewayServiceRPCComponent extends PageComponent implements AfterViewInit {
+
+ @Input()
+ ctx: WidgetContext;
+
+ contentTypes = ContentType;
+
+ @Input()
+ dialogRef: MatDialogRef;
+
+ commandForm: FormGroup;
+
+ isConnector: boolean;
+
+ connectorType: string;
+
+ RPCCommands: Array = [
+ "Ping",
+ "Stats",
+ "Devices",
+ "Update",
+ "Version",
+ "Restart",
+ "Reboot"
+ ]
+
+
+ constructor(protected router: Router,
+ protected store: Store,
+ protected fb: FormBuilder,
+ protected translate: TranslateService,
+ protected attributeService: AttributeService,
+ protected deviceService: DeviceService,
+ protected dialogService: DialogService,
+ public dialog: MatDialog) {
+ super(store);
+ this.commandForm = this.fb.group({
+ command: [null,[Validators.required]],
+ time: [60, [Validators.required]],
+ params: ["{}", [Validators.required]],
+ result: [null]
+ })
+
+
+ }
+
+
+ ngAfterViewInit() {
+ this.isConnector = this.ctx.settings.isConnector;
+ if (!this.isConnector) {
+ this.commandForm.get('command').setValue(this.RPCCommands[0]);
+ } else {
+ this.connectorType = this.ctx.stateController.getStateParams().connector_rpc.value.type;
+ }
+ }
+
+
+ sendCommand() {
+ const formValues = this.commandForm.value;
+ const commandPrefix = this.isConnector ? `${this.connectorType}_` : 'gateway_';
+ this.ctx.controlApi.sendTwoWayCommand(commandPrefix+formValues.command.toLowerCase(), {},formValues.time).subscribe(resp=>{
+ this.commandForm.get('result').setValue(JSON.stringify(resp));
+ },error => {
+ console.log(error);
+ this.commandForm.get('result').setValue(JSON.stringify(error.error));
+ })
+ }
+
+ openEditJSONDialog($event: Event) {
+ if ($event) {
+ $event.stopPropagation();
+ }
+ this.dialog.open(JsonObjectEditDialogComponent, {
+ disableClose: true,
+ panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
+ data: {
+ jsonValue: JSON.parse(this.commandForm.get('params').value)
+ }
+ }).afterClosed().subscribe(
+ (res) => {
+ if (res) {
+ this.commandForm.get('params').setValue(JSON.stringify(res));
+ }
+ }
+ );
+ }
+
+}
diff --git a/ui-ngx/src/app/shared/components/device/gateway-statistics.component.html b/ui-ngx/src/app/shared/components/device/gateway-statistics.component.html
new file mode 100644
index 0000000000..b98d481f6d
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/device/gateway-statistics.component.html
@@ -0,0 +1,81 @@
+
+
+
+
+
+ {{'gateway.statistics.statistic' | translate}}
+
+
+ {{key}}
+
+
+ {{command.attributeOnGateway}}
+
+
+
+
+
+
+
+
+ {{'gateway.statistics.command' | translate}}
+
+
+
+
+
+
+
+
+ Timestamp
+
+ {{row[0]| date:'yyyy-MM-dd HH:mm:ss' }}
+
+
+
+ Message
+
+ {{ row[1] }}
+
+
+
+
{{'attribute.no-telemetry-text' | translate}}
+
+
+
;
+ public pageLink: PageLink;
+ private resize$: ResizeObserver;
+ private subscription: IWidgetSubscription;
+ private subscriptionInfo: SubscriptionInfo [];
+ public legendData: LegendData;
+ public displayedColumns: Array;
+ private subscriptionOptions: WidgetSubscriptionOptions = {
+ callbacks: {
+ onDataUpdated: () => this.ctx.ngZone.run(() => {
+ this.onDataUpdated();
+ }),
+ onDataUpdateError: (subscription, e) => this.ctx.ngZone.run(() => {
+ this.onDataUpdateError(e);
+ })
+ },
+ useDashboardTimewindow: false,
+ legendConfig: {
+ position: LegendPosition.bottom
+ } as LegendConfig
+ };
+
+
+ constructor(protected router: Router,
+ protected store: Store,
+ protected fb: FormBuilder,
+ protected translate: TranslateService,
+ protected attributeService: AttributeService,
+ protected deviceService: DeviceService,
+ protected dialogService: DialogService,
+ private cd: ChangeDetectorRef,
+ private utils: UtilsService,
+ public dialog: MatDialog) {
+ super(store);
+ const sortOrder: SortOrder = {property: '0', direction: Direction.DESC};
+ this.pageLink = new PageLink(Number.POSITIVE_INFINITY, 0, null, sortOrder);
+ this.displayedColumns = ['0', '1'];
+ this.dataSource = new MatTableDataSource([]);
+ this.statisticForm = this.fb.group({
+ statisticKey: [null, []]
+ })
+
+ this.statisticForm.get('statisticKey').valueChanges.subscribe(value => {
+ this.commandObj = null;
+ if (this.commands.length) {
+ this.commandObj = this.commands.find(command => command.attributeOnGateway === value);
+ }
+ if (this.subscriptionInfo) this.createChartsSubscription(this.ctx.defaultSubscription.datasources[0].entity, value);
+ })
+ }
+
+
+ ngAfterViewInit() {
+ this.dataSource.sort = this.sort;
+ this.sort.sortChange.subscribe(_=>{
+ this.sortData();
+ })
+ this.init();
+ if (this.ctx.defaultSubscription.datasources.length) {
+
+ const gateway = this.ctx.defaultSubscription.datasources[0].entity;
+ if (!this.general) {
+ this.attributeService.getEntityAttributes(gateway.id, AttributeScope.SHARED_SCOPE, ["general_configuration"]).subscribe((resp: AttributeData[]) => {
+ if (resp && resp.length) {
+ this.commands = resp[0].value.statistics.commands;
+ if (!this.statisticForm.get('statisticKey').value) {
+ this.statisticForm.get('statisticKey').setValue(this.commands[0].attributeOnGateway);
+ this.createChartsSubscription(gateway, this.commands[0].attributeOnGateway);
+ }
+ }
+ })
+ } else {
+ let connectorsTs;
+ this.attributeService.getEntityTimeseriesLatest(gateway.id).subscribe(
+ data => {
+ connectorsTs = Object.keys(data)
+ .filter(el => el.includes(
+ 'ConnectorEventsProduced'
+ ) || el.includes(
+ 'ConnectorEventsSent'))
+ this.createGeneralChartsSubscription(gateway, connectorsTs);
+ })
+ }
+ }
+ }
+
+ public sortData () {
+ this.dataSource.sortData(this.dataSource.data, this.sort);
+ }
+
+ public onLegendKeyHiddenChange(index: number) {
+ this.legendData.keys[index].dataKey.hidden = !this.legendData.keys[index].dataKey.hidden;
+ this.subscription.updateDataVisibility(index);
+ }
+
+ private createChartsSubscription(gateway: BaseData, attr: string) {
+ let subscriptionInfo = [{
+ type: DatasourceType.entity,
+ entityType: EntityType.DEVICE,
+ entityId: gateway.id.id,
+ entityName: gateway.name,
+ timeseries: []
+ }];
+
+ subscriptionInfo[0].timeseries = [{name: attr, label: attr}];
+ this.subscriptionInfo = subscriptionInfo;
+ this.changeSubscription(subscriptionInfo);
+ }
+
+ private createGeneralChartsSubscription(gateway: BaseData, attrData: [string]) {
+ let subscriptionInfo = [{
+ type: DatasourceType.entity,
+ entityType: EntityType.DEVICE,
+ entityId: gateway.id.id,
+ entityName: gateway.name,
+ timeseries: []
+ }];
+ subscriptionInfo[0].timeseries = [];
+ if (attrData && attrData.length) {
+ attrData.forEach(attr => {
+ subscriptionInfo[0].timeseries.push({name: attr, label: attr})
+ })
+ }
+ this.ctx.defaultSubscription.datasources[0].dataKeys.forEach(dataKey => {
+ subscriptionInfo[0].timeseries.push({name: dataKey.name, label: dataKey.label})
+ })
+
+ this.subscriptionInfo = subscriptionInfo;
+ this.changeSubscription(subscriptionInfo);
+ }
+
+ init = () => {
+ this.flotCtx = {
+ $scope: this.ctx.$scope,
+ $injector: this.ctx.$injector,
+ utils: this.ctx.utils,
+ isMobile: this.ctx.isMobile,
+ isEdit: this.ctx.isEdit,
+ subscriptionApi: this.ctx.subscriptionApi,
+ detectChanges: this.ctx.detectChanges,
+ settings: this.ctx.settings
+ };
+ }
+
+ updateChart = () => {
+ if (this.flot && this.ctx.defaultSubscription.data.length) {
+ this.flot.update();
+ }
+ }
+
+ resize = () => {
+ if (this.flot) {
+ this.flot.resize();
+ }
+ }
+
+ private reset() {
+ if (this.resize$) {
+ this.resize$.disconnect();
+ }
+ if (this.subscription) {
+ this.subscription.unsubscribe();
+ }
+ if (this.flot) {
+ this.flot.destroy();
+ }
+ }
+
+ private onDataUpdateError(e: any) {
+ const exceptionData = this.utils.parseException(e);
+ let errorText = exceptionData.name;
+ if (exceptionData.message) {
+ errorText += ': ' + exceptionData.message;
+ }
+ console.error(errorText);
+ }
+
+ private onDataUpdated() {
+ this.isDataOnlyNumbers();
+ if (this.isNumericData) {
+ if (this.chartInited) {
+ if (this.flot) {
+ this.flot.update();
+ }
+ } else {
+ this.initChart();
+ }
+ }
+ }
+
+ private initChart() {
+ this.chartInited = true;
+ this.flotCtx.$container = $(this.statisticChart.nativeElement);
+ this.resize$.observe(this.statisticChart.nativeElement);
+ this.flot = new TbFlot(this.flotCtx as WidgetContext, "line");
+ this.flot.update();
+ }
+
+ private isDataOnlyNumbers() {
+ if (this.general) {
+ this.isNumericData = true;
+ return;
+ }
+ this.dataSource.data = this.subscription.data.length ? this.subscription.data[0].data : [];
+ this.isNumericData = this.dataSource.data.every(data => isNumber(data[1]));
+ }
+
+
+ changeSubscription(subscriptionInfo: SubscriptionInfo[]) {
+ if (this.subscription) {
+ this.reset();
+ }
+ if (this.ctx.datasources[0].entity) {
+ this.ctx.subscriptionApi.createSubscriptionFromInfo(widgetType.timeseries, subscriptionInfo, this.subscriptionOptions, false, true).subscribe(subscription => {
+ this.subscription = subscription;
+ this.isDataOnlyNumbers();
+ this.legendData = this.subscription.legendData;
+ this.flotCtx.defaultSubscription = subscription;
+ this.resize$ = new ResizeObserver(() => {
+ this.resize();
+ });
+ this.ctx.detectChanges();
+ if (this.isNumericData) {
+ this.initChart();
+ }
+ })
+
+ }
+ }
+
+}
diff --git a/ui-ngx/src/app/shared/components/dialog/gateway-remote-configuration-dialog.html b/ui-ngx/src/app/shared/components/dialog/gateway-remote-configuration-dialog.html
new file mode 100644
index 0000000000..d8bff54898
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/dialog/gateway-remote-configuration-dialog.html
@@ -0,0 +1,57 @@
+
+
diff --git a/ui-ngx/src/app/shared/components/dialog/gateway-remote-configuration-dialog.ts b/ui-ngx/src/app/shared/components/dialog/gateway-remote-configuration-dialog.ts
new file mode 100644
index 0000000000..95850a2444
--- /dev/null
+++ b/ui-ngx/src/app/shared/components/dialog/gateway-remote-configuration-dialog.ts
@@ -0,0 +1,61 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+/// http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, Inject, OnInit } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { DialogComponent } from '@shared/components/dialog.component';
+import { Router } from '@angular/router';
+import { FormBuilder, FormControl } from '@angular/forms';
+
+export interface GatewayRemoteConfigurationDialogData {
+ gatewayName: string;
+}
+
+@Component({
+ selector: 'tb-activation-link-dialog',
+ templateUrl: './gateway-remote-configuration-dialog.html'
+})
+
+export class GatewayRemoteConfigurationDialogComponent extends DialogComponent implements OnInit {
+
+ gatewayName: string;
+
+ gatewayForm: FormControl;
+
+ constructor(protected store: Store,
+ protected router: Router,
+ @Inject(MAT_DIALOG_DATA) public data: GatewayRemoteConfigurationDialogData,
+ public dialogRef: MatDialogRef,
+ private fb: FormBuilder) {
+ super(store, router, dialogRef);
+ this.gatewayName = this.data.gatewayName;
+ this.gatewayForm = this.fb.control(null);
+ }
+
+ ngOnInit(): void {
+ }
+
+ close(): void {
+ this.dialogRef.close();
+ }
+
+ turnOff(): void {
+ this.dialogRef.close(true);
+ }
+}
diff --git a/ui-ngx/src/app/shared/components/file-input.component.html b/ui-ngx/src/app/shared/components/file-input.component.html
index 57e1ad1465..dbc217df19 100644
--- a/ui-ngx/src/app/shared/components/file-input.component.html
+++ b/ui-ngx/src/app/shared/components/file-input.component.html
@@ -16,7 +16,12 @@
-->
diff --git a/ui-ngx/src/app/shared/components/file-input.component.scss b/ui-ngx/src/app/shared/components/file-input.component.scss
index 3426539be9..33ded0bc65 100644
--- a/ui-ngx/src/app/shared/components/file-input.component.scss
+++ b/ui-ngx/src/app/shared/components/file-input.component.scss
@@ -93,4 +93,8 @@ $previewSize: 100px !default;
padding: 0 16px;
}
}
+
+ .pe {
+ pointer-events: auto;
+ }
}
diff --git a/ui-ngx/src/app/shared/components/file-input.component.ts b/ui-ngx/src/app/shared/components/file-input.component.ts
index 51933d749c..8e70ca88ba 100644
--- a/ui-ngx/src/app/shared/components/file-input.component.ts
+++ b/ui-ngx/src/app/shared/components/file-input.component.ts
@@ -54,6 +54,9 @@ export class FileInputComponent extends PageComponent implements AfterViewInit,
@Input()
label: string;
+ @Input()
+ hint: string;
+
@Input()
accept = '*/*';
diff --git a/ui-ngx/src/app/shared/shared.module.ts b/ui-ngx/src/app/shared/shared.module.ts
index c82ae61644..408ad0d057 100644
--- a/ui-ngx/src/app/shared/shared.module.ts
+++ b/ui-ngx/src/app/shared/shared.module.ts
@@ -176,10 +176,16 @@ import { NotificationComponent } from '@shared/components/notification/notificat
import { TemplateAutocompleteComponent } from '@shared/components/notification/template-autocomplete.component';
import { SlackConversationAutocompleteComponent } from '@shared/components/slack-conversation-autocomplete.component';
import { DateAgoPipe } from '@shared/pipe/date-ago.pipe';
+import { DeviceGatewayCommandComponent } from '@shared/components/device/device-gateway-command.component';
+import { GatewayConfigurationComponent } from '@shared/components/device/gateway-configuration.component';
+import { GatewayRemoteConfigurationDialogComponent } from '@shared/components/dialog/gateway-remote-configuration-dialog';
+import { GatewayConnectorComponent } from '@shared/components/device/gateway-connectors.component';
+import { GatewayLogsComponent } from '@shared/components/device/gateway-logs.component';
+import { GatewayStatisticsComponent } from '@shared/components/device/gateway-statistics.component';
+import { GatewayServiceRPCComponent } from '@shared/components/device/gateway-service-rpc.component';
+
+export const MarkedOptionsFactory = (markedOptionsService: MarkedOptionsService) => markedOptionsService;
-export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService) {
- return markedOptionsService;
-}
@NgModule({
providers: [
@@ -241,6 +247,13 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
HelpComponent,
HelpMarkdownComponent,
HelpPopupComponent,
+ DeviceGatewayCommandComponent,
+ GatewayConfigurationComponent,
+ GatewayConnectorComponent,
+ GatewayLogsComponent,
+ GatewayStatisticsComponent,
+ GatewayServiceRPCComponent,
+ GatewayRemoteConfigurationDialogComponent,
TbCheckboxComponent,
TbSnackBarComponent,
TbErrorComponent,
@@ -407,6 +420,13 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
HelpComponent,
HelpMarkdownComponent,
HelpPopupComponent,
+ DeviceGatewayCommandComponent,
+ GatewayConfigurationComponent,
+ GatewayConnectorComponent,
+ GatewayLogsComponent,
+ GatewayStatisticsComponent,
+ GatewayServiceRPCComponent,
+ GatewayRemoteConfigurationDialogComponent,
TbCheckboxComponent,
TbErrorComponent,
TbCheatSheetComponent,
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 d810da019c..cb5e9f3392 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1186,6 +1186,7 @@
"device-details": "Device details",
"add-device-text": "Add new device",
"credentials": "Credentials",
+ "commands": "Commands",
"manage-credentials": "Manage credentials",
"delete": "Delete device",
"assign-devices": "Assign devices",
@@ -1278,6 +1279,7 @@
"copyId": "Copy device Id",
"copyAccessToken": "Copy access token",
"copy-mqtt-authentication": "Copy MQTT credentials",
+ "transportCommandCopiedMessage": "Transport Command has been copied to clipboard",
"idCopiedMessage": "Device Id has been copied to clipboard",
"accessTokenCopiedMessage": "Device access token has been copied to clipboard",
"mqtt-authentication-copied-message": "Device MQTT authentication has been copied to clipboard",
@@ -2466,44 +2468,168 @@
},
"gateway": {
"add-entry": "Add configuration",
+ "advanced": "Advanced",
+ "checking-device-activity": "Checking Device Activity:",
"command": "Docker commands",
"command-copied-message": "Docker command has been copied to clipboard",
+ "configuration": "Configuration",
+ "connector-json": "Connector JSON",
"connector-add": "Add new connector",
"connector-enabled": "Enable connector",
"connector-name": "Connector name",
"connector-name-required": "Connector name is required.",
+ "connector-key": "Connector key",
+ "connector-key-required": "Connector key is required.",
+ "connector-configuration": "Configuration file name",
+ "connector-configuration-required": "Configuration file name is required.",
"connector-type": "Connector type",
"connector-type-required": "Connector type is required.",
+ "connector-types": {
+ "mqtt": "MQTT Broker Connector",
+ "modbus": "Modbus Connector",
+ "modbus_serial": "Modbus Connector (serial)",
+ "opcua": "OPC-UA Connector",
+ "opcua_asyncio": "OPC-UA Connector (asyncio)",
+ "ble": "BLE Connector",
+ "request": "REQUEST Connector",
+ "can": "CAN Connector",
+ "bacnet": "BACnet Connector",
+ "odbc": "ODBC Connector",
+ "rest": "REST Connector",
+ "snmp": "SNMP Connector",
+ "ftp": "FTP Connector",
+ "socket": "Socket TCP/UDP Connector",
+ "xmpp": "XMPP Connector",
+ "ocpp": "OCPP Connector"
+ },
"connectors": "Connectors configuration",
+ "connectors-active": "Connector active",
+ "connectors-inactive": "Connector inactive",
+ "select-connector": "Select connector",
+ "gateway-configuration": "Gateway Configuration",
"copy-command": "Copy docker command",
"create-new-gateway": "Create a new gateway",
"create-new-gateway-text": "Are you sure you want create a new gateway with name: '{{gatewayName}}'?",
"created-time": "Created time",
+ "configuration-delete-dialog-header": "Configurations will be deleted",
+ "configuration-delete-dialog-body": "Turning off Remote Configuration is possible only if there is physical access to the Gateway. All previous configurations will be deleted.
\nTo turn off configuration, enter gateway name below",
+ "configuration-delete-dialog-input": "Gateway name",
+ "configuration-delete-dialog-input-required": "Gateway name is mandatory",
+ "configuration-delete-dialog-confirm": "Turn Off",
"delete": "Delete configuration",
"download-tip": "Download configuration file",
+ "drop-file": "Drop file here or",
"gateway": "Gateway",
"gateway-exists": "Device with same name is already exists.",
"gateway-name": "Gateway name",
"gateway-name-required": "Gateway name is required.",
"gateway-saved": "Gateway configuration successfully saved.",
"gateway-search": "Gateway search",
+ "grpc": "GRPC",
+ "grpc-keep-alive-timeout": "Keep alive timeout (in ms)",
+ "grpc-keep-alive-timeout-required": "Keep alive timeout is required",
+ "grpc-keep-alive-timeout-min": "Keep alive timeout can not be less then 1",
+ "grpc-keep-alive-timeout-pattern": "Keep alive timeout is not valid",
+ "grpc-keep-alive": "Keep alive (in ms)",
+ "grpc-keep-alive-required": "Keep alive is required",
+ "grpc-keep-alive-min": "Keep alive can not be less then 1",
+ "grpc-keep-alive-pattern": "Keep alive is not valid",
+ "grpc-min-time-between-pings": "Min time between pings (in ms)",
+ "grpc-min-time-between-pings-required": "Min time between pings is required",
+ "grpc-min-time-between-pings-min": "Min time between pings can not be less then 1",
+ "grpc-min-time-between-pings-pattern": "Min time between pings is not valid",
+ "grpc-min-ping-interval-without-data": "Min ping interval without data (in ms)",
+ "grpc-min-ping-interval-without-data-required": "Min ping interval without data is required",
+ "grpc-min-ping-interval-without-data-min": "Min ping interval without data can not be less then 1",
+ "grpc-min-ping-interval-without-data-pattern": "Min ping interval without data is not valid",
+ "grpc-max-pings-without-data": "Max pings without data",
+ "grpc-max-pings-without-data-required": "Max pings without data is required",
+ "grpc-max-pings-without-data-min": "Max pings without data can not be less then 1",
+ "grpc-max-pings-without-data-pattern": "Max pings without data is not valid",
+ "handle-device-renaming": "Handle device renaming",
+ "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-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",
"json-parse": "Not valid JSON.",
"json-required": "Field cannot be empty.",
"linux-macos": "Linux/MacOS",
+ "logs": {
+ "logs": "Logs",
+ "days": "days",
+ "hours": "hours",
+ "minutes": "minutes",
+ "seconds": "seconds",
+ "date-format": "Date format",
+ "date-format-required": "Date format required",
+ "log-format": "Log format",
+ "log-type": "Log type",
+ "log-format-required": "Log format required",
+ "remote": "Remote logging",
+ "remote-logs": "Remote logs",
+ "local": "Local logging",
+ "level": "Log level",
+ "file-path": "File path",
+ "file-path-required": "File path required",
+ "saving-period": "Log saving period",
+ "saving-period-min": "Log saving period can not be less then 1",
+ "saving-period-required": "Log saving period required",
+ "backup-count": "Backup count",
+ "backup-count-min": "Backup count can not be less then 1",
+ "backup-count-required": "Backup count required"
+ },
+ "min-pack-send-delay": "Min pack send delay (in ms)",
+ "min-pack-send-delay-required": "Min pack send delay is required",
+ "min-pack-send-delay-min": "Min pack send delay can not be less then 1",
"no-connectors": "No connectors",
"no-data": "No configurations",
"no-gateway-found": "No gateway found.",
"no-gateway-matching": " '{{item}}' not found.",
"path-logs": "Path to log files",
"path-logs-required": "Path is required.",
+ "permit-without-calls": "Keep alive permit without calls",
"remote": "Remote configuration",
"remote-logging-level": "Logging level",
"remove-entry": "Remove configuration",
+ "remote-shell": "Remote shell",
+ "remote-configuration": "Remote Configuration",
+ "other": "Other",
"save-tip": "Save configuration file",
"security-type": "Security type",
"security-types": {
"access-token": "Access Token",
- "tls": "TLS"
+ "username-password": "Username and Password",
+ "tls": "TLS",
+ "tls-access-token": "TLS + Access Token",
+ "tls-private-key": "TLS + Private Key"
+ },
+ "server-port": "Server port",
+ "stats-send-period-in-sec": "Stats send period in seconds",
+ "statistics": {
+ "statistic": "Statistic",
+ "statistics": "Statistics",
+ "commands": "Commands",
+ "send-period": "Statistic send period (in sec)",
+ "send-period-required": "Statistic send period is required",
+ "send-period-min": "Statistic send period can not be less then 1",
+ "send-period-pattern": "Statistic send period is not valid",
+ "check-connectors-configuration": "Check connectors configuration (in ms)",
+ "check-connectors-configuration-required": "Check connectors configuration is required",
+ "check-connectors-configuration-min": "Check connectors configuration can not be less then 1",
+ "check-connectors-configuration-pattern": "Check connectors configuration is not valid",
+ "add": "Add command",
+ "timeout": "Timeout",
+ "timeout-ms": "Timeout (in ms)",
+ "timeout-required": "Timeout is required",
+ "timeout-min": "Timeout can not be less then 1",
+ "timeout-pattern": "Timeout is not valid",
+ "attribute-name": "Attribute name",
+ "attribute-name-required": "Attribute name is required",
+ "command": "Command",
+ "command-required": "Command is required",
+ "remove": "Remove command"
},
"storage": "Storage",
"storage-max-file-records": "Maximum records in file",
@@ -2515,6 +2641,16 @@
"storage-max-records-min": "Minimum number of records is 1.",
"storage-max-records-pattern": "Number is not valid.",
"storage-max-records-required": "Maximum records is required.",
+ "storage-read-record-count": "Read record count in storage",
+ "storage-read-record-count-min": "Minimum number of records is 1.",
+ "storage-read-record-count-pattern": "Number is not valid.",
+ "storage-read-record-count-required": "Read record count is required.",
+ "storage-max-read-record-count": "Max read record count in storage",
+ "storage-max-read-record-count-min": "Minimum number of records is 1.",
+ "storage-max-read-record-count-pattern": "Number is not valid.",
+ "storage-max-read-record-count-required": "Max Read record count is required.",
+ "storage-data-folder-path": "Data folder path",
+ "storage-data-folder-path-required": "Data folder path is required.",
"storage-pack-size": "Maximum event pack size",
"storage-pack-size-min": "Minimum number is 1.",
"storage-pack-size-pattern": "Number is not valid.",
@@ -2524,9 +2660,11 @@
"storage-type": "Storage type",
"storage-types": {
"file-storage": "File storage",
- "memory-storage": "Memory storage"
+ "memory-storage": "Memory storage",
+ "sqlite": "SQLITE"
},
"thingsboard": "ThingsBoard",
+ "thingsboard-general": "General",
"thingsboard-host": "ThingsBoard host",
"thingsboard-host-required": "Host is required.",
"thingsboard-port": "ThingsBoard port",
@@ -2539,11 +2677,60 @@
"title-connectors-json": "Connector {{typeName}} configuration",
"tls-path-ca-certificate": "Path to CA certificate on gateway",
"tls-path-client-certificate": "Path to client certificate on gateway",
+ "messages-ttl-check-in-hours": "Messages TTL check in hours",
+ "messages-ttl-check-in-hours-required": "Messages TTL check in hours is required.",
+ "messages-ttl-check-in-hours-min": "Min number is 1.",
+ "messages-ttl-check-in-hours-pattern": "Number is not valid.",
+ "messages-ttl-in-days": "Messages TTL in days",
+ "messages-ttl-in-days-required": "Messages TTL in days is required.",
+ "messages-ttl-in-days-min": "Min number is 1.",
+ "messages-ttl-in-days-pattern": "Number is not valid.",
+ "mqtt-qos": "QoS",
+ "mqtt-qos-required": "QoS is required",
+ "mqtt-qos-range": "QoS values range is from 0 to 1",
"tls-path-private-key": "Path to private key on gateway",
"toggle-fullscreen": "Toggle fullscreen",
"transformer-json-config": "Configuration JSON*",
"update-config": "Add/update configuration JSON",
- "windows": "Windows"
+ "windows": "Windows",
+ "hints": {
+ "remote-configuration": "Enables remote configuration and management of the gateway",
+ "remote-shell": "Enables remote control of the operating system with the gateway from the Remote Shell widget",
+ "host": "Hostname or ip address of ThingsBoard server",
+ "port": "Port of MQTT service on ThingsBoard server",
+ "token": "Access token for the gateway from ThingsBoard server",
+ "client-id": "MQTT client id for the gateway form ThingsBoard server",
+ "username": "MQTT username for the gateway form ThingsBoard server",
+ "password": "MQTT password for the gateway form ThingsBoard server",
+ "ca-cert": "Path to CA certificate file",
+ "cert": "Path to certificate file",
+ "private-key": "Path to private key file",
+ "date-form": "Date format of log message",
+ "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",
+ "storage": "Provides configuration for saving incoming data before it is sent to the ThingsBoard platform",
+ "file": "Received data saving to the hard drive",
+ "memory": "Received data saving to the RAM memory",
+ "sqlite": "Received data saving to the .db file",
+ "data-folder": "Path to folder, that will contains data (Relative or Absolute)",
+ "max-file-count": "Maximum count of file that will be saved",
+ "max-read-count": "Count of messages to get from storage and send to ThingsBoard",
+ "max-records": "Maximum count of records that will be stored in one file",
+ "read-record-count": "Count of messages to get from storage and send to ThingsBoard",
+ "max-records-count": "Maximum count of data in storage before send to ThingsBoard",
+ "ttl-check-hour": "How often will Gateway check data for obsolescence",
+ "ttl-messages-day": "Maximum days that storage will save data",
+ "commands": "Commands for collecting additional statistic",
+ "attribute": "Gateway client attribute name",
+ "timeout": "Timeout for command executing",
+ "command": "The result of the command will be used as the value of the client attribute (\"/bin/sh -c ipconfig getifaddr en0\")",
+ "check-device-activity": "Enables monitor the activity of each connected device",
+ "inactivity-timeout": "Inactivity device time after whose the gateway will disconnect device",
+ "inactivity-period": "Periodicity of device activity check",
+ "minimal-pack-delay": "Delay between sending packets (Decreasing this setting results in increased CPU usage)",
+ "qos": "Quality of Service in MQTT messaging (0 - at most once, 1 - at least once)"
+ }
},
"grid": {
"delete-item-title": "Are you sure you want to delete this item?",
@@ -3065,6 +3252,20 @@
},
"security": {
"security": "Security",
+ "access-token": "Access token",
+ "access-token-required": "Access token is required",
+ "clientId": "Client ID",
+ "clientId-required": "Client ID is required",
+ "username": "Username",
+ "username-required": "Username is required",
+ "password": "Password",
+ "password-required": "Password is required",
+ "ca-cert": "CA certificate",
+ "ca-cert-required": "CA certificate is required",
+ "cert": "Certificate",
+ "cert-required": "Certificate is required",
+ "private-key": "Private Key",
+ "private-key-required": "Private Key is required",
"2fa": {
"2fa": "Two-factor authentication",
"2fa-description": "Two-factor authentication protects your account from unauthorized access. All you have to do is enter a security code when you log in.",
@@ -5087,6 +5288,11 @@
"font-weight-lighter": "Lighter",
"color": "Color",
"shadow-color": "Shadow color"
+ },
+ "action-buttons": {
+ "button-type": "Button type",
+ "button-class": "Button class",
+ "alignment": "Buttons alignment"
}
},
"icon": {
@@ -5113,7 +5319,8 @@
"node-selected": "On node selected",
"element-click": "On HTML element click",
"pie-slice-click": "On slice click",
- "row-double-click": "On row double click"
+ "row-double-click": "On row double click",
+ "action-button-click": "Action button click"
}
},
"paginator" : {