|
|
@ -48,6 +48,7 @@ import { |
|
|
StorageTypes, |
|
|
StorageTypes, |
|
|
StorageTypesTranslationMap |
|
|
StorageTypesTranslationMap |
|
|
} from './gateway-widget.models'; |
|
|
} from './gateway-widget.models'; |
|
|
|
|
|
import { deepTrim } from '@core/utils'; |
|
|
|
|
|
|
|
|
@Component({ |
|
|
@Component({ |
|
|
selector: 'tb-gateway-configuration', |
|
|
selector: 'tb-gateway-configuration', |
|
|
@ -91,7 +92,7 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
ngOnInit() { |
|
|
ngOnInit() { |
|
|
this.gatewayConfigGroup = this.fb.group({ |
|
|
this.gatewayConfigGroup = this.fb.group({ |
|
|
thingsboard: this.fb.group({ |
|
|
thingsboard: this.fb.group({ |
|
|
host: [window.location.hostname, [Validators.required]], |
|
|
host: [window.location.hostname, [Validators.required, Validators.pattern(/^[^\s]+$/)]], |
|
|
port: [1883, [Validators.required, Validators.min(1), Validators.max(65535), Validators.pattern(/^-?[0-9]+$/)]], |
|
|
port: [1883, [Validators.required, Validators.min(1), Validators.max(65535), Validators.pattern(/^-?[0-9]+$/)]], |
|
|
remoteShell: [false, []], |
|
|
remoteShell: [false, []], |
|
|
remoteConfiguration: [true, []], |
|
|
remoteConfiguration: [true, []], |
|
|
@ -107,30 +108,30 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
handleDeviceRenaming: [true, []], |
|
|
handleDeviceRenaming: [true, []], |
|
|
checkingDeviceActivity: this.fb.group({ |
|
|
checkingDeviceActivity: this.fb.group({ |
|
|
checkDeviceInactivity: [false, []], |
|
|
checkDeviceInactivity: [false, []], |
|
|
inactivityTimeoutSeconds: [200, [Validators.min(1)]], |
|
|
inactivityTimeoutSeconds: [200, [Validators.min(1), Validators.pattern(/^[^.\s]+$/)]], |
|
|
inactivityCheckPeriodSeconds: [500, [Validators.min(1)]] |
|
|
inactivityCheckPeriodSeconds: [500, [Validators.min(1), Validators.pattern(/^[^.\s]+$/)]] |
|
|
}), |
|
|
}), |
|
|
security: this.fb.group({ |
|
|
security: this.fb.group({ |
|
|
type: [SecurityTypes.ACCESS_TOKEN, [Validators.required]], |
|
|
type: [SecurityTypes.ACCESS_TOKEN, [Validators.required]], |
|
|
accessToken: [null, [Validators.required]], |
|
|
accessToken: [null, [Validators.required, Validators.pattern(/^[^.\s]+$/)]], |
|
|
clientId: [null, []], |
|
|
clientId: [null, [Validators.pattern(/^[^.\s]+$/)]], |
|
|
username: [null, []], |
|
|
username: [null, [Validators.pattern(/^[^.\s]+$/)]], |
|
|
password: [null, []], |
|
|
password: [null, [Validators.pattern(/^[^.\s]+$/)]], |
|
|
caCert: [null, []], |
|
|
caCert: [null, []], |
|
|
cert: [null, []], |
|
|
cert: [null, []], |
|
|
privateKey: [null, []], |
|
|
privateKey: [null, []], |
|
|
}), |
|
|
}), |
|
|
qos: [1, [Validators.min(0), Validators.max(1), Validators.required]] |
|
|
qos: [1, [Validators.min(0), Validators.max(1), Validators.required, Validators.pattern(/^[^.\s]+$/)]] |
|
|
}), |
|
|
}), |
|
|
storage: this.fb.group({ |
|
|
storage: this.fb.group({ |
|
|
type: [StorageTypes.MEMORY, [Validators.required]], |
|
|
type: [StorageTypes.MEMORY, [Validators.required]], |
|
|
read_records_count: [100, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]], |
|
|
read_records_count: [100, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required, Validators.pattern(/^[^.\s]+$/)]], |
|
|
max_records_count: [100000, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]], |
|
|
max_records_count: [100000, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required, Validators.pattern(/^[^.\s]+$/)]], |
|
|
data_folder_path: ['./data/', []], |
|
|
data_folder_path: ['./data/', [Validators.pattern(/^[^\s]+$/)]], |
|
|
max_file_count: [10, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], |
|
|
max_file_count: [10, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], |
|
|
max_read_records_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]+$/)]], |
|
|
max_records_per_file: [10000, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], |
|
|
data_file_path: ['./data/data.db', []], |
|
|
data_file_path: ['./data/data.db', [Validators.pattern(/^[^\s]+$/)]], |
|
|
messages_ttl_check_in_hours: [1, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], |
|
|
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]+$/)]], |
|
|
messages_ttl_in_days: [7, [Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], |
|
|
|
|
|
|
|
|
@ -147,9 +148,9 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
}), |
|
|
}), |
|
|
connectors: this.fb.array([]), |
|
|
connectors: this.fb.array([]), |
|
|
logs: this.fb.group({ |
|
|
logs: this.fb.group({ |
|
|
dateFormat: ['%Y-%m-%d %H:%M:%S', [Validators.required]], |
|
|
dateFormat: ['%Y-%m-%d %H:%M:%S', [Validators.required, Validators.pattern(/^[^\s].*[^\s]$/)]], |
|
|
logFormat: ['%(asctime)s - |%(levelname)s| - [%(filename)s] - %(module)s - %(funcName)s - %(lineno)d - %(message)s', |
|
|
logFormat: ['%(asctime)s - |%(levelname)s| - [%(filename)s] - %(module)s - %(funcName)s - %(lineno)d - %(message)s', |
|
|
[Validators.required]], |
|
|
[Validators.required, Validators.pattern(/^[^\s].*[^\s]$/)]], |
|
|
type: ['remote', [Validators.required]], |
|
|
type: ['remote', [Validators.required]], |
|
|
remote: this.fb.group({ |
|
|
remote: this.fb.group({ |
|
|
enabled: [false], |
|
|
enabled: [false], |
|
|
@ -204,7 +205,7 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
securityGroup.get('type').valueChanges.subscribe(type => { |
|
|
securityGroup.get('type').valueChanges.subscribe(type => { |
|
|
this.removeAllSecurityValidators(); |
|
|
this.removeAllSecurityValidators(); |
|
|
if (type === SecurityTypes.ACCESS_TOKEN) { |
|
|
if (type === SecurityTypes.ACCESS_TOKEN) { |
|
|
securityGroup.get('accessToken').addValidators([Validators.required]); |
|
|
securityGroup.get('accessToken').addValidators([Validators.required, Validators.pattern(/^[^.\s]+$/)]); |
|
|
securityGroup.get('accessToken').updateValueAndValidity(); |
|
|
securityGroup.get('accessToken').updateValueAndValidity(); |
|
|
} else if (type === SecurityTypes.TLS_PRIVATE_KEY) { |
|
|
} else if (type === SecurityTypes.TLS_PRIVATE_KEY) { |
|
|
securityGroup.get('caCert').addValidators([Validators.required]); |
|
|
securityGroup.get('caCert').addValidators([Validators.required]); |
|
|
@ -214,7 +215,7 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
securityGroup.get('cert').addValidators([Validators.required]); |
|
|
securityGroup.get('cert').addValidators([Validators.required]); |
|
|
securityGroup.get('cert').updateValueAndValidity(); |
|
|
securityGroup.get('cert').updateValueAndValidity(); |
|
|
} else if (type === SecurityTypes.TLS_ACCESS_TOKEN) { |
|
|
} else if (type === SecurityTypes.TLS_ACCESS_TOKEN) { |
|
|
securityGroup.get('accessToken').addValidators([Validators.required]); |
|
|
securityGroup.get('accessToken').addValidators([Validators.required, Validators.pattern(/^[^.\s]+$/)]); |
|
|
securityGroup.get('accessToken').updateValueAndValidity(); |
|
|
securityGroup.get('accessToken').updateValueAndValidity(); |
|
|
securityGroup.get('caCert').addValidators([Validators.required]); |
|
|
securityGroup.get('caCert').addValidators([Validators.required]); |
|
|
securityGroup.get('caCert').updateValueAndValidity(); |
|
|
securityGroup.get('caCert').updateValueAndValidity(); |
|
|
@ -239,7 +240,7 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
storageGroup.get('read_records_count').updateValueAndValidity({emitEvent: false}); |
|
|
storageGroup.get('read_records_count').updateValueAndValidity({emitEvent: false}); |
|
|
storageGroup.get('max_records_count').updateValueAndValidity({emitEvent: false}); |
|
|
storageGroup.get('max_records_count').updateValueAndValidity({emitEvent: false}); |
|
|
} else if (type === StorageTypes.FILE) { |
|
|
} else if (type === StorageTypes.FILE) { |
|
|
storageGroup.get('data_folder_path').addValidators([Validators.required]); |
|
|
storageGroup.get('data_folder_path').addValidators([Validators.required, Validators.pattern(/^[^.\s]+$/)]); |
|
|
storageGroup.get('max_file_count').addValidators( |
|
|
storageGroup.get('max_file_count').addValidators( |
|
|
[Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]); |
|
|
[Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]); |
|
|
storageGroup.get('max_read_records_count').addValidators( |
|
|
storageGroup.get('max_read_records_count').addValidators( |
|
|
@ -251,7 +252,7 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
storageGroup.get('max_read_records_count').updateValueAndValidity({emitEvent: false}); |
|
|
storageGroup.get('max_read_records_count').updateValueAndValidity({emitEvent: false}); |
|
|
storageGroup.get('max_records_per_file').updateValueAndValidity({emitEvent: false}); |
|
|
storageGroup.get('max_records_per_file').updateValueAndValidity({emitEvent: false}); |
|
|
} else if (type === StorageTypes.SQLITE) { |
|
|
} else if (type === StorageTypes.SQLITE) { |
|
|
storageGroup.get('data_file_path').addValidators([Validators.required]); |
|
|
storageGroup.get('data_file_path').addValidators([Validators.required, Validators.pattern(/^[^.\s]+$/)]); |
|
|
storageGroup.get('messages_ttl_check_in_hours').addValidators( |
|
|
storageGroup.get('messages_ttl_check_in_hours').addValidators( |
|
|
[Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]); |
|
|
[Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.required]); |
|
|
storageGroup.get('messages_ttl_in_days').addValidators( |
|
|
storageGroup.get('messages_ttl_in_days').addValidators( |
|
|
@ -342,8 +343,8 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
this.initialCredentials = credentials; |
|
|
this.initialCredentials = credentials; |
|
|
if (credentials.credentialsType === DeviceCredentialsType.ACCESS_TOKEN || security.type === SecurityTypes.TLS_ACCESS_TOKEN) { |
|
|
if (credentials.credentialsType === DeviceCredentialsType.ACCESS_TOKEN || security.type === SecurityTypes.TLS_ACCESS_TOKEN) { |
|
|
this.gatewayConfigGroup.get('thingsboard.security.type').setValue(security.type === SecurityTypes.TLS_ACCESS_TOKEN |
|
|
this.gatewayConfigGroup.get('thingsboard.security.type').setValue(security.type === SecurityTypes.TLS_ACCESS_TOKEN |
|
|
? SecurityTypes.TLS_ACCESS_TOKEN |
|
|
? SecurityTypes.TLS_ACCESS_TOKEN |
|
|
: SecurityTypes.ACCESS_TOKEN); |
|
|
: SecurityTypes.ACCESS_TOKEN); |
|
|
this.gatewayConfigGroup.get('thingsboard.security.accessToken').setValue(credentials.credentialsId); |
|
|
this.gatewayConfigGroup.get('thingsboard.security.accessToken').setValue(credentials.credentialsId); |
|
|
if(security.type === SecurityTypes.TLS_ACCESS_TOKEN) { |
|
|
if(security.type === SecurityTypes.TLS_ACCESS_TOKEN) { |
|
|
this.gatewayConfigGroup.get('thingsboard.security.caCert').setValue(security.caCert); |
|
|
this.gatewayConfigGroup.get('thingsboard.security.caCert').setValue(security.caCert); |
|
|
@ -407,9 +408,9 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
addCommand(command: any = {}): void { |
|
|
addCommand(command: any = {}): void { |
|
|
const commandsFormArray = this.commandFormArray(); |
|
|
const commandsFormArray = this.commandFormArray(); |
|
|
const commandFormGroup = this.fb.group({ |
|
|
const commandFormGroup = this.fb.group({ |
|
|
attributeOnGateway: [command.attributeOnGateway || null, [Validators.required]], |
|
|
attributeOnGateway: [command.attributeOnGateway || null, [Validators.required, Validators.pattern(/^[^.\s]+$/)]], |
|
|
command: [command.command || null, [Validators.required]], |
|
|
command: [command.command || null, [Validators.required, Validators.pattern(/^[^.\s]+$/)]], |
|
|
timeout: [command.timeout || null, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/)]], |
|
|
timeout: [command.timeout || null, [Validators.required, Validators.min(1), Validators.pattern(/^-?[0-9]+$/), Validators.pattern(/^[^.\s]+$/)]], |
|
|
}); |
|
|
}); |
|
|
commandsFormArray.push(commandFormGroup); |
|
|
commandsFormArray.push(commandFormGroup); |
|
|
} |
|
|
} |
|
|
@ -542,7 +543,7 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
saveConfig(): void { |
|
|
saveConfig(): void { |
|
|
const value = this.removeEmpty(this.gatewayConfigGroup.value); |
|
|
const value = deepTrim(this.removeEmpty(this.gatewayConfigGroup.value)); |
|
|
value.thingsboard.statistics.commands = Object.values(value.thingsboard.statistics.commands); |
|
|
value.thingsboard.statistics.commands = Object.values(value.thingsboard.statistics.commands); |
|
|
const attributes = []; |
|
|
const attributes = []; |
|
|
attributes.push({ |
|
|
attributes.push({ |
|
|
@ -609,8 +610,8 @@ export class GatewayConfigurationComponent implements OnInit { |
|
|
credentialsValue.password = securityConfig.password; |
|
|
credentialsValue.password = securityConfig.password; |
|
|
} |
|
|
} |
|
|
newCredentials = { |
|
|
newCredentials = { |
|
|
credentialsType, |
|
|
credentialsType, |
|
|
credentialsValue: JSON.stringify(credentialsValue) |
|
|
credentialsValue: JSON.stringify(credentialsValue) |
|
|
}; |
|
|
}; |
|
|
} |
|
|
} |
|
|
} else if (securityConfig.type === SecurityTypes.ACCESS_TOKEN || securityConfig.type === SecurityTypes.TLS_ACCESS_TOKEN) { |
|
|
} else if (securityConfig.type === SecurityTypes.ACCESS_TOKEN || securityConfig.type === SecurityTypes.TLS_ACCESS_TOKEN) { |
|
|
|
Vladyslav
3 years ago
GitHub