Merge pull request #208 from CenterForOpenScience/feat/214

Feat/214 registration components

Author: volodyayakubovskyy

src/app/features/registry/components/registration-links-card/registration-links-card.component.html

@@ -13,6 +13,20 @@ <h2 class="align-self-center">
       </div>
       <div class="flex flex-wrap flex-column lg:flex-nowrap lg:flex-row justify-content-between gap-5">
         <div class="flex gap-3 flex-column w-full">
+          @if (isComponentData() && componentsDataTyped()?.registrationSupplement) {
+            <div class="flex gap-2 align-items-baseline">
+              <strong>{{ 'project.registrations.card.registrationTemplate' | translate }}</strong>
+              <span>{{ componentsDataTyped()!.registrationSupplement }}</span>
+            </div>
+          }
+
+          @if (isComponentData() && componentsDataTyped()?.registry) {
+            <div class="flex gap-2">
+              <strong>{{ 'project.registrations.card.registry' | translate }}</strong>
+              <span>{{ componentsDataTyped()!.registry }}</span>
+            </div>
+          }
+
           <div class="flex gap-2 align-items-baseline">
             <strong>{{ 'project.registrations.card.registered' | translate }}</strong>
             <span>{{ registrationData().dateCreated | date: 'medium' }}</span>
@@ -88,20 +102,18 @@ <h2 class="align-self-center">
           </div>
         </div>
 
-        @if (hasResources()) {
-          <div class="flex flex-column min-w-max">
-            <h3 class="mb-1">{{ 'shared.resources.title' | translate }}</h3>
-            <osf-data-resources
-              [vertical]="true"
-              [resourceId]="registrationData().id"
-              [hasData]="registrationDataTyped()?.hasData"
-              [hasAnalyticCode]="registrationDataTyped()?.hasAnalyticCode"
-              [hasMaterials]="registrationDataTyped()?.hasMaterials"
-              [hasPapers]="registrationDataTyped()?.hasPapers"
-              [hasSupplements]="registrationDataTyped()?.hasSupplements"
-            ></osf-data-resources>
-          </div>
-        }
+        <div class="flex flex-column min-w-max">
+          <h3 class="mb-1">{{ 'shared.resources.title' | translate }}</h3>
+          <osf-data-resources
+            [vertical]="true"
+            [resourceId]="registrationData().id"
+            [hasData]="registrationDataTyped()?.hasData || isComponentData()"
+            [hasAnalyticCode]="registrationDataTyped()?.hasAnalyticCode || isComponentData()"
+            [hasMaterials]="registrationDataTyped()?.hasMaterials || isComponentData()"
+            [hasPapers]="registrationDataTyped()?.hasPapers || isComponentData()"
+            [hasSupplements]="registrationDataTyped()?.hasSupplements || isComponentData()"
+          ></osf-data-resources>
+        </div>
       </div>
     </div>
   }

src/app/features/registry/components/registration-links-card/registration-links-card.component.ts

