Merge branch 'develop' into ENG-9260

Author: sh-andriy

package.json

@@ -1,6 +1,6 @@
 {
   "name": "osf",
-  "version": "25.2.0",
+  "version": "25.3.0",
   "scripts": {
     "ng": "ng",
     "analyze-bundle": "ng build --configuration=analyze-bundle && source-map-explorer dist/**/*.js --no-border-checks",

src/@types/global.d.ts

@@ -47,5 +47,11 @@ declare global {
        */
       loggedIn: boolean;
     };
+
+    /**
+     * Flag used by prerender services to determine when a page is fully loaded.
+     * Set to false initially, then set to true once all AJAX requests and content are loaded.
+     */
+    prerenderReady?: boolean;
   }
 }

src/app/app.routes.ts

@@ -68,8 +68,8 @@ export const routes: Routes = [
         path: 'my-projects',
         loadComponent: () =>
           import('./features/my-projects/my-projects.component').then((mod) => mod.MyProjectsComponent),
-        providers: [provideStates([BookmarksState, ProjectsState])],
         canActivate: [authGuard],
+        providers: [provideStates([BookmarksState, ProjectsState])],
       },
       {
         path: 'my-registrations',

src/app/core/components/nav-menu/nav-menu.component.spec.ts

@@ -4,8 +4,8 @@ import { NO_ERRORS_SCHEMA, signal } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 
+import { CustomMenuItem } from '@core/models/custom-menu-item.model';
 import { AuthService } from '@core/services/auth.service';
-import { CustomMenuItem } from '@osf/core/models';
 import { ProviderSelectors } from '@osf/core/store/provider/provider.selectors';
 import { UserSelectors } from '@osf/core/store/user/user.selectors';
 import { IconComponent } from '@osf/shared/components/icon/icon.component';

src/app/core/services/prerender-ready.service.ts

@@ -0,0 +1,22 @@
+import { inject, Injectable } from '@angular/core';
+
+import { WINDOW } from '../provider/window.provider';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class PrerenderReadyService {
+  private readonly window = inject(WINDOW);
+
+  setNotReady(): void {
+    if (this.window && 'prerenderReady' in this.window) {
+      this.window.prerenderReady = false;
+    }
+  }
+
+  setReady(): void {
+    if (this.window && 'prerenderReady' in this.window) {
+      this.window.prerenderReady = true;
+    }
+  }
+}

src/app/features/analytics/components/view-duplicates/view-duplicates.component.spec.ts

@@ -8,7 +8,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { ProjectOverviewSelectors } from '@osf/features/project/overview/store';
-import { RegistryOverviewSelectors } from '@osf/features/registry/store/registry-overview';
+import { RegistrySelectors } from '@osf/features/registry/store/registry';
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
 import { CustomPaginatorComponent } from '@osf/shared/components/custom-paginator/custom-paginator.component';
 import { IconComponent } from '@osf/shared/components/icon/icon.component';
@@ -64,8 +64,8 @@ describe('Component: View Duplicates', () => {
             { selector: DuplicatesSelectors.getDuplicatesTotalCount, value: 0 },
             { selector: ProjectOverviewSelectors.getProject, value: MOCK_PROJECT_OVERVIEW },
             { selector: ProjectOverviewSelectors.isProjectAnonymous, value: false },
-            { selector: RegistryOverviewSelectors.getRegistry, value: undefined },
-            { selector: RegistryOverviewSelectors.isRegistryAnonymous, value: false },
+            { selector: RegistrySelectors.getRegistry, value: undefined },
+            { selector: RegistrySelectors.isRegistryAnonymous, value: false },
           ],
         }),
         MockProvider(CustomDialogService, mockCustomDialogService),

src/app/features/analytics/components/view-duplicates/view-duplicates.component.ts

@@ -25,11 +25,7 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { UserSelectors } from '@core/store/user';
 import { DeleteComponentDialogComponent, ForkDialogComponent } from '@osf/features/project/overview/components';
 import { ClearProjectOverview, GetProjectById, ProjectOverviewSelectors } from '@osf/features/project/overview/store';
-import {
-  ClearRegistryOverview,
-  GetRegistryById,
-  RegistryOverviewSelectors,
-} from '@osf/features/registry/store/registry-overview';
+import { ClearRegistry, GetRegistryById, RegistrySelectors } from '@osf/features/registry/store/registry';
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
 import { CustomPaginatorComponent } from '@osf/shared/components/custom-paginator/custom-paginator.component';
 import { IconComponent } from '@osf/shared/components/icon/icon.component';
