feat(metadata): update metadata for file

Author: nmykhalkevch-exoft

src/app/core/guards/is-file.guard.ts

@@ -3,15 +3,17 @@ import { Store } from '@ngxs/store';
 import { map, switchMap } from 'rxjs/operators';
 
 import { inject } from '@angular/core';
-import { CanMatchFn, Route, UrlSegment } from '@angular/router';
+import { CanMatchFn, Route, Router, UrlSegment } from '@angular/router';
 
 import { CurrentResourceType } from '../../shared/enums';
 import { CurrentResourceSelectors, GetResource } from '../../shared/stores';
 
 export const isFileGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) => {
   const store = inject(Store);
+  const router = inject(Router);
 
   const id = segments[0]?.path;
+  const isMetadataPath = segments[1]?.path === 'metadata';
   if (!id) {
     return false;
   }
@@ -20,7 +22,13 @@ export const isFileGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) =>
 
   if (currentResource && currentResource.id === id) {
     if (currentResource.type === CurrentResourceType.Files) {
-      return true;
+      if (isMetadataPath) {
+        return true;
+      }
+      if (currentResource.parentId) {
+        router.navigate(['/', currentResource.parentId, 'files', id]);
+        return false;
+      }
     }
 
     return currentResource.type === CurrentResourceType.Files;
@@ -34,7 +42,13 @@ export const isFileGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) =>
       }
 
       if (resource.type === CurrentResourceType.Files) {
-        return true;
+        if (isMetadataPath) {
+          return true;
+        }
+        if (resource.parentId) {
+          router.navigate(['/', resource.parentId, 'files', id]);
+          return false;
+        }
       }
       return resource.type === CurrentResourceType.Files;
     })

src/app/features/files/pages/file-detail/file-detail.component.html

@@ -100,7 +100,6 @@
             [cedarFormReadonly]="cedarFormReadonly()"
             (changeTab)="onMetadataTabChange($event)"
             (formSubmit)="onCedarFormSubmit($event)"
-            (cedarFormChangeTemplate)="onCedarFormChangeTemplate()"
             (cedarFormEdit)="onCedarFormEdit()"
           >
             <div class="w-full flex flex-column gap-4 flex-1 -mt-4">

src/app/features/files/pages/file-detail/file-detail.component.ts

@@ -203,7 +203,6 @@ export class FileDetailComponent {
         })) || [];
 
       this.tabs.set([...baseTabs, ...cedarTabs]);
-      // this.handleRouteBasedTabSelection();
     });
 
     this.route.params.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((params) => {
@@ -301,24 +300,21 @@ export class FileDetailComponent {
   }
 
   onCedarFormSubmit(data: CedarRecordDataBinding): void {
-    // const selectedRecord = this.selectedCedarRecord();
-    // if (!this.resourceId || !selectedRecord) return;
-    // if (selectedRecord.id) {
-    //   this.actions
-    //     .updateCedarRecord(data, selectedRecord.id, this.resourceId, this.resourceType())
-    //     .pipe(takeUntilDestroyed(this.destroyRef))
-    //     .subscribe({
-    //       next: () => {
-    //         this.cedarFormReadonly.set(true);
-    //         this.toastService.showSuccess('CEDAR record updated successfully');
-    //         this.actions.getCedarRecords(this.resourceId, this.resourceType());
-    //       },
-    //     });
-    // }
-  }
-
-  onCedarFormChangeTemplate(): void {
-    // this.router.navigate(['add'], { relativeTo: this.activeRoute });
+    const selectedRecord = this.selectedCedarRecord();
+    if (!this.resourceId || !selectedRecord) return;
+    if (selectedRecord.id) {
+      this.actions
+        .updateCedarRecord(data, selectedRecord.id, this.resourceId, ResourceType.File)
+        .pipe(takeUntilDestroyed(this.destroyRef))
+        .subscribe({
+          next: () => {
+            this.cedarFormReadonly.set(true);
+            this.toastService.showSuccess('files.detail.toast.cedarUpdated');
+            const fileId = this.file()?.path.replaceAll('/', '') || '';
+            this.actions.getCedarRecords(fileId, ResourceType.File);
+          },
+        });
+    }
   }
 
   private loadCedarRecord(recordId: string): void {

src/app/features/metadata/mappers/metadata.mapper.ts

@@ -27,6 +27,7 @@ export class MetadataMapper {
         value: identifier.attributes.value,
       })),
       provider: response.embeds?.provider?.data.id,
+      public: response.attributes.public,
     };
   }
 
