fix(metadata): fixed contributors bug and updated models (#505)

Author: nsemets

src/app/features/files/models/get-resource-short-info-response.model.ts

@@ -1,4 +1,4 @@
-import { ApiData, IdentifiersJsonApiResponse, JsonApiResponse } from '@osf/shared/models';
+import { ApiData, IdentifiersResponseJsonApi, JsonApiResponse } from '@osf/shared/models';
 
 export type GetResourceShortInfoResponse = JsonApiResponse<
  ApiData<
@@ -8,7 +8,7 @@ export type GetResourceShortInfoResponse = JsonApiResponse<
  date_created: string;
  date_modified: string;
  },
- { identifiers: IdentifiersJsonApiResponse },
+ { identifiers: IdentifiersResponseJsonApi },
  null,
  null
  >,

src/app/features/files/models/get-short-info-response.model.ts

@@ -1,4 +1,4 @@
-import { ApiData, IdentifiersJsonApiResponse, JsonApiResponse } from '@shared/models';
+import { ApiData, IdentifiersResponseJsonApi, JsonApiResponse } from '@shared/models';
 
 export type GetShortInfoResponse = JsonApiResponse<
  ApiData<
@@ -8,7 +8,7 @@ export type GetShortInfoResponse = JsonApiResponse<
  date_created: string;
  date_modified: string;
  },
- { identifiers: IdentifiersJsonApiResponse },
+ { identifiers: IdentifiersResponseJsonApi },
  null,
  null
  >,

src/app/features/metadata/dialogs/license-dialog/license-dialog.component.ts

@@ -7,7 +7,7 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 
 import { ChangeDetectionStrategy, Component, inject, OnInit, signal, viewChild } from '@angular/core';
 
-import { Metadata } from '@osf/features/metadata/models';
+import { MetadataModel } from '@osf/features/metadata/models';
 import { LicenseComponent, LoadingSpinnerComponent } from '@osf/shared/components';
 import { LicenseModel, LicenseOptions } from '@shared/models';
 import { LicensesSelectors, LoadAllLicenses } from '@shared/stores/licenses';
