resolve CR comments

Author: mkovalua

src/app/features/files/pages/files/files.component.html

@@ -145,7 +145,6 @@
       (unselectFile)="onFileTreeUnselected($event)"
       (clearSelection)="onClearSelection()"
       (entryFileClicked)="navigateToFile($event)"
-      (deleteEntryAction)="deleteEntry($event)"
       (renameEntryAction)="renameEntry($event)"
       (uploadFilesConfirmed)="uploadFiles($event)"
       (loadFiles)="onLoadFiles($event)"

src/app/features/registries/components/custom-step/custom-step.component.html

@@ -168,7 +168,7 @@ <h3 class="mb-2">{{ 'files.actions.uploadFile' | translate }}</h3>
                     [label]="file.name"
                     severity="info"
                     removable="true"
-                    (onRemove)="removeFromAttachedFiles(file, q.responseKey!)"
+                    (onRemove)="removeFromAttachedFiles(file.file_id, q.responseKey!)"
                   />
                 }
               </div>
@@ -181,8 +181,7 @@ <h3 class="mb-2">{{ 'files.actions.uploadFile' | translate }}</h3>
                   (attachFile)="onAttachFile($event, q.responseKey!)"
                   (openFile)="onOpenFile($event)"
                   [filesViewOnly]="filesViewOnly()"
-                  [isDraftResource]="true"
-                  (removeFromAttachedFiles)="removeFromAttachedFiles($event, 'uploader')"
+                  (removeFromAttachedFiles)="removeFromAttachedFiles($event, q.responseKey!)"
                 ></osf-files-control>
               </div>
             }

src/app/features/registries/components/custom-step/custom-step.component.ts

@@ -143,12 +143,12 @@ export class CustomStepComponent implements OnDestroy {
     }
   }
 
-  removeFromAttachedFiles(file: AttachedFile, questionKey: string): void {
+  removeFromAttachedFiles(fileId: string | undefined, questionKey: string): void {
     if (!this.attachedFiles[questionKey]) {
       return;
     }
 
-    this.attachedFiles[questionKey] = this.attachedFiles[questionKey].filter((f) => f.file_id !== file.file_id);
+    this.attachedFiles[questionKey] = this.attachedFiles[questionKey].filter((f) => f.file_id !== fileId);
     this.stepForm.patchValue({ [questionKey]: this.attachedFiles[questionKey] });
     this.updateAction.emit({
       [questionKey]: this.mapFilesToPayload(this.attachedFiles[questionKey]),

src/app/features/registries/components/files-control/files-control.component.html

@@ -51,9 +51,6 @@
       [resourceId]="projectId()"
       [provider]="provider()"
       [selectedFiles]="filesSelection"
-      [isDraftResource]="isDraftResource()"
-      (deleteEntryAction)="deleteEntry($event)"
-      (removeFromAttachedFiles)="onRemoveFromAttachedFiles($event)"
       (selectFile)="onFileTreeSelected($event)"
       (entryFileClicked)="onEntryFileClicked($event)"
       (uploadFilesConfirmed)="uploadFiles($event)"

src/app/features/registries/components/files-control/files-control.component.ts

@@ -8,7 +8,7 @@ import { Button } from 'primeng/button';
 import { filter, finalize, switchMap, take } from 'rxjs';
 
 import { HttpEventType } from '@angular/common/http';
-import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, input, output, signal } from '@angular/core';
+import { ChangeDetectionStrategy, Component, DestroyRef, inject, input, output, signal } from '@angular/core';
 import { takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop';
 
 import { CreateFolderDialogComponent } from '@osf/features/files/components';
@@ -54,9 +54,8 @@ export class FilesControlComponent {
   projectId = input.required<string>();
   provider = input.required<string>();
   filesViewOnly = input<boolean>(false);
-  isDraftResource = input<boolean>(false);
   attachFile = output<FileModel>();
-  removeFromAttachedFiles = output<FileModel>();
+  removeFromAttachedFiles = output<string>();
   openFile = output<FileModel>();
 
   private readonly filesService = inject(FilesService);
@@ -72,7 +71,6 @@ export class FilesControlComponent {
   readonly progress = signal(0);
   readonly fileName = signal('');
   readonly dataLoaded = signal(false);
-  pageNumber = signal(1);
 
   fileIsUploading = signal(false);
   filesSelection: FileModel[] = [];
@@ -89,31 +87,13 @@ export class FilesControlComponent {
   constructor() {
     this.setupRootFoldersLoader();
     this.setupCurrentFolderWatcher();
-
-    effect(() => {
-      const currentFolder = this.currentFolder();
-      if (currentFolder) {
-        this.pageNumber.set(1);
-        this.updateFilesList();
-      }
-    });
   }
 
-  updateFilesList = (): void => {
-    const currentFolder = this.currentFolder();
-    const filesLink = currentFolder?.links.filesLink;
-    if (filesLink) {
-      this.actions.getFiles(filesLink, this.pageNumber());
-    }
-  };
-
   deleteEntry(file: FileModel): void {
     this.actions.deleteEntry(file?.links.delete).subscribe(() => {
       this.toastService.showSuccess('files.dialogs.deleteFile.success');
-      this.updateFilesList();
-      if (this.isDraftResource()) {
-        this.removeFromAttachedFiles.emit(file);
-      }
+      this.refreshFilesList();
+      this.removeFromAttachedFiles.emit(file.id);
     });
   }
 
@@ -200,10 +180,6 @@ export class FilesControlComponent {
     this.filesSelection = [...new Set(this.filesSelection)];
   }
 
-  onRemoveFromAttachedFiles(file: FileModel) {
-    this.removeFromAttachedFiles.emit(file);
-  }
-
   onLoadFiles(event: { link: string; page: number }) {
     this.actions.getFiles(event.link, event.page);
   }

src/app/shared/components/files-tree/files-tree.component.html

@@ -101,9 +101,9 @@
                     severity="danger"
                     text
                     rounded
-                    [pTooltip]="'Delete'"
+                    [pTooltip]="'common.buttons.cancel' | translate"
                     tooltipPosition="top"
-                    (onClick)="deleteFile(file)"
+                    (onClick)="deleteEntry(file)"
                     osfStopPropagation
                   />
                 }

src/app/shared/components/files-tree/files-tree.component.ts

@@ -4,7 +4,7 @@ import { TranslatePipe } from '@ngx-translate/core';
 
 import { PrimeTemplate, TreeNode } from 'primeng/api';
 import { Button } from 'primeng/button';
-import { TooltipModule } from 'primeng/tooltip';
+import { Tooltip } from 'primeng/tooltip';
 import { Tree, TreeLazyLoadEvent, TreeNodeDropEvent, TreeNodeSelectEvent } from 'primeng/tree';
 
 import { Clipboard } from '@angular/cdk/clipboard';
@@ -69,7 +69,7 @@ type FileTreeNode = FileModel & TreeNode;
     FileMenuComponent,
     StopPropagationDirective,
     Button,
-    TooltipModule,
+    Tooltip,
   ],
   templateUrl: './files-tree.component.html',
   styleUrl: './files-tree.component.scss',
@@ -270,10 +270,6 @@ export class FilesTreeComponent implements OnDestroy, AfterViewInit {
     this.clearSelection.emit();
   }
 
-  deleteFile(file: FileModel) {
-    this.deleteEntry(file);
-  }
-
   onFileMenuAction(action: FileMenuAction, file: FileModel): void {
     const { value, data } = action;