Commit 52a9c44afb3a3d76da94fdae722478cb7bc653aa

Authored by Andrii Shvaika
2 parents e47e36f1 950f739f

Merge branch 'improvement/device-profile/credentials' of https://github.com/vvll…

…add28/thingsboard into merge-issue-fix
@@ -148,6 +148,7 @@ export class DeviceCredentialsComponent implements ControlValueAccessor, OnInit, @@ -148,6 +148,7 @@ export class DeviceCredentialsComponent implements ControlValueAccessor, OnInit,
148 } else { 148 } else {
149 this.deviceCredentialsFormGroup.enable({emitEvent: false}); 149 this.deviceCredentialsFormGroup.enable({emitEvent: false});
150 this.updateValidators(); 150 this.updateValidators();
  151 + this.deviceCredentialsFormGroup.updateValueAndValidity();
151 } 152 }
152 } 153 }
153 154
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 <mat-step [stepControl]="credentialsFormGroup" [optional]="true"> 155 <mat-step [stepControl]="credentialsFormGroup" [optional]="true">
156 <ng-template matStepLabel>{{ 'device.credentials' | translate }}</ng-template> 156 <ng-template matStepLabel>{{ 'device.credentials' | translate }}</ng-template>
157 <form [formGroup]="credentialsFormGroup" style="padding-bottom: 16px;"> 157 <form [formGroup]="credentialsFormGroup" style="padding-bottom: 16px;">
158 - <mat-checkbox style="padding-bottom: 16px;" formControlName="setCredential">{{ 'device.wizard.add-credential' | translate }}</mat-checkbox> 158 + <mat-checkbox style="padding-bottom: 16px;" formControlName="setCredential">{{ 'device.wizard.add-credentials' | translate }}</mat-checkbox>
159 <tb-device-credentials 159 <tb-device-credentials
160 [fxShow]="credentialsFormGroup.get('setCredential').value" 160 [fxShow]="credentialsFormGroup.get('setCredential').value"
161 formControlName="credential"> 161 formControlName="credential">
@@ -923,7 +923,7 @@ @@ -923,7 +923,7 @@
923 "existing-device-profile": "Vybrat existující profil zařízení", 923 "existing-device-profile": "Vybrat existující profil zařízení",
924 "specific-configuration": "Specifická konfigurace", 924 "specific-configuration": "Specifická konfigurace",
925 "customer-to-assign-device": "Přiřadit zařízení zákazníkovi", 925 "customer-to-assign-device": "Přiřadit zařízení zákazníkovi",
926 - "add-credential": "Přidat přístupový údaj" 926 + "add-credentials": "Přidat přístupový údaj"
927 } 927 }
928 }, 928 },
929 "device-profile": { 929 "device-profile": {
@@ -1000,7 +1000,7 @@ @@ -1000,7 +1000,7 @@
1000 "existing-device-profile": "Select existing device profile", 1000 "existing-device-profile": "Select existing device profile",
1001 "specific-configuration": "Specific configuration", 1001 "specific-configuration": "Specific configuration",
1002 "customer-to-assign-device": "Customer to assign the device", 1002 "customer-to-assign-device": "Customer to assign the device",
1003 - "add-credential": "Add credential" 1003 + "add-credentials": "Add credentials"
1004 }, 1004 },
1005 "unassign-devices-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 device} other {# devices} }?", 1005 "unassign-devices-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 device} other {# devices} }?",
1006 "unassign-devices-from-edge-text": "After the confirmation all selected devices will be unassigned and won't be accessible by the edge." 1006 "unassign-devices-from-edge-text": "After the confirmation all selected devices will be unassigned and won't be accessible by the edge."
@@ -947,7 +947,7 @@ @@ -947,7 +947,7 @@
947 "existing-device-profile": "Seleccionar un perfil existente", 947 "existing-device-profile": "Seleccionar un perfil existente",
948 "specific-configuration": "Configuración específica", 948 "specific-configuration": "Configuración específica",
949 "customer-to-assign-device": "Cliente al que asignar el dispositivo", 949 "customer-to-assign-device": "Cliente al que asignar el dispositivo",
950 - "add-credential": "Añadir credencial" 950 + "add-credentials": "Añadir credencial"
951 }, 951 },
952 "assign-device-to-edge-text": "Seleccione los dispositivos para asignar al borde", 952 "assign-device-to-edge-text": "Seleccione los dispositivos para asignar al borde",
953 "unassign-device-from-edge-title": "¿Está seguro de que desea desasignar el dispositivo '{{deviceName}}'?", 953 "unassign-device-from-edge-title": "¿Está seguro de que desea desasignar el dispositivo '{{deviceName}}'?",
@@ -920,7 +920,7 @@ @@ -920,7 +920,7 @@
920 "existing-device-profile": "기존 장치 프로파일 선택", 920 "existing-device-profile": "기존 장치 프로파일 선택",
921 "specific-configuration": "특수 설정", 921 "specific-configuration": "특수 설정",
922 "customer-to-assign-device": "장치에 할당할 커스터머", 922 "customer-to-assign-device": "장치에 할당할 커스터머",
923 - "add-credential": "크리덴셜 추가" 923 + "add-credentials": "크리덴셜 추가"
924 } 924 }
925 }, 925 },
926 "device-profile": { 926 "device-profile": {
@@ -920,7 +920,7 @@ @@ -920,7 +920,7 @@
920 "existing-device-profile": "Select existing device profile", 920 "existing-device-profile": "Select existing device profile",
921 "specific-configuration": "Specific configuration", 921 "specific-configuration": "Specific configuration",
922 "customer-to-assign-device": "Customer to assign the device", 922 "customer-to-assign-device": "Customer to assign the device",
923 - "add-credential": "Add credential" 923 + "add-credentials": "Add credentials"
924 } 924 }
925 }, 925 },
926 "device-profile": { 926 "device-profile": {
@@ -1079,7 +1079,7 @@ @@ -1079,7 +1079,7 @@
1079 "view-credentials": "查看凭据", 1079 "view-credentials": "查看凭据",
1080 "view-devices": "查看设备", 1080 "view-devices": "查看设备",
1081 "wizard": { 1081 "wizard": {
1082 - "add-credential": "添加凭据", 1082 + "add-credentials": "添加凭据",
1083 "customer-to-assign-device": "客户分配设备", 1083 "customer-to-assign-device": "客户分配设备",
1084 "device-details": "设备详细信息", 1084 "device-details": "设备详细信息",
1085 "device-wizard": "设备向导", 1085 "device-wizard": "设备向导",