@@ -65,55 +66,4 @@ export class MetadataMapper {
       },
     };
   }
-
-  // static fromMetadataApiResponse(response: Record<string, unknown>): ProjectOverview {
-  //   const attributes = response['attributes'] as Record<string, unknown>;
-  //   const embeds = response['embeds'] as Record<string, unknown>;
-
-  //   const contributors: ProjectOverviewContributor[] = [];
-  //   if (embeds['contributors']) {
-  //     const contributorsData = (embeds['contributors'] as Record<string, unknown>)['data'] as Record<string, unknown>[];
-  //     contributorsData?.forEach((contributor) => {
-  //       const contributorEmbeds = contributor['embeds'] as Record<string, unknown>;
-  //       const userData = (contributorEmbeds['users'] as Record<string, unknown>)['data'] as Record<string, unknown>;
-  //       const userAttributes = userData['attributes'] as Record<string, unknown>;
-
-  //       contributors.push({
-  //         id: userData['id'] as string,
-  //         type: userData['type'] as string,
-  //         fullName: userAttributes['full_name'] as string,
-  //         givenName: userAttributes['given_name'] as string,
-  //         familyName: userAttributes['family_name'] as string,
-  //         middleName: '',
-  //       });
-  //     });
-  //   }
-
-  //   return {
-  //     id: response['id'] as string,
-  //     type: (response['type'] as string) || 'nodes',
-  //     title: attributes['title'] as string,
-  //     description: attributes['description'] as string,
-  //     category: attributes['category'] as string,
-  //     tags: (attributes['tags'] as string[]) || [],
-  //     dateCreated: attributes['date_created'] as string,
-  //     dateModified: attributes['date_modified'] as string,
-  //     isPublic: attributes['public'] as boolean,
-  //     isRegistration: attributes['registration'] as boolean,
-  //     isPreprint: attributes['preprint'] as boolean,
-  //     isFork: attributes['fork'] as boolean,
-  //     isCollection: attributes['collection'] as boolean,
-  //     accessRequestsEnabled: attributes['access_requests_enabled'] as boolean,
-  //     wikiEnabled: attributes['wiki_enabled'] as boolean,
-  //     currentUserCanComment: attributes['current_user_can_comment'] as boolean,
-  //     currentUserPermissions: (attributes['current_user_permissions'] as string[]) || [],
-  //     currentUserIsContributor: attributes['current_user_is_contributor'] as boolean,
-  //     currentUserIsContributorOrGroupMember: attributes['current_user_is_contributor_or_group_member'] as boolean,
-  //     analyticsKey: '',
-  //     contributors: contributors,
-  //     subjects: Array.isArray(attributes['subjects']) ? attributes['subjects'].flat() : attributes['subjects'],
-  //     forksCount: 0,
-  //     viewOnlyLinksCount: 0,
-  //   } as ProjectOverview;
-  // }
 }

src/app/features/metadata/metadata.component.ts

@@ -154,7 +154,10 @@ export class MetadataComponent implements OnInit {
   });
 
   hideEditDoi = computed(() => {
-    return !!(this.metadata()?.identifiers?.length && this.resourceType() === ResourceType.Project);
+    return (
+      !!(this.metadata()?.identifiers?.length && this.resourceType() === ResourceType.Project) ||
+      !this.metadata()?.public
+    );
   });
 
   constructor() {
@@ -473,7 +476,9 @@ export class MetadataComponent implements OnInit {
         acceptLabelType: 'primary',
         onConfirm: () => {
           this.actions.createDoi(this.resourceId, this.resourceType()).subscribe({
-            next: () => this.toastService.showSuccess('project.metadata.doi.created'),
+            next: () => {
+              this.toastService.showSuccess('project.metadata.doi.created');
+            },
           });
         },
       });

src/app/features/metadata/models/metadata-json-api.model.ts

