fix(move-file-dialog): fixed toasts

Author: opaduchak

src/app/features/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.ts

@@ -4,7 +4,6 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core';
 
 import { Button } from 'primeng/button';
 import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
-import { ScrollerModule } from 'primeng/scroller';
 
 import { finalize, forkJoin, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
@@ -21,7 +20,7 @@ import { FileModel } from '@shared/models/files/file.model';
 
 @Component({
   selector: 'osf-move-file-dialog',
-  imports: [Button, TranslatePipe, ScrollerModule],
+  imports: [Button, TranslatePipe],
   templateUrl: './confirm-move-file-dialog.component.html',
   styleUrl: './confirm-move-file-dialog.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -82,7 +81,7 @@ export class ConfirmMoveFileDialogComponent {
             if (error.status === 409) {
               conflictFiles.push({ file, link });
             } else {
-              this.toastService.showError(error.error?.message ?? 'Error');
+              this.showErrorToast(action, error.error?.message);
             }
             return of(null);
           }),
@@ -92,7 +91,7 @@ export class ConfirmMoveFileDialogComponent {
               if (conflictFiles.length > 0) {
                 this.openReplaceMoveDialog(conflictFiles, path, action);
               } else {
-                this.showToast(action);
+                this.showSuccessToast(action);
                 this.config.header = this.translateService.instant('files.dialogs.moveFile.title');
                 this.completeMove();
               }
@@ -124,26 +123,31 @@ export class ConfirmMoveFileDialogComponent {
         );
         forkJoin(replaceRequests$).subscribe({
           next: () => {
-            this.showToast(action);
+            this.showSuccessToast(action);
             this.completeMove();
           },
         });
       },
       onReject: () => {
         const totalFiles = this.config.data.files.length;
         if (totalFiles > conflictFiles.length) {
-          this.showToast(action);
+          this.showErrorToast(action);
         }
         this.completeMove();
       },
     });
   }
 
-  private showToast(action: string): void {
+  private showSuccessToast(action: string) {
     const messageType = action === 'move' ? 'moveFile' : 'copyFile';
     this.toastService.showSuccess(`files.dialogs.${messageType}.success`);
   }
 
+  private showErrorToast(action: string, errorMessage?: string) {
+    const messageType = action === 'move' ? 'moveFile' : 'copyFile';
+    this.toastService.showError(errorMessage ?? `files.dialogs.${messageType}.error`);
+  }
+
   private completeMove(): void {
     this.dialogRef.close(true);
   }

src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts

@@ -211,7 +211,7 @@ export class MoveFileDialogComponent {
             if (error.status === 409) {
               conflictFiles.push({ file, link });
             } else {
-              this.toastService.showError(error.error?.message ?? 'Error');
+              this.showErrorToast(action, error.error?.message ?? 'Error');
             }
             return of(null);
           }),
@@ -221,7 +221,7 @@ export class MoveFileDialogComponent {
               if (conflictFiles.length > 0) {
                 this.openReplaceMoveDialog(conflictFiles, path, action);
               } else {
-                this.showToast(action);
+                this.showSuccessToast(action);
                 this.config.header = this.translateService.instant('files.dialogs.moveFile.title');
                 this.completeMove();
               }
@@ -254,26 +254,31 @@ export class MoveFileDialogComponent {
 
         forkJoin(replaceRequests$).subscribe({
           next: () => {
-            this.showToast(action);
+            this.showSuccessToast(action);
             this.completeMove();
           },
         });
       },
       onReject: () => {
         const totalFiles = this.config.data.files.length;
         if (totalFiles > conflictFiles.length) {
-          this.showToast(action);
+          this.showErrorToast(action);
         }
         this.completeMove();
       },
     });
   }
 
-  private showToast(action: string): void {
+  private showSuccessToast(action: string) {
     const messageType = action === 'move' ? 'moveFile' : 'copyFile';
     this.toastService.showSuccess(`files.dialogs.${messageType}.success`);
   }
 
+  private showErrorToast(action: string, errorMessage?: string) {
+    const messageType = action === 'move' ? 'moveFile' : 'copyFile';
+    this.toastService.showError(errorMessage ?? `files.dialogs.${messageType}.error`);
+  }
+
   private completeMove(): void {
     this.isFilesUpdating.set(false);
     this.actions.setCurrentFolder(this.initialFolder);

src/assets/i18n/en.json

@@ -1163,6 +1163,7 @@
         "pathError": "Path is not specified!",
         "success": "Successfully moved.",
         "noMovePermission": "Cannot move or copy to this file provider",
+        "error": "Failed to move or copy files, please try again later",
         "movingHeader": "Moving...",
         "copingHeader": "Copying..."
       },