Merge branch 'rc'

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

@@ -25,7 +25,9 @@ import { DeviceCredentials, DeviceProfileInfo, DeviceTransportType } from '@shar
 import { DialogComponent } from '@shared/components/dialog.component';
 import { Router } from '@angular/router';
 import { DeviceProfileService } from '@core/http/device-profile.service';
-import { forkJoin } from 'rxjs';
+import { forkJoin, throwError } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+import { HttpStatusCode } from '@angular/common/http';
 
 export interface DeviceCredentialsDialogData {
   isReadOnly: boolean;
@@ -102,7 +104,16 @@ export class DeviceCredentialsDialogComponent extends
     this.submitted = true;
     const deviceCredentialsValue = this.deviceCredentialsFormGroup.value.credential;
     this.deviceCredentials = {...this.deviceCredentials, ...deviceCredentialsValue};
-    this.deviceService.saveDeviceCredentials(this.deviceCredentials).subscribe(
+    this.deviceService.saveDeviceCredentials(this.deviceCredentials)
+      .pipe(
+        catchError((err) => {
+          if (err.status === HttpStatusCode.Conflict) {
+            return this.deviceService.getDeviceCredentials(this.deviceCredentials.deviceId.id);
+          }
+          return throwError(() => err);
+        })
+      )
+      .subscribe(
       (deviceCredentials) => {
         this.dialogRef.close(deviceCredentials);
       }

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -1211,7 +1211,7 @@
         "layout-type-default": "Default",
         "layout-type-scada": "SCADA",
         "layout-type-divider": "Divider",
-        "layout-settings-type": "Layout settings: {{ type }}",
+        "layout-settings-type": "Layout settings: {{ type }} breakpoint",
         "columns-count": "Columns count",
         "columns-count-required": "Columns count is required.",
         "min-columns-count-message": "Only 10 minimum column count is allowed.",