Pull request #98: RED-962: Improve file overwrite dialog

Merge in RED/ui from RED-962 to master

* commit 'db3050abe82308d95a2cb2f1ad1e4aa9de9e115d':
  Improve file overwrite dialog

apps/red-ui/src/app/dialogs/dialog.service.ts

@@ -333,7 +333,7 @@ export class DialogService {
         return ref;
     }
 
-    openOverwriteFileDialog(filename: string): Promise<{ option?: 'overwrite' | 'no-overwrite'; remember?: boolean; cancel?: boolean }> {
+    openOverwriteFileDialog(filename: string): Promise<{ option?: 'overwrite' | 'skip'; remember?: boolean; cancel?: boolean }> {
         const ref = this._dialog.open(OverwriteFilesDialogComponent, {
             ...dialogConfig,
             data: filename

apps/red-ui/src/app/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.html

@@ -3,15 +3,15 @@
 
     <div class="dialog-content">
         <p [innerHTML]="'overwrite-files-dialog.question' | translate: { filename: filename }"></p>
-
-        <mat-checkbox [checked]="remember" (change)="remember = !remember" color="primary">
-            {{ 'overwrite-files-dialog.options.remember' | translate }}
-        </mat-checkbox>
     </div>
 
     <div class="dialog-actions">
+        <mat-checkbox [checked]="remember" (change)="remember = !remember" color="primary" class="flex-1">
+            {{ 'overwrite-files-dialog.options.remember' | translate }}
+        </mat-checkbox>
+
         <div class="all-caps-label primary pointer" (click)="selectOption('overwrite')" translate="overwrite-files-dialog.options.overwrite"></div>
-        <div class="all-caps-label primary pointer" (click)="selectOption('no-overwrite')" translate="overwrite-files-dialog.options.no-overwrite"></div>
+        <div class="all-caps-label primary pointer" (click)="selectOption('skip')" translate="overwrite-files-dialog.options.skip"></div>
         <div class="all-caps-label cancel" (click)="cancel()" translate="overwrite-files-dialog.options.cancel"></div>
     </div>
 </section>

apps/red-ui/src/app/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.scss

@@ -1,7 +1,3 @@
-mat-checkbox {
-    margin-top: 16px;
-}
-
 .dialog-actions > div:not(:last-child) {
     margin-right: 32px;
 }

apps/red-ui/src/app/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.ts

@@ -22,7 +22,7 @@ export class OverwriteFilesDialogComponent implements OnInit {
         this.dialogRef.close();
     }
 
-    selectOption(option: 'overwrite' | 'no-overwrite') {
+    selectOption(option: 'overwrite' | 'skip') {
         this.dialogRef.close({ option, remember: this.remember });
     }
 }

apps/red-ui/src/app/upload-download/file-upload.service.ts

@@ -45,7 +45,7 @@ export class FileUploadService {
         const maxSizeMB = this._appConfigService.getConfig(AppConfigKey.MAX_FILE_SIZE_MB, 50);
         const maxSizeBytes = maxSizeMB * 1024 * 1024;
         const projectFiles = this._appStateService.activeProject.files;
-        let option: 'overwrite' | 'no-overwrite' | undefined;
+        let option: 'overwrite' | 'skip' | undefined;
         for (let idx = 0; idx < files.length; ++idx) {
             const file = files[idx];
             let currentOption = option;
@@ -59,7 +59,7 @@ export class FileUploadService {
                     option = res.remember ? currentOption : undefined;
                 }
 
-                if (currentOption === 'no-overwrite') {
+                if (currentOption === 'skip') {
                     files.splice(idx, 1);
                     --idx;
                     continue;

apps/red-ui/src/assets/i18n/en.json

@@ -723,9 +723,9 @@
         "question": "<b>{{filename}}</b> already exists. What do you want to do?",
         "options": {
             "overwrite": "Overwrite",
-            "no-overwrite": "Keep old file",
-            "cancel": "Cancel all uploads",
-            "remember": "Remember option"
+            "skip": "Skip",
+            "cancel": "Cancel",
+            "remember": "Apply for all uploads"
         }
     }
 }