@@ -22,6 +22,7 @@ export interface MetadataAttributesJsonApi {
   doi?: boolean;
   category?: string;
   node_license?: LicenseRecordJsonApi;
+  public?: boolean;
 }
 
 interface MetadataEmbedsJsonApi {

src/app/features/metadata/models/metadata.model.ts

@@ -20,6 +20,7 @@ export interface Metadata {
     copyrightHolders: string[];
     year: string;
   };
+  public?: boolean;
 }
 
 export interface CustomItemMetadataRecord {

src/app/features/metadata/pages/add-metadata/add-metadata.component.ts

@@ -55,6 +55,7 @@ export class AddMetadataComponent implements OnInit {
   readonly cedarTemplates = select(MetadataSelectors.getCedarTemplates);
   readonly cedarRecords = select(MetadataSelectors.getCedarRecords);
   readonly cedarTemplatesLoading = select(MetadataSelectors.getCedarTemplatesLoading);
+  readonly cedarRecord = select(MetadataSelectors.getCedarRecord);
 
   actions = createDispatchMap({
     getCedarTemplates: GetCedarMetadataTemplates,
@@ -155,6 +156,9 @@ export class AddMetadataComponent implements OnInit {
   createRecordMetadata(data: CedarRecordDataBinding): void {
     const recordId = this.activatedRoute.snapshot.params['recordId'];
 
+    console.log('Creating or updating record metadata:', this.resourceType());
+    console.log('Creating or updating record metadata:', this.resourceId);
+
     if (recordId && this.existingRecord) {
       this.actions
         .updateCedarMetadataRecord(data, recordId, this.resourceId, this.resourceType())
@@ -173,6 +177,7 @@ export class AddMetadataComponent implements OnInit {
           next: () => {
             this.toggleEditMode();
             this.toastService.showSuccess('project.metadata.addMetadata.recordCreatedSuccessfully');
+            this.navigateToRecord(this.resourceId, this.resourceType());
           },
         });
     }
@@ -181,4 +186,15 @@ export class AddMetadataComponent implements OnInit {
   toggleEditMode(): void {
     this.isEditMode = !this.isEditMode;
   }
+
+  private navigateToRecord(resourceId: string, resourceType: ResourceType): void {
+    const recordId = this.cedarRecord()?.data.id;
+    console.log('Navigating to record:', recordId);
+    console.log('Navigating to record:', resourceType);
+    if (resourceType === ResourceType.File) {
+      this.router.navigate([resourceId]);
+    } else {
+      this.router.navigate(['../', recordId], { relativeTo: this.activatedRoute });
+    }
+  }
 }

src/app/features/metadata/services/metadata.service.ts

@@ -4,7 +4,7 @@ import { map } from 'rxjs/operators';
 import { inject, Injectable } from '@angular/core';
 
 import { ResourceType } from '@osf/shared/enums';
-import { LicenseOptions } from '@osf/shared/models';
+import { Identifier, LicenseOptions } from '@osf/shared/models';
 import { JsonApiService } from '@osf/shared/services';
 
 import { CedarRecordsMapper, MetadataMapper } from '../mappers';
@@ -49,7 +49,7 @@ export class MetadataService {
       .pipe(map((response) => MetadataMapper.fromCustomMetadataApiResponse(response)));
   }
 
-  createDoi(resourceId: string, resourceType: ResourceType): Observable<Metadata> {
+  createDoi(resourceId: string, resourceType: ResourceType): Observable<Identifier> {
     const payload = {
       data: {
         type: 'identifiers',
@@ -59,12 +59,10 @@ export class MetadataService {
       },
     };
 
-    return this.jsonApiService
-      .post<MetadataJsonApiResponse>(
-        `${this.apiUrl}/${this.urlMap.get(resourceType)}/${resourceId}/identifiers/`,
-        payload
-      )
-      .pipe(map((response) => MetadataMapper.fromMetadataApiResponse(response.data)));
+    return this.jsonApiService.post(
+      `${this.apiUrl}/${this.urlMap.get(resourceType)}/${resourceId}/identifiers/`,
+      payload
+    );
   }
 
   getFundersList(searchQuery?: string): Observable<CrossRefFundersResponse> {

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

@@ -117,10 +117,11 @@ export class MetadataState {
 
     return this.metadataService.createDoi(action.resourceId, action.resourceType).pipe(
       tap({
-        next: (response) => {
+        next: () => {
           ctx.patchState({
-            metadata: { data: response, isLoading: false, error: null },
+            metadata: { ...ctx.getState().metadata, isLoading: false, error: null },
           });
+          ctx.dispatch(new GetResourceMetadata(action.resourceId, action.resourceType));
         },
       }),
       catchError((error) => handleSectionError(ctx, 'metadata', error))
@@ -213,6 +214,13 @@ export class MetadataState {
   createCedarMetadataRecord(ctx: StateContext<MetadataStateModel>, action: CreateCedarMetadataRecord) {
     return this.metadataService.createMetadataCedarRecord(action.record, action.resourceId, action.resourceType).pipe(
       tap((response: CedarMetadataRecord) => {
+        ctx.patchState({
+          cedarRecord: {
+            data: response,
+            error: null,
+            isLoading: false,
+          },
+        });
         ctx.dispatch(new AddCedarMetadataRecordToState(response.data));
       })
     );