Merge pull request #726 from CenterForOpenScience/feature/pbs-25.02

Merge feature/pbs 25.02 into develop

Author: adlius

angular.json

@@ -48,7 +48,6 @@
             "styles": [
               "src/styles/styles.scss",
               "node_modules/primeflex/primeflex.css",
-              "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
               "node_modules/ngx-markdown-editor/assets/highlight.js/agate.min.css"
             ],
             "stylePreprocessorOptions": {
@@ -74,7 +73,8 @@
                   "maximumError": "25kB"
                 }
               ],
-              "outputHashing": "all"
+              "outputHashing": "all",
+              "optimization": true
             },
             "analyze-bundle": {
               "sourceMap": true,
@@ -147,15 +147,15 @@
             },
             "development": {
               "buildTarget": "osf:build:development",
-              "hmr": false
+              "hmr": true
             },
             "docker": {
               "buildTarget": "osf:build:docker",
-              "hmr": false
+              "hmr": true
             },
             "staging": {
               "buildTarget": "osf:build:staging",
-              "hmr": false
+              "hmr": true
             },
             "test": {
               "buildTarget": "osf:build:test",

jest.config.js

@@ -50,10 +50,10 @@ module.exports = {
   extensionsToTreatAsEsm: ['.ts'],
   coverageThreshold: {
     global: {
-      branches: 24.1,
-      functions: 28.73,
-      lines: 56.52,
-      statements: 56.82,
+      branches: 28.0,
+      functions: 32.0,
+      lines: 60.28,
+      statements: 60.77,
     },
   },
   watchPathIgnorePatterns: [

package-lock.json

@@ -47,8 +47,6 @@
     "@newrelic/browser-agent": "^1.301.0",
     "@ngx-translate/core": "^16.0.4",
     "@ngx-translate/http-loader": "^16.0.1",
-    "@ngxs/devtools-plugin": "^19.0.0",
-    "@ngxs/logger-plugin": "^19.0.0",
     "@ngxs/store": "^19.0.0",
     "@primeng/themes": "^19.0.9",
     "@sentry/angular": "^10.10.0",

package.json

@@ -31,8 +31,16 @@ class ResizeObserver {
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   disconnect() {}
 }
+
 Object.defineProperty(window, 'ResizeObserver', {
   writable: true,
   configurable: true,
   value: ResizeObserver,
 });
+
+jest.mock('@newrelic/browser-agent/loaders/browser-agent', () => ({
+  BrowserAgent: jest.fn().mockImplementation(() => ({
+    start: jest.fn(),
+    stop: jest.fn(),
+  })),
+}));

setup-jest.ts

@@ -1,4 +1,3 @@
-import { withNgxsReduxDevtoolsPlugin } from '@ngxs/devtools-plugin';
 import { provideStore } from '@ngxs/store';
 
 import { TranslateModule } from '@ngx-translate/core';
@@ -49,7 +48,7 @@ export const appConfig: ApplicationConfig = {
     }),
     provideHttpClient(withInterceptors([authInterceptor, viewOnlyInterceptor, errorInterceptor])),
     provideRouter(routes, withInMemoryScrolling({ scrollPositionRestoration: 'top', anchorScrolling: 'enabled' })),
-    provideStore(STATES, withNgxsReduxDevtoolsPlugin({ disabled: true })),
+    provideStore(STATES),
     provideZoneChangeDetection({ eventCoalescing: true }),
     SENTRY_PROVIDER,
   ],

src/app/app.config.ts

@@ -3,17 +3,18 @@ import { provideStates } from '@ngxs/store';
 import { Routes } from '@angular/router';
 
 import { isFileGuard } from '@core/guards/is-file.guard';
-import { BookmarksState, ProjectsState } from '@shared/stores';
 
 import { authGuard, redirectIfLoggedInGuard } from './core/guards';
 import { isProjectGuard } from './core/guards/is-project.guard';
 import { isRegistryGuard } from './core/guards/is-registry.guard';
-import { PreprintState } from './features/preprints/store/preprint';
+import { MyPreprintsState } from './features/preprints/store/my-preprints';
 import { ProfileState } from './features/profile/store';
 import { RegistriesState } from './features/registries/store';
 import { LicensesHandlers, ProjectsHandlers, ProvidersHandlers } from './features/registries/store/handlers';
 import { FilesHandlers } from './features/registries/store/handlers/files.handlers';
 import { LicensesService } from './shared/services';
+import { BookmarksState } from './shared/stores/bookmarks';
+import { ProjectsState } from './shared/stores/projects';
 
 export const routes: Routes = [
   {
@@ -89,7 +90,7 @@ export const routes: Routes = [
           import('@osf/features/preprints/pages/my-preprints/my-preprints.component').then(
             (m) => m.MyPreprintsComponent
           ),
-        providers: [provideStates([PreprintState])],
+        providers: [provideStates([MyPreprintsState])],
       },
       {
         path: 'preprints',

src/app/app.routes.ts

@@ -8,7 +8,7 @@ import { CustomMenuItem } from '@osf/core/models';
 import { AuthService } from '@osf/core/services';
 import { ProviderSelectors } from '@osf/core/store/provider/provider.selectors';
 import { UserSelectors } from '@osf/core/store/user/user.selectors';
-import { CurrentResourceSelectors } from '@osf/shared/stores';
+import { CurrentResourceSelectors } from '@osf/shared/stores/current-resource';
 
 import { NavMenuComponent } from './nav-menu.component';
 

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

@@ -20,7 +20,7 @@ import { IconComponent } from '@osf/shared/components';
 import { CurrentResourceType, ReviewPermissions } from '@osf/shared/enums';
 import { getViewOnlyParam } from '@osf/shared/helpers';
 import { WrapFnPipe } from '@osf/shared/pipes';
-import { CurrentResourceSelectors, GetResourceDetails } from '@osf/shared/stores';
+import { CurrentResourceSelectors, GetResourceDetails } from '@osf/shared/stores/current-resource';
 
 @Component({
   selector: 'osf-nav-menu',

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

@@ -6,8 +6,11 @@ import { FilesState } from '@osf/features/files/store';
 import { MetadataState } from '@osf/features/metadata/store';
 import { ProjectOverviewState } from '@osf/features/project/overview/store';
 import { RegistrationsState } from '@osf/features/project/registrations/store';
-import { AddonsState, CurrentResourceState, WikiState } from '@osf/shared/stores';
+import { AddonsState } from '@osf/shared/stores/addons';
 import { BannersState } from '@osf/shared/stores/banners';
+import { ContributorsState } from '@osf/shared/stores/contributors';
+import { CurrentResourceState } from '@osf/shared/stores/current-resource';
+import { WikiState } from '@osf/shared/stores/wiki';
 import { GlobalSearchState } from '@shared/stores/global-search';
 import { InstitutionsState } from '@shared/stores/institutions';
 import { InstitutionsSearchState } from '@shared/stores/institutions-search';
@@ -36,4 +39,5 @@ export const STATES = [
   GlobalSearchState,
   BannersState,
   LinkedProjectsState,
+  ContributorsState,
 ];