Feature/pbs 26 2

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
 ```

jest.config.js

@@ -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: [

setup-jest.ts

@@ -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,
+  });
+}

src/app/app.routes.server.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.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/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.spec.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/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.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/maintenance-banner/maintenance-banner.component.html

@@ -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>
 }

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

@@ -1,16 +1,15 @@
 import { CookieService } from 'ngx-cookie-service';
 
-import { MessageModule } from 'primeng/message';
-
 import { of } from 'rxjs';
 
 import { HttpClient } from '@angular/common/http';
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 import { MaintenanceBannerComponent } from './maintenance-banner.component';
 
+import { OSFTestingModule } from '@testing/osf.testing.module';
+
 describe('Component: Maintenance Banner', () => {
   let fixture: ComponentFixture<MaintenanceBannerComponent>;
   let httpClient: { get: jest.Mock };
@@ -25,7 +24,7 @@ describe('Component: Maintenance Banner', () => {
     httpClient = { get: jest.fn() } as any;
 
     await TestBed.configureTestingModule({
-      imports: [MaintenanceBannerComponent, NoopAnimationsModule, MessageModule],
+      imports: [MaintenanceBannerComponent, OSFTestingModule],
       providers: [
         { provide: CookieService, useValue: cookieService },
         { provide: HttpClient, useValue: httpClient },

src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.ts

@@ -5,8 +5,6 @@ import { MessageModule } from 'primeng/message';
 import { CommonModule, isPlatformBrowser } from '@angular/common';
 import { ChangeDetectionStrategy, Component, inject, OnInit, PLATFORM_ID, signal } from '@angular/core';
 
-import { fadeInOutAnimation } from '@core/animations/fade.in-out.animation';
-
 import { MaintenanceModel } from '../models/maintenance.model';
 import { MaintenanceService } from '../services/maintenance.service';
 
@@ -17,8 +15,6 @@ import { MaintenanceService } from '../services/maintenance.service';
  * the banner. If not, it queries the maintenance status from the server and displays
  * the maintenance message if one is active.
  *
- * The component supports animation via `fadeInOutAnimation` and is optimized with `OnPush` change detection.
- *
  * @example
  * ```html
  * <osf-maintenance-banner />
@@ -29,7 +25,6 @@ import { MaintenanceService } from '../services/maintenance.service';
   imports: [CommonModule, MessageModule],
   templateUrl: './maintenance-banner.component.html',
   styleUrls: ['./maintenance-banner.component.scss'],
-  animations: [fadeInOutAnimation],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MaintenanceBannerComponent implements OnInit {

src/app/core/components/resource-is-spammed/resource-is-spammed.component.html

@@ -0,0 +1,13 @@
+<section class="text-center flex flex-column flex-1 my-7 mx-3 p-3 md:p-4">
+  <h2>{{ 'resourceSpammed.title' | translate }}</h2>
+
+  <p class="my-4">
+    {{ 'resourceSpammed.message' | translate }}
+  </p>
+
+  <p>
+    <span>{{ 'resourceSpammed.contact' | translate }}</span>
+    <a class="ml-1 font-bold" [href]="'mailto:' + supportEmail">{{ supportEmail }} </a>
+    <span>{{ 'resourceSpammed.footer' | translate }}</span>
+  </p>
+</section>

src/app/core/components/resource-is-spammed/resource-is-spammed.component.scss

@@ -0,0 +1,7 @@
+@use "styles/mixins" as mix;
+
+:host {
+  @include mix.flex-center;
+  flex: 1;
+  background: var(--gradient-3);
+}

src/app/core/components/resource-is-spammed/resource-is-spammed.component.spec.ts

@@ -0,0 +1,29 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ResourceIsSpammedComponent } from './resource-is-spammed.component';
+
+import { provideOSFCore } from '@testing/osf.testing.provider';
+
+describe('ResourceIsSpammedComponent', () => {
+  let component: ResourceIsSpammedComponent;
+  let fixture: ComponentFixture<ResourceIsSpammedComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [ResourceIsSpammedComponent],
+      providers: [provideOSFCore()],
+    });
+
+    fixture = TestBed.createComponent(ResourceIsSpammedComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should set supportEmail from environment token', () => {
+    expect(component.supportEmail).toBe('support@test.com');
+  });
+});

src/app/core/components/resource-is-spammed/resource-is-spammed.component.ts

