Fix/registration bugs

src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.html

@@ -10,7 +10,7 @@ <h2 class="mb-2">{{ 'shared.license.title' | translate }}</h2>
   <p class="mb-1">{{ 'shared.license.description' | translate }}</p>
   <p>
     {{ 'shared.license.helpText' | translate }}
-    <a href="https://help.osf.io/article/148-licensing">{{ 'common.links.helpGuide' | translate }}</a
+    <a href="https://help.osf.io/article/148-licensing" target="_blank">{{ 'common.links.helpGuide' | translate }}</a
     >.
   </p>
   <osf-license

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

@@ -36,7 +36,6 @@ export class ProjectOverviewMapper {
       currentUserIsContributorOrGroupMember: response.attributes.current_user_is_contributor_or_group_member,
       wikiEnabled: response.attributes.wiki_enabled,
       customCitation: response.attributes.custom_citation,
-      subjects: response.attributes.subjects?.map((subjectArray) => subjectArray[0]),
       contributors:
         response.embeds.bibliographic_contributors?.data?.map((contributor) => ({
           id: contributor.embeds.users.data.id,

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

@@ -52,7 +52,6 @@ export interface ProjectOverview {
   currentUserIsContributor: boolean;
   currentUserIsContributorOrGroupMember: boolean;
   wikiEnabled: boolean;
-  subjects: ProjectOverviewSubject[];
   contributors: ProjectOverviewContributor[];
   customCitation: string | null;
   region?: IdTypeModel;
@@ -66,11 +65,6 @@ export interface ProjectOverview {
   rootParentId?: string;
 }
 
-export interface ProjectOverviewSubject {
-  id: string;
-  text: string;
-}
-
 export interface ProjectOverviewWithMeta {
   project: ProjectOverview;
   meta?: MetaAnonymousJsonApi;
@@ -104,7 +98,6 @@ export interface ProjectOverviewGetResponseJsonApi {
     current_user_is_contributor: boolean;
     current_user_is_contributor_or_group_member: boolean;
     wiki_enabled: boolean;
-    subjects: ProjectOverviewSubject[][];
     custom_citation: string | null;
   };
   embeds: {

src/app/features/project/overview/project-overview.component.ts

@@ -40,12 +40,14 @@ import {
   ClearWiki,
   CollectionsSelectors,
   CurrentResourceSelectors,
+  FetchSelectedSubjects,
   GetBookmarksCollectionId,
   GetCollectionProvider,
   GetConfiguredStorageAddons,
   GetHomeWiki,
   GetLinkedResources,
   GetResourceWithChildren,
+  SubjectsSelectors,
 } from '@osf/shared/stores';
 import { GetActivityLogs } from '@osf/shared/stores/activity-logs';
 import {
@@ -119,6 +121,8 @@ export class ProjectOverviewComponent extends DataciteTrackerComponent implement
   isReviewActionsLoading = select(CollectionsModerationSelectors.getCurrentReviewActionLoading);
   components = select(CurrentResourceSelectors.getResourceWithChildren);
   areComponentsLoading = select(CurrentResourceSelectors.isResourceWithChildrenLoading);
+  subjects = select(SubjectsSelectors.getSelectedSubjects);
+  areSubjectsLoading = select(SubjectsSelectors.areSelectedSubjectsLoading);
 
   readonly activityPageSize = 5;
   readonly activityDefaultPage = 1;
@@ -141,6 +145,7 @@ export class ProjectOverviewComponent extends DataciteTrackerComponent implement
     getComponentsTree: GetResourceWithChildren,
     getRootFolders: GetRootFolders,
     getConfiguredStorageAddons: GetConfiguredStorageAddons,
+    getSubjects: FetchSelectedSubjects,
   });
 
   currentProject = select(ProjectOverviewSelectors.getProject);
@@ -178,14 +183,19 @@ export class ProjectOverviewComponent extends DataciteTrackerComponent implement
 
   resourceOverview = computed(() => {
     const project = this.currentProject();
+    const subjects = this.subjects();
     if (project) {
-      return MapProjectOverview(project, this.isAnonymous());
+      return MapProjectOverview(project, subjects, this.isAnonymous());
     }
     return null;
   });
 
   isLoading = computed(
-    () => this.isProjectLoading() || this.isCollectionProviderLoading() || this.isReviewActionsLoading()
+    () =>
+      this.isProjectLoading() ||
+      this.isCollectionProviderLoading() ||
+      this.isReviewActionsLoading() ||
+      this.areSubjectsLoading()
   );
 
   currentResource = computed(() => {
@@ -221,6 +231,7 @@ export class ProjectOverviewComponent extends DataciteTrackerComponent implement
       if (currentProject) {
         const rootParentId = currentProject.rootParentId ?? currentProject.id;
         this.actions.getComponentsTree(rootParentId, currentProject.id, ResourceType.Project);
+        this.actions.getSubjects(currentProject.id, ResourceType.Project);
       }
     });
   }

src/app/features/project/project.routes.ts

@@ -45,6 +45,7 @@ export const projectRoutes: Routes = [
             CollectionsState,
             CollectionsModerationState,
             ActivityLogsState,
+            SubjectsState,
           ]),
         ],
       },

src/app/features/registries/components/metadata/registries-license/registries-license.component.html

@@ -4,7 +4,7 @@ <h2 class="mb-2">{{ 'shared.license.title' | translate }}</h2>
   <p class="mb-1">{{ 'shared.license.description' | translate }}</p>
   <p>
     {{ 'shared.license.helpText' | translate }}
-    <a href="https://help.osf.io/article/148-licensing">{{ 'common.links.helpGuide' | translate }}</a
+    <a href="https://help.osf.io/article/148-licensing" target="_blank">{{ 'common.links.helpGuide' | translate }}</a
     >.
   </p>
   <osf-license

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

@@ -1,6 +1,5 @@
 export * from './bibliographic-contributors.models';
 export * from './get-registry-overview-json-api.model';
-export * from './get-resource-subjects-json-api.model';
 export * from './linked-nodes.models';
 export * from './linked-nodes-json-api.model';
 export * from './linked-registrations-json-api.model';
@@ -10,5 +9,4 @@ export * from './registry-components-json-api.model';
 export * from './registry-contributor-json-api.model';
 export * from './registry-metadata.models';
 export * from './registry-overview.models';
-export * from './registry-subject.model';
 export * from './resources';

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

@@ -1,12 +1,13 @@
 import { ProjectOverviewContributor } from '@osf/features/project/overview/models';
-import { RegistrationQuestions, RegistrySubject } from '@osf/features/registry/models';
+import { RegistrationQuestions } from '@osf/features/registry/models';
 import {
   IdTypeModel,
   LicenseModel,
   LicensesOption,
   MetaAnonymousJsonApi,
   ProviderModel,
   SchemaResponse,
+  SubjectModel,
 } from '@osf/shared/models';
 import { RegistrationReviewStates, RegistryStatus, RevisionReviewStates } from '@shared/enums';
 
@@ -45,7 +46,7 @@ export interface RegistryOverview {
   currentUserIsContributorOrGroupMember: boolean;
   wikiEnabled: boolean;
   region?: IdTypeModel;
-  subjects?: RegistrySubject[];
+  subjects?: SubjectModel[];
   customCitation: string;
   hasData: boolean;
   hasAnalyticCode: boolean;

src/app/features/registry/pages/registry-overview/registry-overview.component.html

@@ -1,4 +1,4 @@
-@if (!isRegistryLoading() && !isSubjectsLoading() && !isInstitutionsLoading() && !isSchemaBlocksLoading()) {
+@if (!isLoading()) {
   <div
     class="flex flex-column justify-content-center flex-wrap md:flex-row md:justify-content-between md:align-items-center"
   >

src/app/features/registry/pages/registry-overview/registry-overview.component.ts

@@ -26,7 +26,7 @@ import { hasViewOnlyParam, toCamelCase } from '@osf/shared/helpers';
 import { MapRegistryOverview } from '@osf/shared/mappers';
 import { SchemaResponse, ToolbarResource } from '@osf/shared/models';
 import { ToastService } from '@osf/shared/services';
-import { GetBookmarksCollectionId } from '@osf/shared/stores';
+import { FetchSelectedSubjects, GetBookmarksCollectionId, SubjectsSelectors } from '@osf/shared/stores';
 import { ViewOnlyLinkMessageComponent } from '@shared/components/view-only-link-message/view-only-link-message.component';
 
 import { ArchivingMessageComponent, RegistryRevisionsComponent, RegistryStatusesComponent } from '../../components';
@@ -36,7 +36,6 @@ import {
   GetRegistryById,
   GetRegistryInstitutions,
   GetRegistryReviewActions,
-  GetRegistrySubjects,
   RegistryOverviewSelectors,
   SetRegistryCustomCitation,
 } from '../../store/registry-overview';
@@ -76,8 +75,8 @@ export class RegistryOverviewComponent {
   readonly registry = select(RegistryOverviewSelectors.getRegistry);
   readonly isRegistryLoading = select(RegistryOverviewSelectors.isRegistryLoading);
   readonly isAnonymous = select(RegistryOverviewSelectors.isRegistryAnonymous);
-  readonly subjects = select(RegistryOverviewSelectors.getSubjects);
-  readonly isSubjectsLoading = select(RegistryOverviewSelectors.isSubjectsLoading);
+  readonly subjects = select(SubjectsSelectors.getSelectedSubjects);
+  readonly areSubjectsLoading = select(SubjectsSelectors.areSelectedSubjectsLoading);
   readonly institutions = select(RegistryOverviewSelectors.getInstitutions);
   readonly isInstitutionsLoading = select(RegistryOverviewSelectors.isInstitutionsLoading);
   readonly schemaBlocks = select(RegistryOverviewSelectors.getSchemaBlocks);
@@ -87,6 +86,15 @@ export class RegistryOverviewComponent {
   readonly isSchemaResponseLoading = select(RegistriesSelectors.getSchemaResponseLoading);
   revisionInProgress: SchemaResponse | undefined;
 
+  isLoading = computed(
+    () =>
+      this.isRegistryLoading() ||
+      this.isInstitutionsLoading() ||
+      this.isSchemaBlocksLoading() ||
+      this.isSchemaResponseLoading() ||
+      this.areSubjectsLoading()
+  );
+
   readonly schemaResponse = computed(() => {
     const registry = this.registry();
     const index = this.selectedRevisionIndex();
@@ -141,7 +149,7 @@ export class RegistryOverviewComponent {
   private readonly actions = createDispatchMap({
     getRegistryById: GetRegistryById,
     getBookmarksId: GetBookmarksCollectionId,
-    getSubjects: GetRegistrySubjects,
+    getSubjects: FetchSelectedSubjects,
     getInstitutions: GetRegistryInstitutions,
     setCustomCitation: SetRegistryCustomCitation,
     getRegistryReviewActions: GetRegistryReviewActions,
@@ -179,7 +187,7 @@ export class RegistryOverviewComponent {
               return !this.registry()?.withdrawn;
             }),
             tap(() => {
-              this.actions.getSubjects(id);
+              this.actions.getSubjects(id, ResourceType.Registration);
               this.actions.getInstitutions(id);
             })
           )
@@ -201,7 +209,6 @@ export class RegistryOverviewComponent {
   }
 
   navigateToFile(fileId: string): void {
-    // [NM] TODO: add logic to handle fileId
     this.router.navigate(['/files', fileId]);
   }
 

src/app/features/registry/registry.routes.ts

@@ -40,7 +40,7 @@ export const registryRoutes: Routes = [
         loadComponent: () =>
           import('./pages/registry-overview/registry-overview.component').then((c) => c.RegistryOverviewComponent),
         providers: [
-          provideStates([RegistriesState, CitationsState]),
+          provideStates([RegistriesState, SubjectsState, CitationsState]),
           ProvidersHandlers,
           ProjectsHandlers,
           LicensesHandlers,

src/app/features/registry/services/registry-overview.service.ts

@@ -7,11 +7,9 @@ import { ReviewAction, ReviewActionsResponseJsonApi } from '@osf/features/modera
 import { MapRegistryOverview } from '@osf/features/registry/mappers';
 import {
   GetRegistryOverviewJsonApi,
-  GetResourceSubjectsJsonApi,
   RegistryOverview,
   RegistryOverviewJsonApiData,
   RegistryOverviewWithMeta,
-  RegistrySubject,
 } from '@osf/features/registry/models';
 import { InstitutionsMapper, ReviewActionsMapper } from '@osf/shared/mappers';
 import { PageSchemaMapper } from '@osf/shared/mappers/registration';
@@ -48,17 +46,6 @@ export class RegistryOverviewService {
       .pipe(map((response) => ({ registry: MapRegistryOverview(response.data), meta: response.meta })));
   }
 
-  getSubjects(registryId: string): Observable<RegistrySubject[]> {
-    const params = {
-      'page[size]': 100,
-      page: 1,
-    };
-
-    return this.jsonApiService
-      .get<GetResourceSubjectsJsonApi>(`${this.apiUrl}/registrations/${registryId}/subjects/`, params)
-      .pipe(map((response) => response.data.map((subject) => ({ id: subject.id, text: subject.attributes.text }))));
-  }
-
   getInstitutions(registryId: string): Observable<Institution[]> {
     const params = {
       'page[size]': 100,

src/app/features/registry/store/registry-overview/registry-overview.actions.ts

@@ -10,12 +10,6 @@ export class GetRegistryById {
   ) {}
 }
 
-export class GetRegistrySubjects {
-  static readonly type = '[Registry Overview] Get Registry Subjects';
-
-  constructor(public registryId: string) {}
-}
-
 export class GetRegistryInstitutions {
   static readonly type = '[Registry Overview] Get Registry Institutions';
 

src/app/features/registry/store/registry-overview/registry-overview.model.ts

@@ -1,11 +1,10 @@
 import { ReviewAction } from '@osf/features/moderation/models';
-import { RegistryOverview, RegistrySubject } from '@osf/features/registry/models';
+import { RegistryOverview } from '@osf/features/registry/models';
 import { Institution, PageSchema } from '@osf/shared/models';
 import { AsyncStateModel } from '@shared/models';
 
 export interface RegistryOverviewStateModel {
   registry: AsyncStateModel<RegistryOverview | null>;
-  subjects: AsyncStateModel<RegistrySubject[] | null>;
   institutions: AsyncStateModel<Institution[] | null>;
   schemaBlocks: AsyncStateModel<PageSchema[] | null>;
   moderationActions: AsyncStateModel<ReviewAction[]>;
@@ -18,11 +17,6 @@ export const REGISTRY_OVERVIEW_DEFAULTS: RegistryOverviewStateModel = {
     isLoading: false,
     error: null,
   },
-  subjects: {
-    data: [],
-    isLoading: false,
-    error: null,
-  },
   institutions: {
     data: [],
     isLoading: false,

src/app/features/registry/store/registry-overview/registry-overview.selectors.ts

@@ -1,7 +1,7 @@
 import { Selector } from '@ngxs/store';
 
 import { ReviewAction } from '@osf/features/moderation/models';
-import { RegistryOverview, RegistrySubject } from '@osf/features/registry/models';
+import { RegistryOverview } from '@osf/features/registry/models';
 import { Institution, PageSchema } from '@osf/shared/models';
 
 import { RegistryOverviewStateModel } from './registry-overview.model';
@@ -23,16 +23,6 @@ export class RegistryOverviewSelectors {
     return state.isAnonymous;
   }
 
-  @Selector([RegistryOverviewState])
-  static getSubjects(state: RegistryOverviewStateModel): RegistrySubject[] | null {
-    return state.subjects.data;
-  }
-
-  @Selector([RegistryOverviewState])
-  static isSubjectsLoading(state: RegistryOverviewStateModel): boolean {
-    return state.subjects.isLoading;
-  }
-
   @Selector([RegistryOverviewState])
   static getInstitutions(state: RegistryOverviewStateModel): Institution[] | null {
     return state.institutions.data;