@@ -72,9 +68,9 @@ export class ViewDuplicatesComponent {
   private router = inject(Router);
   private destroyRef = inject(DestroyRef);
   private project = select(ProjectOverviewSelectors.getProject);
-  private registration = select(RegistryOverviewSelectors.getRegistry);
+  private registration = select(RegistrySelectors.getRegistry);
   private isProjectAnonymous = select(ProjectOverviewSelectors.isProjectAnonymous);
-  private isRegistryAnonymous = select(RegistryOverviewSelectors.isRegistryAnonymous);
+  private isRegistryAnonymous = select(RegistrySelectors.isRegistryAnonymous);
 
   duplicates = select(DuplicatesSelectors.getDuplicates);
   isDuplicatesLoading = select(DuplicatesSelectors.getDuplicatesLoading);
@@ -127,7 +123,7 @@ export class ViewDuplicatesComponent {
     getDuplicates: GetAllDuplicates,
     clearDuplicates: ClearDuplicates,
     clearProject: ClearProjectOverview,
-    clearRegistration: ClearRegistryOverview,
+    clearRegistration: ClearRegistry,
     getComponentsTree: GetResourceWithChildren,
   });
 

src/app/features/analytics/components/view-linked-projects/view-linked-projects.component.spec.ts

@@ -6,7 +6,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
 import { ProjectOverviewSelectors } from '@osf/features/project/overview/store';
-import { RegistryOverviewSelectors } from '@osf/features/registry/store/registry-overview';
+import { RegistrySelectors } from '@osf/features/registry/store/registry';
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
 import { CustomPaginatorComponent } from '@osf/shared/components/custom-paginator/custom-paginator.component';
 import { IconComponent } from '@osf/shared/components/icon/icon.component';
@@ -54,7 +54,7 @@ describe('Component: View Duplicates', () => {
             { selector: LinkedProjectsSelectors.getLinkedProjectsLoading, value: false },
             { selector: LinkedProjectsSelectors.getLinkedProjectsTotalCount, value: 0 },
             { selector: ProjectOverviewSelectors.getProject, value: MOCK_PROJECT_OVERVIEW },
-            { selector: RegistryOverviewSelectors.getRegistry, value: undefined },
+            { selector: RegistrySelectors.getRegistry, value: undefined },
           ],
         }),
         MockProvider(ActivatedRoute, activatedRouteMock),

src/app/features/analytics/components/view-linked-projects/view-linked-projects.component.ts

@@ -22,11 +22,7 @@ import { toSignal } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, RouterLink } from '@angular/router';
 
 import { ClearProjectOverview, GetProjectById, ProjectOverviewSelectors } from '@osf/features/project/overview/store';
-import {
-  ClearRegistryOverview,
-  GetRegistryById,
-  RegistryOverviewSelectors,
-} from '@osf/features/registry/store/registry-overview';
+import { ClearRegistry, GetRegistryById, RegistrySelectors } from '@osf/features/registry/store/registry';
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
 import { CustomPaginatorComponent } from '@osf/shared/components/custom-paginator/custom-paginator.component';
 import { IconComponent } from '@osf/shared/components/icon/icon.component';
@@ -59,7 +55,7 @@ export class ViewLinkedProjectsComponent {
   private route = inject(ActivatedRoute);
   private destroyRef = inject(DestroyRef);
   private project = select(ProjectOverviewSelectors.getProject);
-  private registration = select(RegistryOverviewSelectors.getRegistry);
+  private registration = select(RegistrySelectors.getRegistry);
 
   linkedProjects = select(LinkedProjectsSelectors.getLinkedProjects);
   isLoading = select(LinkedProjectsSelectors.getLinkedProjectsLoading);
@@ -93,7 +89,7 @@ export class ViewLinkedProjectsComponent {
     getLinkedProjects: GetAllLinkedProjects,
     clearLinkedProjects: ClearLinkedProjects,
     clearProject: ClearProjectOverview,
-    clearRegistration: ClearRegistryOverview,
+    clearRegistration: ClearRegistry,
   });
 
   constructor() {

src/app/features/analytics/services/index.ts

@@ -1 +1 @@
-export { AnalyticsService } from './analytics.service';
+export { ResourceAnalyticsService } from './resource-analytics.service';