Merge branch 'feature/pbs-25.04' into feat/8975-redirect-service

Author: futa-ikeda

jest.config.js

@@ -69,10 +69,8 @@ module.exports = {
   testPathIgnorePatterns: [
     '<rootDir>/src/environments',
     '<rootDir>/src/app/app.config.ts',
-    '<rootDir>/src/app/app.routes.ts',
     '<rootDir>/src/app/features/files/pages/file-detail',
     '<rootDir>/src/app/features/project/addons/',
-    '<rootDir>/src/app/features/project/overview/',
     '<rootDir>/src/app/features/project/registrations',
     '<rootDir>/src/app/features/project/wiki',
     '<rootDir>/src/app/features/registry/components',

package-lock.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",

package.json

@@ -4,7 +4,6 @@ import { UserEmailsState } from '@core/store/user-emails';
 import { InstitutionsAdminState } from '@osf/features/admin-institutions/store';
 import { FilesState } from '@osf/features/files/store';
 import { MetadataState } from '@osf/features/metadata/store';
-import { ProjectOverviewState } from '@osf/features/project/overview/store';
 import { AddonsState } from '@osf/shared/stores/addons';
 import { BannersState } from '@osf/shared/stores/banners';
 import { ContributorsState } from '@osf/shared/stores/contributors';
@@ -26,7 +25,6 @@ export const STATES = [
   InstitutionsState,
   InstitutionsAdminState,
   InstitutionsSearchState,
-  ProjectOverviewState,
   WikiState,
   LicensesState,
   RegionsState,

src/app/core/constants/ngxs-states.constant.ts

@@ -0,0 +1,9 @@
+import { CanMatchFn, Route, UrlSegment } from '@angular/router';
+
+import { FileProvider } from '@osf/features/files/constants';
+
+export const isFileProvider: CanMatchFn = (route: Route, segments: UrlSegment[]) => {
+  const id = segments[0]?.path;
+
+  return !!(id && Object.values(FileProvider).some((provider) => provider === id));
+};

src/app/core/guards/is-file-provider.guard.ts

@@ -14,7 +14,7 @@ describe('HelpScoutService', () => {
       if (selector === UserSelectors.isAuthenticated) {
         return authSignal;
       }
-      return signal(null); // fallback
+      return signal(null);
     }),
   };
   let service: HelpScoutService;

src/app/core/services/help-scout.service.spec.ts

@@ -55,4 +55,9 @@ export class UserSelectors {
   static isAuthenticated(state: UserStateModel): boolean {
     return !!state.currentUser.data || !!localStorage.getItem('currentUser');
   }
+
+  @Selector([UserState])
+  static getActiveFlags(state: UserStateModel): string[] {
+    return state.activeFlags || [];
+  }
 }

src/app/core/store/user/user.selectors.ts

@@ -34,6 +34,12 @@ export class UserState {
   @Action(GetCurrentUser)
   getCurrentUser(ctx: StateContext<UserStateModel>) {
     const currentUser = localStorage.getItem('currentUser');
+    const activeFlags = localStorage.getItem('activeFlags');
+    if (activeFlags) {
+      ctx.patchState({
+        activeFlags: JSON.parse(activeFlags),
+      });
+    }
 
     if (currentUser) {
       const parsedUser = JSON.parse(currentUser);
@@ -70,6 +76,9 @@ export class UserState {
         if (data.currentUser) {
           localStorage.setItem('currentUser', JSON.stringify(data.currentUser));
         }
+        if (data.activeFlags) {
+          localStorage.setItem('activeFlags', JSON.stringify(data.activeFlags));
+        }
       })
     );
   }

src/app/core/store/user/user.state.ts

@@ -17,7 +17,6 @@ import { ViewOnlyLinkMessageComponent } from '@osf/shared/components/view-only-l
 import { IS_WEB } from '@osf/shared/helpers/breakpoints.tokens';
 
 import { MOCK_ANALYTICS_METRICS, MOCK_RELATED_COUNTS } from '@testing/mocks/analytics.mock';
-import { MOCK_RESOURCE_OVERVIEW } from '@testing/mocks/resource.mock';
 import { OSFTestingModule } from '@testing/osf.testing.module';
 import { ActivatedRouteMockBuilder } from '@testing/providers/route-provider.mock';
 import { RouterMockBuilder } from '@testing/providers/router-provider.mock';
@@ -29,7 +28,7 @@ describe('Component: Analytics', () => {
   let routerMock: ReturnType<RouterMockBuilder['build']>;
   let activatedRouteMock: ReturnType<ActivatedRouteMockBuilder['build']>;
 
-  const resourceId = MOCK_RESOURCE_OVERVIEW.id;
+  const resourceId = 'ex212';
   const metrics = { ...MOCK_ANALYTICS_METRICS, id: resourceId };
   const relatedCounts = { ...MOCK_RELATED_COUNTS, id: resourceId };
   const metricsSelector = AnalyticsSelectors.getMetrics(resourceId);
@@ -60,13 +59,6 @@ describe('Component: Analytics', () => {
       ],
       providers: [
         provideMockStore({
-          selectors: [
-            { selector: metricsSelector, value: metrics },
-            { selector: relatedCountsSelector, value: relatedCounts },
-            { selector: AnalyticsSelectors.isMetricsLoading, value: false },
-            { selector: AnalyticsSelectors.isRelatedCountsLoading, value: false },
-            { selector: AnalyticsSelectors.isMetricsError, value: false },
-          ],
           signals: [
             { selector: metricsSelector, value: metrics },
             { selector: relatedCountsSelector, value: relatedCounts },

src/app/features/analytics/analytics.component.spec.ts

@@ -140,6 +140,7 @@ export class AnalyticsComponent implements OnInit {
   navigateToLinkedProjects() {
     this.router.navigate(['linked-projects'], { relativeTo: this.route });
   }
+
   private setData() {
     const analytics = this.analytics();
 
@@ -171,7 +172,14 @@ export class AnalyticsComponent implements OnInit {
       },
     ];
 
-    this.popularPagesLabels = analytics.popularPages.map((item) => item.title);
+    this.popularPagesLabels = analytics.popularPages.map((item) => {
+      const parts = item.path.split('/').filter(Boolean);
+      const resource = parts[1]?.replace('-', ' ') || 'overview';
+      let cleanTitle = item.title === 'OSF' ? item.title : item.title.replace(/^OSF \| /, '');
+      cleanTitle = cleanTitle.replace(/&amp;/gi, '&').replace(/&lt;/gi, '<').replace(/&gt;/gi, '>');
+      return cleanTitle.endsWith(resource) ? cleanTitle : `${cleanTitle} | ${resource}`;
+    });
+
     this.popularPagesDataset = [
       {
         label: this.translateService.instant('project.analytics.charts.popularPages'),