resolve CR comments

Author: mkovalua

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

@@ -181,7 +181,6 @@ <h3 class="mb-2">{{ 'files.actions.uploadFile' | translate }}</h3>
                   (attachFile)="onAttachFile($event, q.responseKey!)"
                   (openFile)="onOpenFile($event)"
                   [filesViewOnly]="filesViewOnly()"
-                  [isDraftResource]="true"
                   (removeFromAttachedFiles)="removeFromAttachedFiles($event, q.responseKey!)"
                 ></osf-files-control>
               </div>

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

@@ -51,7 +51,7 @@
       [resourceId]="projectId()"
       [provider]="provider()"
       [selectedFiles]="filesSelection"
-      [isDraftResource]="isDraftResource()"
+      [isDraftResource]="true"
       (deleteEntryAction)="deleteEntry($event)"
       (selectFile)="onFileTreeSelected($event)"
       (entryFileClicked)="onEntryFileClicked($event)"

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

@@ -12,7 +12,6 @@ import { ChangeDetectionStrategy, Component, DestroyRef, inject, input, output,
 import { takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop';
 
 import { CreateFolderDialogComponent } from '@osf/features/files/components';
-import { DeleteEntry } from '@osf/features/files/store';
 import { FileUploadDialogComponent } from '@osf/shared/components/file-upload-dialog/file-upload-dialog.component';
 import { FilesTreeComponent } from '@osf/shared/components/files-tree/files-tree.component';
 import { LoadingSpinnerComponent } from '@osf/shared/components/loading-spinner/loading-spinner.component';
@@ -26,6 +25,7 @@ import { FileFolderModel } from '@shared/models/files/file-folder.model';
 
 import {
   CreateFolder,
+  DeleteDraftRegistrationFiles,
   GetFiles,
   GetRootFolders,
   RegistriesSelectors,
@@ -54,7 +54,6 @@ export class FilesControlComponent {
   projectId = input.required<string>();
   provider = input.required<string>();
   filesViewOnly = input<boolean>(false);
-  isDraftResource = input<boolean>(false);
   attachFile = output<FileModel>();
   removeFromAttachedFiles = output<string>();
   openFile = output<FileModel>();
@@ -82,7 +81,7 @@ export class FilesControlComponent {
     setFilesIsLoading: SetFilesIsLoading,
     setCurrentFolder: SetRegistriesCurrentFolder,
     getRootFolders: GetRootFolders,
-    deleteEntry: DeleteEntry,
+    deleteDraftRegistrationFiles: DeleteDraftRegistrationFiles,
   });
 
   constructor() {
@@ -91,7 +90,7 @@ export class FilesControlComponent {
   }
 
   deleteEntry(file: FileModel): void {
-    this.actions.deleteEntry(file?.links.delete).subscribe(() => {
+    this.actions.deleteDraftRegistrationFiles(file?.links.delete).subscribe(() => {
       this.toastService.showSuccess('files.dialogs.deleteFile.success');
       this.refreshFilesList();
       this.removeFromAttachedFiles.emit(file.id);

src/app/features/registries/store/handlers/files.handlers.ts

@@ -7,7 +7,7 @@ import { inject, Injectable } from '@angular/core';
 import { handleSectionError } from '@osf/shared/helpers/state-error.handler';
 import { FilesService } from '@osf/shared/services/files.service';
 
-import { CreateFolder, GetFiles, GetRootFolders } from '../registries.actions';
+import { CreateFolder, DeleteDraftRegistrationFiles, GetFiles, GetRootFolders } from '../registries.actions';
 import { RegistriesStateModel } from '../registries.model';
 
 @Injectable()
@@ -70,4 +70,13 @@ export class FilesHandlers {
       .createFolder(action.newFolderLink, action.folderName)
       .pipe(finalize(() => ctx.patchState({ files: { ...state.files, isLoading: false, error: null } })));
   }
+
+  deleteDraftRegistrationFiles(ctx: StateContext<RegistriesStateModel>, action: DeleteDraftRegistrationFiles) {
+    const state = ctx.getState();
+    ctx.patchState({ files: { ...state.files, isLoading: true, error: null } });
+
+    return this.filesService
+      .deleteEntry(action.link)
+      .pipe(finalize(() => ctx.patchState({ files: { ...state.files, isLoading: false, error: null } })));
+  }
 }

src/app/features/registries/store/registries.actions.ts

@@ -135,6 +135,12 @@ export class GetFiles {
   ) {}
 }
 
+export class DeleteDraftRegistrationFiles {
+  static readonly type = '[Registries] Delete Draft Registration Files';
+
+  constructor(public link: string) {}
+}
+
 export class SetFilesIsLoading {
   static readonly type = '[Registries] Set Files Loading';
 

src/app/features/registries/store/registries.state.ts

@@ -23,6 +23,7 @@ import {
   CreateFolder,
   CreateSchemaResponse,
   DeleteDraft,
+  DeleteDraftRegistrationFiles,
   DeleteSchemaResponse,
   FetchAllSchemaResponses,
   FetchDraft,
@@ -351,6 +352,11 @@ export class RegistriesState {
     return this.filesHandlers.getProjectFiles(ctx, { filesLink, page });
   }
 
+  @Action(DeleteDraftRegistrationFiles)
+  deleteDraftRegistrationFiles(ctx: StateContext<RegistriesStateModel>, action: DeleteDraftRegistrationFiles) {
+    return this.filesHandlers.deleteDraftRegistrationFiles(ctx, action);
+  }
+
   @Action(GetRootFolders)
   getRootFolders(ctx: StateContext<RegistriesStateModel>, action: GetRootFolders) {
     return this.filesHandlers.getRootFolders(ctx, action);