@@ -0,0 +1,17 @@
+import { TranslatePipe } from '@ngx-translate/core';
+
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
+
+import { ENVIRONMENT } from '@core/provider/environment.provider';
+
+@Component({
+  selector: 'osf-resource-is-spammed',
+  imports: [TranslatePipe],
+  templateUrl: './resource-is-spammed.component.html',
+  styleUrl: './resource-is-spammed.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ResourceIsSpammedComponent {
+  private readonly environment = inject(ENVIRONMENT);
+  readonly supportEmail = this.environment.supportEmail;
+}

src/app/core/services/user.service.ts

@@ -5,9 +5,9 @@ import { inject, Injectable } from '@angular/core';
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { ProfileSettingsKey } from '@osf/shared/enums/profile-settings-key.enum';
 import { UserMapper } from '@osf/shared/mappers/user';
+import { UserData, UserModel } from '@osf/shared/models/user/user.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 import { ProfileSettingsUpdate } from '@shared/models/profile-settings-update.model';
-import { UserData, UserModel } from '@shared/models/user/user.models';
 import {
   UserAcceptedTermsOfServiceJsonApi,
   UserDataJsonApi,

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

@@ -1,7 +1,7 @@
 import { Education } from '@osf/shared/models/user/education.model';
 import { Employment } from '@osf/shared/models/user/employment.model';
 import { SocialModel } from '@osf/shared/models/user/social.model';
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 
 export class GetCurrentUser {
   static readonly type = '[User] Get Current User';

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

@@ -1,5 +1,5 @@
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 
 export interface UserStateModel {
   currentUser: AsyncStateModel<UserModel | null>;

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

@@ -3,7 +3,7 @@ import { Selector } from '@ngxs/store';
 import { Education } from '@osf/shared/models/user/education.model';
 import { Employment } from '@osf/shared/models/user/employment.model';
 import { SocialModel } from '@osf/shared/models/user/social.model';
-import { UserModel } from '@osf/shared/models/user/user.models';
+import { UserModel } from '@osf/shared/models/user/user.model';
 
 import { UserStateModel } from './user.model';
 import { UserState } from './user.state';

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

@@ -9,8 +9,8 @@ import { UserService } from '@core/services/user.service';
 import { ProfileSettingsKey } from '@osf/shared/enums/profile-settings-key.enum';
 import { removeNullable } from '@osf/shared/helpers/remove-nullable.helper';
 import { UserMapper } from '@osf/shared/mappers/user';
+import { UserModel } from '@osf/shared/models/user/user.model';
 import { SocialModel } from '@shared/models/user/social.model';
-import { UserModel } from '@shared/models/user/user.models';
 
 import {
   AcceptTermsOfServiceByUser,

src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts

@@ -9,7 +9,7 @@ import { ActivatedRoute } from '@angular/router';
 import { BarChartComponent } from '@osf/shared/components/bar-chart/bar-chart.component';
 import { LoadingSpinnerComponent } from '@osf/shared/components/loading-spinner/loading-spinner.component';
 import { StatisticCardComponent } from '@osf/shared/components/statistic-card/statistic-card.component';
-import { DatasetInput } from '@osf/shared/models/charts/dataset-input';
+import { DatasetInput } from '@osf/shared/models/charts/dataset-input.model';
 import { SelectOption } from '@osf/shared/models/select-option.model';
 import { DoughnutChartComponent } from '@shared/components/doughnut-chart/doughnut-chart.component';
 

src/app/features/admin-institutions/store/institutions-admin.model.ts

@@ -1,4 +1,4 @@
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { AsyncStateModel } from '@osf/shared/models/store/async-state.model';
 import { AsyncStateWithTotalCount } from '@osf/shared/models/store/async-state-with-total-count.model';
 

src/app/features/admin-institutions/store/institutions-admin.selectors.ts

@@ -1,6 +1,6 @@
 import { Selector } from '@ngxs/store';
 
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 
 import { InstitutionDepartment, InstitutionSearchFilter, InstitutionSummaryMetrics, InstitutionUser } from '../models';
 

src/app/features/admin-institutions/store/institutions-admin.state.ts

@@ -6,7 +6,7 @@ import { catchError, tap, throwError } from 'rxjs';
 import { inject, Injectable } from '@angular/core';
 
 import { handleSectionError } from '@osf/shared/helpers/state-error.handler';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { InstitutionsService } from '@osf/shared/services/institutions.service';
 
 import { InstitutionsAdminService } from '../services/institutions-admin.service';

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

@@ -30,7 +30,7 @@ import { ViewOnlyLinkMessageComponent } from '@osf/shared/components/view-only-l
 import { IS_WEB } from '@osf/shared/helpers/breakpoints.tokens';
 import { replaceBadEncodedChars } from '@osf/shared/helpers/format-bad-encoding.helper';
 import { Primitive } from '@osf/shared/helpers/types.helper';
-import { DatasetInput } from '@osf/shared/models/charts/dataset-input';
+import { DatasetInput } from '@osf/shared/models/charts/dataset-input.model';
 import { ViewOnlyLinkHelperService } from '@osf/shared/services/view-only-link-helper.service';
 
 import { AnalyticsKpiComponent } from './components';