Browse Source

Change device credentials value type

pull/3477/head
Vladyslav_Prykhodko 6 years ago
parent
commit
6e492c78d1
  1. 4
      ui-ngx/src/app/modules/home/pages/device/device-credentials-dialog.component.ts
  2. 2
      ui-ngx/src/app/shared/models/device.models.ts

4
ui-ngx/src/app/modules/home/pages/device/device-credentials-dialog.component.ts

@ -114,7 +114,7 @@ export class DeviceCredentialsDialogComponent extends
let credentialsBasic = {clientId: null, userName: null, password: null}; let credentialsBasic = {clientId: null, userName: null, password: null};
if (deviceCredentials.credentialsType === DeviceCredentialsType.MQTT_BASIC) { if (deviceCredentials.credentialsType === DeviceCredentialsType.MQTT_BASIC) {
credentialsValue = null; credentialsValue = null;
credentialsBasic = deviceCredentials.credentialsValue as DeviceCredentialMQTTBasic; credentialsBasic = JSON.parse(deviceCredentials.credentialsValue) as DeviceCredentialMQTTBasic;
} }
this.deviceCredentialsFormGroup.patchValue({ this.deviceCredentialsFormGroup.patchValue({
credentialsType: deviceCredentials.credentialsType, credentialsType: deviceCredentials.credentialsType,
@ -183,7 +183,7 @@ export class DeviceCredentialsDialogComponent extends
this.submitted = true; this.submitted = true;
const deviceCredentialsValue = this.deviceCredentialsFormGroup.value; const deviceCredentialsValue = this.deviceCredentialsFormGroup.value;
if (deviceCredentialsValue.credentialsType === DeviceCredentialsType.MQTT_BASIC) { if (deviceCredentialsValue.credentialsType === DeviceCredentialsType.MQTT_BASIC) {
deviceCredentialsValue.credentialsValue = deviceCredentialsValue.credentialsBasic; deviceCredentialsValue.credentialsValue = JSON.stringify(deviceCredentialsValue.credentialsBasic);
} }
delete deviceCredentialsValue.credentialsBasic; delete deviceCredentialsValue.credentialsBasic;
this.deviceCredentials = {...this.deviceCredentials, ...deviceCredentialsValue}; this.deviceCredentials = {...this.deviceCredentials, ...deviceCredentialsValue};

2
ui-ngx/src/app/shared/models/device.models.ts

@ -308,7 +308,7 @@ export interface DeviceCredentials extends BaseData<DeviceCredentialsId> {
deviceId: DeviceId; deviceId: DeviceId;
credentialsType: DeviceCredentialsType; credentialsType: DeviceCredentialsType;
credentialsId: string; credentialsId: string;
credentialsValue: string | DeviceCredentialMQTTBasic; credentialsValue: string;
} }
export interface DeviceCredentialMQTTBasic { export interface DeviceCredentialMQTTBasic {

Loading…
Cancel
Save