@@ -6,7 +6,7 @@ import { Card } from 'primeng/card';
 import { DatePipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
 
-import { LinkedNode, LinkedRegistration } from '@osf/features/registry/models';
+import { LinkedNode, LinkedRegistration, RegistryComponentModel } from '@osf/features/registry/models';
 import { DataResourcesComponent, TruncatedTextComponent } from '@shared/components';
 import { RevisionReviewStates } from '@shared/enums';
 
@@ -18,7 +18,8 @@ import { RevisionReviewStates } from '@shared/enums';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class RegistrationLinksCardComponent {
-  readonly registrationData = input.required<LinkedRegistration | LinkedNode>();
+  readonly registrationData = input.required<LinkedRegistration | LinkedNode | RegistryComponentModel>();
+
   readonly updateEmitRegistrationData = output<string>();
   readonly reviewEmitRegistrationData = output<string>();
 
@@ -29,16 +30,18 @@ export class RegistrationLinksCardComponent {
     return 'reviewsState' in data;
   });
 
+  protected readonly isComponentData = computed(() => {
+    const data = this.registrationData();
+    return 'registrationSupplement' in data;
+  });
+
   protected readonly registrationDataTyped = computed(() => {
     const data = this.registrationData();
     return this.isRegistrationData() ? (data as LinkedRegistration) : null;
   });
 
-  protected readonly hasResources = computed(() => {
-    const regData = this.registrationDataTyped();
-    if (!regData) return false;
-    return (
-      regData.hasData || regData.hasAnalyticCode || regData.hasMaterials || regData.hasPapers || regData.hasSupplements
-    );
+  protected readonly componentsDataTyped = computed(() => {
+    const data = this.registrationData();
+    return this.isComponentData() ? (data as RegistryComponentModel) : null;
   });
 }

src/app/features/registry/mappers/index.ts

@@ -3,6 +3,7 @@ export * from './bibliographic-contributors.mapper';
 export * from './cedar-form.mapper';
 export * from './linked-nodes.mapper';
 export * from './linked-registrations.mapper';
+export * from './registry-components.mapper';
 export * from './registry-metadata.mapper';
 export * from './registry-overview.mapper';
 export * from './registry-resource.mapper';

src/app/features/registry/mappers/registry-components.mapper.ts

@@ -0,0 +1,23 @@
+import { RegistryComponentModel } from '../models/registry-components.models';
+import { RegistryComponentJsonApi } from '../models/registry-components-json-api.model';
+
+export class RegistryComponentsMapper {
+  static fromApiResponse(apiComponent: RegistryComponentJsonApi): RegistryComponentModel {
+    return {
+      id: apiComponent.id,
+      title: apiComponent.attributes.title,
+      description: apiComponent.attributes.description,
+      category: apiComponent.attributes.category,
+      dateCreated: apiComponent.attributes.date_created,
+      dateModified: apiComponent.attributes.date_modified,
+      dateRegistered: apiComponent.attributes.date_registered,
+      registrationSupplement: apiComponent.attributes.registration_supplement,
+      tags: apiComponent.attributes.tags,
+      isPublic: apiComponent.attributes.public,
+    };
+  }
+
+  static fromApiResponseArray(apiComponents: RegistryComponentJsonApi[]): RegistryComponentModel[] {
+    return apiComponents.map(this.fromApiResponse);
+  }
+}

src/app/features/registry/mappers/registry-overview.mapper.ts

@@ -60,6 +60,7 @@ export function MapRegistryOverview(data: RegistryOverviewJsonApiData): Registry
       revisionResponses: schemaResponse.attributes?.revision_responses,
       updatedResponseKeys: schemaResponse.attributes?.updated_response_keys,
     })),
+    registry: data.embeds.provider.data.attributes.name,
     status: MapRegistryStatus(data.attributes),
     revisionStatus: data.attributes.revision_state,
     reviewsState: data.attributes.reviews_state,

src/app/features/registry/models/get-registry-overview-json-api.model.ts

@@ -114,6 +114,13 @@ export interface RegistryOverviewJsonApiEmbed {
       };
     }[];
   };
+  provider: {
+    data: {
+      attributes: {
+        name: string;
+      };
+    };
+  };
 }
 
 export interface RegistryOverviewJsonApiRelationships {

src/app/features/registry/models/index.ts

@@ -7,6 +7,8 @@ export * from './linked-nodes.models';
 export * from './linked-nodes-json-api.model';
 export * from './linked-registrations-json-api.model';
 export * from './linked-response.models';
+export * from './registry-components.models';
+export * from './registry-components-json-api.model';
 export * from './registry-contributor-json-api.model';
 export * from './registry-institution.model';
 export * from './registry-institutions-json-api.model';

src/app/features/registry/models/registry-components-json-api.model.ts

@@ -0,0 +1,30 @@
+import { RegistryComponentModel } from './registry-components.models';
+
+export interface RegistryComponentJsonApi {
+  id: string;
+  type: string;
+  attributes: {
+    title: string;
+    description: string;
+    category: string;
+    date_created: string;
+    date_modified: string;
+    date_registered: string;
+    registration_supplement: string;
+    tags: string[];
+    public: boolean;
+  };
+}
+
+export interface RegistryComponentsJsonApiResponse {
+  data: RegistryComponentJsonApi[];
+  meta: {
+    total: number;
+    per_page: number;
+  };
+}
+
+export interface RegistryComponentsResponseJsonApi {
+  data: RegistryComponentModel[];
+  meta: { total: number; per_page: number };
+}

src/app/features/registry/models/registry-components.models.ts

@@ -0,0 +1,17 @@
+import { NodeBibliographicContributor } from './bibliographic-contributors.models';
+
+export interface RegistryComponentModel {
+  id: string;
+  title: string;
+  description: string;
+  category: string;
+  dateCreated: string;
+  dateModified: string;
+  dateRegistered: string;
+  registrationSupplement: string;
+  tags: string[];
+  isPublic: boolean;
+  contributorsCount?: number;
+  contributors?: NodeBibliographicContributor[];
+  registry?: string;
+}

src/app/features/registry/models/registry-overview.models.ts

@@ -16,6 +16,7 @@ export interface RegistryOverview {
   registrationType: string;
   doi: string;
   tags: string[];
+  registry?: string;
   contributors: ProjectOverviewContributor[];
   citation: string;
   category: string;