Merge pull request #920 from CenterForOpenScience/feature/pbs-26-2

Feature/pbs 26 2

Author: adlius

docs/ngxs.md

@@ -46,7 +46,7 @@ Typical NGXS-related files are organized as follows:
 src/app/shared/stores/
   └── addons/
       ├── addons.actions.ts       # All action definitions
-      ├── addons.models.ts        # Interfaces & data models
+      ├── addons.model.ts        # Interfaces & data model
       ├── addons.state.ts         # State implementation
       ├── addons.selectors.ts     # Reusable selectors
 ```

docs/testing.md

@@ -3,6 +3,8 @@ module.exports = {
   setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
   globalSetup: '<rootDir>/jest.global-setup.ts',
   collectCoverage: false,
+  clearMocks: true,
+  restoreMocks: true,
   coverageReporters: ['json-summary', 'lcov', 'clover'],
   moduleNameMapper: {
     '^@osf/(.*)$': '<rootDir>/src/app/$1',
@@ -36,12 +38,10 @@ module.exports = {
     '!src/app/app.config.ts',
     '!src/app/app.routes.ts',
     '!src/app/**/*.routes.{ts,js}',
-    '!src/app/**/**/*.routes.{ts,js}',
     '!src/app/**/*.route.{ts,js}',
     '!src/app/**/mappers/**',
     '!src/app/shared/mappers/**',
-    '!src/app/**/*.models.{ts.js}',
-    '!src/app/**/*.model.{ts.js}',
+    '!src/app/**/*.model.{ts,js}',
     '!src/app/**/models/*.{ts,js}',
     '!src/app/shared/models/**',
     '!src/app/**/*.enum.{ts,js}',
@@ -54,10 +54,10 @@ module.exports = {
   extensionsToTreatAsEsm: ['.ts'],
   coverageThreshold: {
     global: {
-      branches: 34.8,
-      functions: 38.0,
-      lines: 65.5,
-      statements: 66.0,
+      branches: 43.3,
+      functions: 42.7,
+      lines: 69.3,
+      statements: 69.8,
     },
   },
   watchPathIgnorePatterns: [

jest.config.js

@@ -52,3 +52,11 @@ jest.mock('@newrelic/browser-agent/loaders/browser-agent', () => ({
     stop: jest.fn(),
   })),
 }));
+
+if (!globalThis.structuredClone) {
+  Object.defineProperty(globalThis, 'structuredClone', {
+    value: <T>(value: T): T => JSON.parse(JSON.stringify(value)) as T,
+    writable: true,
+    configurable: true,
+  });
+}

setup-jest.ts

@@ -21,10 +21,6 @@ export const serverRoutes: ServerRoute[] = [
     path: 'forgotpassword',
     renderMode: RenderMode.Prerender,
   },
-  {
-    path: '',
-    renderMode: RenderMode.Prerender,
-  },
   {
     path: 'dashboard',
     renderMode: RenderMode.Client,

src/app/app.routes.server.ts

@@ -107,6 +107,13 @@ export const routes: Routes = [
             '@osf/features/preprints/pages/preprint-pending-moderation/preprint-pending-moderation.component'
           ).then((mod) => mod.PreprintPendingModerationComponent),
       },
+      {
+        path: 'preprints/:providerId/:id/download',
+        loadComponent: () =>
+          import('@osf/features/preprints/pages/preprint-download-redirect/preprint-download-redirect.component').then(
+            (c) => c.PreprintDownloadRedirectComponent
+          ),
+      },
       {
         path: 'preprints/:providerId/:id',
         loadComponent: () =>
@@ -175,6 +182,14 @@ export const routes: Routes = [
           import('./core/components/page-not-found/page-not-found.component').then((mod) => mod.PageNotFoundComponent),
         data: { skipBreadcrumbs: true },
       },
+      {
+        path: 'spam-content',
+        loadComponent: () =>
+          import('./core/components/resource-is-spammed/resource-is-spammed.component').then(
+            (mod) => mod.ResourceIsSpammedComponent
+          ),
+        data: { skipBreadcrumbs: true },
+      },
       {
         path: 'project/:id/node/:nodeId/files/:provider/:fileId',
         loadComponent: () =>

src/app/app.routes.ts

@@ -20,7 +20,7 @@ describe('Component: Cookie Consent Banner', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [OSFTestingModule, CookieConsentBannerComponent, MockComponent(IconComponent)],
+      imports: [CookieConsentBannerComponent, OSFTestingModule, MockComponent(IconComponent)],
       providers: [{ provide: CookieService, useValue: cookieServiceMock }],
     });
 

src/app/core/animations/fade.in-out.animation.ts

@@ -7,23 +7,20 @@ import { Message } from 'primeng/message';
 import { isPlatformBrowser } from '@angular/common';
 import { ChangeDetectionStrategy, Component, inject, PLATFORM_ID, signal } from '@angular/core';
 
-import { fadeInOutAnimation } from '@core/animations/fade.in-out.animation';
 import { IconComponent } from '@osf/shared/components/icon/icon.component';
 
 /**
  * Displays a cookie consent banner until the user accepts.
  *
  * - Uses `ngx-cookie-service` to persist acceptance across sessions.
  * - Automatically hides the banner if consent is already recorded.
- * - Animates in/out using the `fadeInOutAnimation`.
  * - Supports translation via `TranslatePipe`.
  */
 @Component({
   selector: 'osf-cookie-consent-banner',
   templateUrl: './cookie-consent-banner.component.html',
   styleUrls: ['./cookie-consent-banner.component.scss'],
   imports: [Button, TranslatePipe, IconComponent, Message],
-  animations: [fadeInOutAnimation],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CookieConsentBannerComponent {

src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.spec.ts

@@ -1,13 +1,12 @@
 @if (maintenance() && !dismissed()) {
   <p-message
+    class="block p-3"
     styleClass="w-full"
+    icon="pi pi-info-circle"
     [severity]="maintenance()?.severity"
     [text]="maintenance()?.message"
     [closable]="true"
     (onClose)="dismiss()"
-    class="block p-3"
-    icon="pi pi-info-circle"
-    @fadeInOut
   >
   </p-message>
 }