@@ -29,7 +29,7 @@ export class LicenseDialogComponent implements OnInit {
 
  selectedLicenseId = signal<string | null>(null);
  selectedLicenseOptions = signal<LicenseOptions | null>(null);
- metadata: Metadata | null = null;
+ metadata: MetadataModel | null = null;
  isSubmitting = signal<boolean>(false);
 
  licenseComponent = viewChild<LicenseComponent>('licenseComponent');

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

@@ -1,9 +1,9 @@
-import { LicensesMapper } from '@osf/shared/mappers';
+import { IdentifiersMapper, LicensesMapper } from '@osf/shared/mappers';
 
-import { CustomItemMetadataRecord, CustomMetadataJsonApi, Metadata, MetadataJsonApi } from '../models';
+import { CustomItemMetadataRecord, CustomMetadataJsonApi, MetadataJsonApi, MetadataModel } from '../models';
 
 export class MetadataMapper {
- static fromMetadataApiResponse(response: MetadataJsonApi): Metadata {
+ static fromMetadataApiResponse(response: MetadataJsonApi): MetadataModel {
  return {
  id: response.id,
  title: response.attributes.title,
@@ -19,12 +19,7 @@ export class MetadataMapper {
  year: response.attributes.node_license.year || '',
  }
  : undefined,
- identifiers: response.embeds?.identifiers?.data.map((identifier) => ({
- id: identifier.id,
- type: identifier.type,
- category: identifier.attributes.category,
- value: identifier.attributes.value,
- })),
+ identifiers: IdentifiersMapper.fromJsonApi(response.embeds?.identifiers),
  provider: response.embeds?.provider?.data.id,
  public: response.attributes.public,
  currentUserPermissions: response.attributes.current_user_permissions,

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

@@ -125,7 +125,7 @@ export class MetadataComponent implements OnInit {
  metadata = select(MetadataSelectors.getResourceMetadata);
  isMetadataLoading = select(MetadataSelectors.getLoading);
  customItemMetadata = select(MetadataSelectors.getCustomItemMetadata);
- contributors = select(ContributorsSelectors.getContributors);
+ bibliographicContributors = select(ContributorsSelectors.getBibliographicContributors);
  isContributorsLoading = select(ContributorsSelectors.isContributorsLoading);
  cedarRecords = select(MetadataSelectors.getCedarRecords);
  cedarTemplates = select(MetadataSelectors.getCedarTemplates);
@@ -186,8 +186,6 @@ export class MetadataComponent implements OnInit {
 
  showRegistrationDoi = computed(() => this.resourceType() === ResourceType.Registration);
 
- bibliographicContributors = computed(() => this.contributors().filter((contributor) => contributor.isBibliographic));
-
  hasWriteAccess = computed(() => {
  const metadata = this.metadata();
  if (!metadata) return false;

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

@@ -1,4 +1,10 @@
-import { ApiData, InstitutionsJsonApiResponse, LicenseDataJsonApi, LicenseRecordJsonApi } from '@osf/shared/models';
+import {
+ ApiData,
+ IdentifiersResponseJsonApi,
+ InstitutionsJsonApiResponse,
+ LicenseDataJsonApi,
+ LicenseRecordJsonApi,
+} from '@osf/shared/models';
 import { UserPermissions } from '@shared/enums';
 
 export interface MetadataJsonApiResponse {
@@ -22,13 +28,11 @@ export interface MetadataAttributesJsonApi {
 }
 
 interface MetadataEmbedsJsonApi {
- identifiers: {
- data: { id: string; type: string; attributes: { category: string; value: string } }[];
- };
+ affiliated_institutions: InstitutionsJsonApiResponse;
+ identifiers: IdentifiersResponseJsonApi;
  license: {
  data: LicenseDataJsonApi;
  };
- affiliated_institutions: InstitutionsJsonApiResponse;
  provider?: {
  data: { id: string; type: string; attributes: { name: string } };
  };

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

@@ -1,7 +1,7 @@
 import { Identifier, Institution, LicenseModel } from '@osf/shared/models';
 import { UserPermissions } from '@shared/enums';
 
-export interface Metadata {
+export interface MetadataModel {
  id: string;
  title: string;
  description: string;

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

@@ -19,7 +19,7 @@ import {
  MetadataJsonApi,
  MetadataJsonApiResponse,
 } from '../models';
-import { CrossRefFundersResponse, CustomItemMetadataRecord, Metadata } from '../models/metadata.model';
+import { CrossRefFundersResponse, CustomItemMetadataRecord, MetadataModel } from '../models/metadata.model';
 
 @Injectable({
  providedIn: 'root',
@@ -127,7 +127,7 @@ export class MetadataService {
  );
  }
 
- getResourceMetadata(resourceId: string, resourceType: ResourceType): Observable<Partial<Metadata>> {
+ getResourceMetadata(resourceId: string, resourceType: ResourceType): Observable<Partial<MetadataModel>> {
  const params = this.getMetadataParams(resourceType);
 
  const baseUrl = `${this.apiUrl}/${this.urlMap.get(resourceType)}/${resourceId}/`;
@@ -141,7 +141,7 @@ export class MetadataService {
  resourceId: string,
  resourceType: ResourceType,
  updates: Partial<BaseNodeAttributesJsonApi>
- ): Observable<Metadata> {
+ ): Observable<MetadataModel> {
  const payload = {
  data: {
  id: resourceId,
@@ -163,7 +163,7 @@ export class MetadataService {
  resourceType: ResourceType,
  licenseId: string,
  licenseOptions?: LicenseOptions
- ): Observable<Metadata> {
+ ): Observable<MetadataModel> {
  const payload = {
  data: {
  id: resourceId,

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

@@ -6,10 +6,10 @@ import {
 } from '@osf/features/metadata/models';
 import { AsyncStateModel } from '@shared/models';
 
-import { CrossRefFunder, Metadata } from '../models';
+import { CrossRefFunder, MetadataModel } from '../models';
 
 export interface MetadataStateModel {
- metadata: AsyncStateModel<Metadata | null>;
+ metadata: AsyncStateModel<MetadataModel | null>;
  customMetadata: AsyncStateModel<CustomItemMetadataRecord | null>;
  fundersList: AsyncStateModel<CrossRefFunder[]>;
  cedarTemplates: AsyncStateModel<CedarMetadataTemplateJsonApi | null>;

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

@@ -6,7 +6,7 @@ import { inject, Injectable } from '@angular/core';
 
 import { handleSectionError } from '@osf/shared/helpers';
 
-import { CedarMetadataRecord, CedarMetadataRecordJsonApi, Metadata } from '../models';
+import { CedarMetadataRecord, CedarMetadataRecordJsonApi, MetadataModel } from '../models';
 import { MetadataService } from '../services';
 
 import {
@@ -48,7 +48,7 @@ export class MetadataState {
  tap((resource) => {
  ctx.patchState({
  metadata: {
- data: resource as Metadata,
+ data: resource as MetadataModel,
  isLoading: false,
  error: null,
  },