+
}
diff --git a/src/app/shared/components/registration-card/registration-card.component.ts b/src/app/shared/components/registration-card/registration-card.component.ts
index 50215f611..da9d97996 100644
--- a/src/app/shared/components/registration-card/registration-card.component.ts
+++ b/src/app/shared/components/registration-card/registration-card.component.ts
@@ -7,18 +7,23 @@ import { DatePipe } from '@angular/common';
import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
import { RouterLink } from '@angular/router';
-import { RegistryStatus } from '@osf/shared/enums';
+import { RegistryStatus, RevisionReviewStates } from '@osf/shared/enums';
import { RegistrationCard } from '@osf/shared/models';
+import { DataResourcesComponent } from '../data-resources/data-resources.component';
+import { StatusBadgeComponent } from '../status-badge/status-badge.component';
+
@Component({
selector: 'osf-registration-card',
- imports: [Card, Button, TranslatePipe, DatePipe, RouterLink],
+ imports: [Card, Button, TranslatePipe, DatePipe, RouterLink, StatusBadgeComponent, DataResourcesComponent],
templateUrl: './registration-card.component.html',
styleUrl: './registration-card.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class RegistrationCardComponent {
RegistrationStatus = RegistryStatus;
+ RevisionReviewStates = RevisionReviewStates;
+ readonly isDraft = input(false);
readonly registrationData = input.required();
readonly deleteDraft = output();
}
diff --git a/src/app/shared/components/status-badge/default-statuses.ts b/src/app/shared/components/status-badge/default-statuses.ts
new file mode 100644
index 000000000..d3a7ae59e
--- /dev/null
+++ b/src/app/shared/components/status-badge/default-statuses.ts
@@ -0,0 +1,20 @@
+import { RegistryStatus } from '@osf/shared/enums';
+import { StatusInfo } from '@osf/shared/models';
+
+export const RegistryStatusMap: Record = {
+ [RegistryStatus.None]: { label: '', severity: null },
+ [RegistryStatus.PendingRegistrationApproval]: { label: 'statuses.pendingRegistrationApproval', severity: 'warn' },
+ [RegistryStatus.PendingEmbargoApproval]: { label: 'statuses.pendingEmbargoApproval', severity: 'warn' },
+ [RegistryStatus.Pending]: { label: 'statuses.pending', severity: 'info' },
+ [RegistryStatus.Accepted]: { label: 'statuses.accepted', severity: 'success' },
+ [RegistryStatus.Embargo]: { label: 'statuses.embargo', severity: 'info' },
+ [RegistryStatus.PendingEmbargoTerminationApproval]: {
+ label: 'statuses.pendingEmbargoTerminationApproval',
+ severity: 'warn',
+ },
+ [RegistryStatus.PendingWithdrawRequest]: { label: 'statuses.pendingWithdrawRequest', severity: 'info' },
+ [RegistryStatus.PendingWithdraw]: { label: 'statuses.pendingWithdraw', severity: 'warn' },
+ [RegistryStatus.Unapproved]: { label: 'statuses.unapproved', severity: 'danger' },
+ [RegistryStatus.InProgress]: { label: 'statuses.inProgress', severity: 'info' },
+ [RegistryStatus.PendingModeration]: { label: 'statuses.pendingModeration', severity: 'warn' },
+};
diff --git a/src/app/shared/components/status-badge/status-badge.component.html b/src/app/shared/components/status-badge/status-badge.component.html
new file mode 100644
index 000000000..e53e9890d
--- /dev/null
+++ b/src/app/shared/components/status-badge/status-badge.component.html
@@ -0,0 +1,3 @@
+@if (label) {
+ ;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [StatusBadgeComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(StatusBadgeComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/shared/components/status-badge/status-badge.component.ts b/src/app/shared/components/status-badge/status-badge.component.ts
new file mode 100644
index 000000000..0011e61e8
--- /dev/null
+++ b/src/app/shared/components/status-badge/status-badge.component.ts
@@ -0,0 +1,26 @@
+import { Tag } from 'primeng/tag';
+
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
+
+import { RegistryStatus } from '@osf/shared/enums';
+import { SeverityType } from '@osf/shared/models';
+
+import { RegistryStatusMap } from './default-statuses';
+
+@Component({
+ selector: 'osf-status-badge',
+ imports: [Tag],
+ templateUrl: './status-badge.component.html',
+ styleUrl: './status-badge.component.scss',
+ changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class StatusBadgeComponent {
+ status = input.required();
+ get label(): string {
+ return RegistryStatusMap[this.status()]?.label ?? 'Unknown';
+ }
+
+ get severity(): SeverityType | null {
+ return RegistryStatusMap[this.status()]?.severity ?? null;
+ }
+}
diff --git a/src/app/shared/mappers/registration/registration.mapper.ts b/src/app/shared/mappers/registration/registration.mapper.ts
index 8dc7ced0b..03db16567 100644
--- a/src/app/shared/mappers/registration/registration.mapper.ts
+++ b/src/app/shared/mappers/registration/registration.mapper.ts
@@ -7,6 +7,8 @@ import {
RegistrationModel,
} from '@osf/shared/models';
+import { MapRegistryStatus } from '../registry';
+
export class RegistrationMapper {
static fromDraftRegistrationResponse(response: DraftRegistrationDataJsonApi): DraftRegistrationModel {
return {
@@ -30,11 +32,13 @@ export class RegistrationMapper {
id: response.embeds.branched_from.data.id,
title: response.embeds.branched_from.data.attributes.title,
filesLink: response.embeds?.branched_from?.data.relationships?.files?.links?.related?.href,
+ type: response.embeds.branched_from.data.type,
}
: {
id: response.relationships.branched_from?.data?.id || '',
title: response.attributes.title,
filesLink: response.relationships.branched_from?.links?.related.href + 'files/',
+ type: response.relationships.branched_from?.data?.type,
},
providerId: response.relationships.provider?.data?.id || '',
hasProject: !!response.attributes.has_project,
@@ -59,6 +63,7 @@ export class RegistrationMapper {
dateModified: registration.attributes.datetime_updated,
registrationTemplate: registration.embeds?.registration_schema?.data?.attributes?.name || '',
registry: registration.embeds?.provider?.data?.attributes?.name || '',
+ public: registration.attributes.public,
contributors:
registration.embeds?.bibliographic_contributors?.data.map((contributor) => ({
id: contributor.id,
@@ -72,11 +77,14 @@ export class RegistrationMapper {
id: registration.id,
title: registration.attributes.title,
description: registration.attributes.description || '',
- status: RegistryStatus.InProgress, // [NM] TODO: map status accordingly
+ status: MapRegistryStatus(registration.attributes),
dateCreated: registration.attributes.datetime_initiated,
dateModified: registration.attributes.date_modified,
registrationTemplate: registration.embeds?.registration_schema?.data?.attributes?.name || '',
registry: registration.embeds?.provider?.data?.attributes?.name || '',
+ public: registration.attributes.public,
+ reviewsState: registration.attributes.review_state,
+ revisionState: registration.attributes.revision_state,
contributors:
registration.embeds?.bibliographic_contributors?.data.map((contributor) => ({
id: contributor.id,
@@ -96,7 +104,7 @@ export class RegistrationMapper {
data: {
type: 'registrations',
attributes: {
- embargo_end_date: embargoDate,
+ embargo_end_date: embargoDate || null,
draft_registration: draftId,
included_node_ids: components,
},
diff --git a/src/app/shared/mappers/registry/map-registry-status.mapper.ts b/src/app/shared/mappers/registry/map-registry-status.mapper.ts
index d34b52371..7a91e2720 100644
--- a/src/app/shared/mappers/registry/map-registry-status.mapper.ts
+++ b/src/app/shared/mappers/registry/map-registry-status.mapper.ts
@@ -1,7 +1,10 @@
import { RegistryOverviewJsonApiAttributes } from '@osf/features/registry/models';
+import { RegistrationAttributesJsonApi } from '@osf/shared/models';
import { RegistrationReviewStates, RegistryStatus, RevisionReviewStates } from '@shared/enums';
-export function MapRegistryStatus(registry: RegistryOverviewJsonApiAttributes): RegistryStatus {
+export function MapRegistryStatus(
+ registry: RegistryOverviewJsonApiAttributes | RegistrationAttributesJsonApi
+): RegistryStatus {
if (registry.pending_embargo_approval) {
return RegistryStatus.PendingEmbargoApproval;
} else if (registry.pending_embargo_termination_approval) {
diff --git a/src/app/shared/models/index.ts b/src/app/shared/models/index.ts
index e7574b81b..f27222a13 100644
--- a/src/app/shared/models/index.ts
+++ b/src/app/shared/models/index.ts
@@ -30,6 +30,7 @@ export * from './search';
export * from './select-option.model';
export * from './severity.type';
export * from './social-icon.model';
+export * from './status-info.model';
export * from './step-option.model';
export * from './store';
export * from './subject';
diff --git a/src/app/shared/models/registration/registration-card.model.ts b/src/app/shared/models/registration/registration-card.model.ts
index 2e3c76f72..bc7bc269a 100644
--- a/src/app/shared/models/registration/registration-card.model.ts
+++ b/src/app/shared/models/registration/registration-card.model.ts
@@ -1,4 +1,4 @@
-import { RegistryStatus } from '@osf/shared/enums';
+import { RegistrationReviewStates, RegistryStatus, RevisionReviewStates } from '@osf/shared/enums';
import { ContributorModel } from '../contributors';
@@ -13,4 +13,12 @@ export interface RegistrationCard {
registrationTemplate: string;
registry: string;
resources?: Record;
+ public: boolean | undefined;
+ reviewsState?: RegistrationReviewStates;
+ revisionState?: RevisionReviewStates;
+ hasData?: boolean;
+ hasAnalyticCode?: boolean;
+ hasMaterials?: boolean;
+ hasPapers?: boolean;
+ hasSupplements?: boolean;
}
diff --git a/src/app/shared/models/registration/registration-json-api.model.ts b/src/app/shared/models/registration/registration-json-api.model.ts
index d9f45be9e..5c935c4a2 100644
--- a/src/app/shared/models/registration/registration-json-api.model.ts
+++ b/src/app/shared/models/registration/registration-json-api.model.ts
@@ -1,4 +1,5 @@
import { ApiData, MetaJsonApi, PaginationLinksJsonApi } from '@osf/core/models';
+import { RegistrationReviewStates, RevisionReviewStates } from '@osf/shared/enums';
import { LicenseRecordJsonApi } from '@osf/shared/models';
export interface DraftRegistrationResponseJsonApi {
@@ -39,6 +40,7 @@ export interface DraftRegistrationAttributesJsonApi {
registration_responses: Record;
tags: string[];
title: string;
+ public?: boolean;
}
export interface RegistrationAttributesJsonApi {
@@ -48,7 +50,13 @@ export interface RegistrationAttributesJsonApi {
description: string;
embargoed: boolean;
archiving: boolean;
+ public: boolean;
title: string;
+ revision_state: RevisionReviewStates;
+ review_state: RegistrationReviewStates;
+ pending_registration_approval: boolean;
+ pending_embargo_approval: boolean;
+ pending_embargo_termination_approval: boolean;
}
export interface DraftRegistrationRelationshipsJsonApi {
diff --git a/src/app/shared/models/status-info.model.ts b/src/app/shared/models/status-info.model.ts
new file mode 100644
index 000000000..2e38b4b2e
--- /dev/null
+++ b/src/app/shared/models/status-info.model.ts
@@ -0,0 +1,6 @@
+import { SeverityType } from './severity.type';
+
+export interface StatusInfo {
+ label: string;
+ severity: SeverityType | null;
+}
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 50ea68b0b..7fefa4efa 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -2042,6 +2042,7 @@
},
"shared": {
"resources": {
+ "title": "Open resources",
"data": "Data",
"analyticCode": "Analytic Code",
"materials": "Materials",
@@ -2067,6 +2068,19 @@
"files": {
"limitText": "You may attach up to 5 file(s) to this question. Files cannot total over 5GB in size.",
"description": "Uploaded files will automatically be archived in this registration. They will also be added to a related project that will be created for this registration."
+ },
+ "statuses": {
+ "pendingRegistrationApproval": "Pending registration approval",
+ "pendingEmbargoApproval": "Pending embargo approval",
+ "pending": "Pending",
+ "accepted": "Accepted",
+ "embargo": "Embargo",
+ "pendingEmbargoTerminationApproval": "Pending embargo termination approval",
+ "pendingWithdrawRequest": "Pending withdraw request",
+ "pendingWithdraw": "Pending withdrawal",
+ "unapproved": "Unapproved",
+ "inProgress": "In progress",
+ "pendingModeration": "Pending moderation"
}
},
"resourceCard": {
diff --git a/src/app/shared/components/data-resources/data-resources.component.ts b/src/app/shared/components/data-resources/data-resources.component.ts
index 8aaf2c13d..f05265078 100644
--- a/src/app/shared/components/data-resources/data-resources.component.ts
+++ b/src/app/shared/components/data-resources/data-resources.component.ts
@@ -11,6 +11,7 @@ import { ChangeDetectionStrategy, Component, HostBinding, input } from '@angular
})
export class DataResourcesComponent {
@HostBinding('class') classes = 'flex-1 flex';
+ vertical = input