fix(imports): updated imports according to new version

nsemets · nsemets · commit 9fe43b1013e3 · 2026-03-17T11:33:17.000+02:00
diff --git a/src/app/core/components/layout/layout.component.ts b/src/app/core/components/layout/layout.component.ts
@@ -2,7 +2,6 @@ import { TranslatePipe } from '@ngx-translate/core';
 
 import { ConfirmDialog } from 'primeng/confirmdialog';
 
-import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { RouterOutlet } from '@angular/router';
@@ -21,7 +20,6 @@ import { TopnavComponent } from '../topnav/topnav.component';
   selector: 'osf-layout',
   imports: [
     BreadcrumbComponent,
-    CommonModule,
     ConfirmDialog,
     FooterComponent,
     HeaderComponent,
diff --git a/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.ts b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.ts
@@ -2,7 +2,7 @@ import { CookieService } from 'ngx-cookie-service';
 
 import { MessageModule } from 'primeng/message';
 
-import { CommonModule, isPlatformBrowser } from '@angular/common';
+import { isPlatformBrowser } from '@angular/common';
 import { ChangeDetectionStrategy, Component, inject, OnInit, PLATFORM_ID, signal } from '@angular/core';
 
 import { MaintenanceModel } from '../models/maintenance.model';
@@ -22,7 +22,7 @@ import { MaintenanceService } from '../services/maintenance.service';
  */
 @Component({
   selector: 'osf-maintenance-banner',
-  imports: [CommonModule, MessageModule],
+  imports: [MessageModule],
   templateUrl: './maintenance-banner.component.html',
   styleUrls: ['./maintenance-banner.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/features/auth/pages/sign-up/sign-up.component.ts b/src/app/features/auth/pages/sign-up/sign-up.component.ts
@@ -6,7 +6,7 @@ import { Checkbox } from 'primeng/checkbox';
 import { Divider } from 'primeng/divider';
 import { Password } from 'primeng/password';
 
-import { CommonModule, NgOptimizedImage } from '@angular/common';
+import { NgOptimizedImage } from '@angular/common';
 import { HttpErrorResponse } from '@angular/common/http';
 import { Component, inject, OnInit, signal } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
@@ -27,7 +27,6 @@ import { SignUpForm } from '../../models';
 @Component({
   selector: 'osf-sign-up',
   imports: [
-    CommonModule,
     ReactiveFormsModule,
     Button,
     Password,
diff --git a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts
@@ -6,7 +6,6 @@ import { Tooltip } from 'primeng/tooltip';
 
 import { map, of } from 'rxjs';
 
-import { CommonModule } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -36,7 +35,7 @@ import {
 
 @Component({
   selector: 'osf-cedar-template-form',
-  imports: [CommonModule, Button, TranslatePipe, Tooltip, Menu],
+  imports: [Button, TranslatePipe, Tooltip, Menu],
   templateUrl: './cedar-template-form.component.html',
   styleUrl: './cedar-template-form.component.scss',
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
diff --git a/src/app/features/preprints/pages/preprint-details/preprint-details.component.spec.ts b/src/app/features/preprints/pages/preprint-details/preprint-details.component.spec.ts
@@ -7,8 +7,8 @@ import { of, throwError } from 'rxjs';
 import { HttpErrorResponse } from '@angular/common/http';
 import { PLATFORM_ID } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { provideServerRendering } from '@angular/platform-server';
 import { ActivatedRoute, Router } from '@angular/router';
+import { provideServerRendering } from '@angular/ssr';
 
 import { HelpScoutService } from '@core/services/help-scout.service';
 import { PrerenderReadyService } from '@core/services/prerender-ready.service';
diff --git a/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts b/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts
@@ -6,11 +6,11 @@ import { Skeleton } from 'primeng/skeleton';
 
 import { map } from 'rxjs';
 
-import { DOCUMENT } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
   computed,
+  DOCUMENT,
   effect,
   HostBinding,
   HostListener,
diff --git a/src/app/features/project/overview/project-overview.component.spec.ts b/src/app/features/project/overview/project-overview.component.spec.ts
@@ -7,8 +7,8 @@ import { of } from 'rxjs';
 import { HttpTestingController } from '@angular/common/http/testing';
 import { PLATFORM_ID } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { provideServerRendering } from '@angular/platform-server';
 import { ActivatedRoute, Router } from '@angular/router';
+import { provideServerRendering } from '@angular/ssr';
 
 import {
   ClearCollectionModeration,
diff --git a/src/app/shared/components/add-project-form/add-project-form.component.ts b/src/app/shared/components/add-project-form/add-project-form.component.ts
@@ -6,7 +6,6 @@ import { InputText } from 'primeng/inputtext';
 import { Select } from 'primeng/select';
 import { Textarea } from 'primeng/textarea';
 
-import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, input, OnInit, signal } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormGroup, ReactiveFormsModule } from '@angular/forms';
@@ -25,7 +24,6 @@ import { ProjectSelectorComponent } from '../project-selector/project-selector.c
 @Component({
   selector: 'osf-add-project-form',
   imports: [
-    CommonModule,
     ReactiveFormsModule,
     InputText,
     Select,
diff --git a/src/app/shared/components/filter-chips/filter-chips.component.ts b/src/app/shared/components/filter-chips/filter-chips.component.ts
@@ -1,13 +1,12 @@
 import { Chip } from 'primeng/chip';
 
-import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
 
 import { DiscoverableFilter, FilterOption } from '@osf/shared/models/search/discaverable-filter.model';
 
 @Component({
   selector: 'osf-filter-chips',
-  imports: [CommonModule, Chip],
+  imports: [Chip],
   templateUrl: './filter-chips.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
diff --git a/src/app/shared/components/wiki/edit-section/edit-section.component.ts b/src/app/shared/components/wiki/edit-section/edit-section.component.ts
@@ -20,25 +20,24 @@ import { WikiSyntaxHelpDialogComponent } from '../wiki-syntax-help-dialog/wiki-s
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class EditSectionComponent {
+  private readonly customDialogService = inject(CustomDialogService);
+
   readonly currentContent = input.required<string>();
   readonly versionContent = input.required<string>();
   readonly isSaving = input<boolean>(false);
   readonly contentChange = output<string>();
   readonly saveContent = output<string>();
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private editorInstance: any;
+
   content = '';
   initialContent = '';
 
-  private readonly customDialogService = inject(CustomDialogService);
-
-  public options: MdEditorOption = {
+  options: MdEditorOption = {
     showPreviewPanel: false,
     customRender: {},
     fontAwesomeVersion: '6',
-    markedjsOpt: {
-      sanitize: true,
-    },
+    markedjsOpt: { sanitize: true },
     hideIcons: [''],
   };
 
diff --git a/src/app/shared/directives/clear-file.directive.ts b/src/app/shared/directives/clear-file.directive.ts
@@ -1,10 +1,10 @@
-import { Directive, ElementRef, HostListener } from '@angular/core';
+import { Directive, ElementRef, HostListener, inject } from '@angular/core';
 
 @Directive({
   selector: '[osfClearFile]',
 })
 export class ClearFileDirective {
-  constructor(private el: ElementRef<HTMLInputElement>) {}
+  private readonly el = inject(ElementRef<HTMLInputElement>);
 
   @HostListener('click')
   onClick() {
diff --git a/src/app/shared/services/brand.service.ts b/src/app/shared/services/brand.service.ts
@@ -1,5 +1,5 @@
-import { DOCUMENT, isPlatformBrowser } from '@angular/common';
-import { inject, Injectable, PLATFORM_ID } from '@angular/core';
+import { isPlatformBrowser } from '@angular/common';
+import { DOCUMENT, inject, Injectable, PLATFORM_ID } from '@angular/core';
 
 import { BrandModel } from '../models/brand/brand.model';
 
diff --git a/src/app/shared/services/browser-tab.service.ts b/src/app/shared/services/browser-tab.service.ts
@@ -1,5 +1,5 @@
-import { DOCUMENT, isPlatformBrowser } from '@angular/common';
-import { inject, Injectable, PLATFORM_ID } from '@angular/core';
+import { isPlatformBrowser } from '@angular/common';
+import { DOCUMENT, inject, Injectable, PLATFORM_ID } from '@angular/core';
 
 @Injectable({ providedIn: 'root' })
 export class BrowserTabService {
diff --git a/src/app/shared/services/google-file-picker.download.service.spec.ts b/src/app/shared/services/google-file-picker.download.service.spec.ts
@@ -1,4 +1,4 @@
-import { DOCUMENT } from '@angular/common';
+import { DOCUMENT } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 
 import { GoogleFilePickerDownloadService } from './google-file-picker.download.service';
@@ -59,21 +59,7 @@ describe('Service: Google File Picker Download', () => {
   });
 
   it('should emit error when script fails to load', (done) => {
-    const mockScriptElement: Partial<HTMLScriptElement> = {};
-
-    const mockDocument = {
-      createElement: jest.fn(() => mockScriptElement),
-      body: {
-        appendChild: jest.fn(() => {
-          setTimeout(() => {
-            mockScriptElement.onerror?.(new Event('error'));
-          }, 0);
-        }),
-      },
-      querySelector: jest.fn(() => null),
-    };
-
-    const service = new GoogleFilePickerDownloadService(mockDocument as unknown as Document);
+    const service = new GoogleFilePickerDownloadService();
 
     service.loadScript().subscribe({
       next: () => fail('Should not emit next on error'),
diff --git a/src/app/shared/services/google-file-picker.download.service.ts b/src/app/shared/services/google-file-picker.download.service.ts
@@ -1,7 +1,7 @@
 import { Observable, Subscriber } from 'rxjs';
 
-import { DOCUMENT, isPlatformBrowser } from '@angular/common';
-import { Inject, Injectable, PLATFORM_ID } from '@angular/core';
+import { isPlatformBrowser } from '@angular/common';
+import { DOCUMENT, inject, Injectable, PLATFORM_ID } from '@angular/core';
 
 /**
  * Injectable service to load the Google Picker API script dynamically.
@@ -11,21 +11,13 @@ import { Inject, Injectable, PLATFORM_ID } from '@angular/core';
  */
 @Injectable({ providedIn: 'root' })
 export class GoogleFilePickerDownloadService {
+  private document = inject(DOCUMENT);
+  private platformId = inject(PLATFORM_ID);
   /** Tracks whether the script has already been loaded to prevent duplicates. */
   private scriptLoaded = false;
   /** The Google Picker API script URL. */
   private scriptUrl = 'https://apis.google.com/js/api.js';
 
-  /**
-   * Constructor injecting the global `Document` object.
-   *
-   * @param document - The Angular-injected reference to the global `document`.
-   */
-  constructor(
-    @Inject(DOCUMENT) private document: Document,
-    @Inject(PLATFORM_ID) private platformId: string
-  ) {}
-
   /**
    * Dynamically loads the Google Picker script if it hasn't already been loaded.
    *
diff --git a/src/app/shared/services/header-style.service.ts b/src/app/shared/services/header-style.service.ts
@@ -1,5 +1,5 @@
-import { DOCUMENT, isPlatformBrowser } from '@angular/common';
-import { inject, Injectable, PLATFORM_ID } from '@angular/core';
+import { isPlatformBrowser } from '@angular/common';
+import { DOCUMENT, inject, Injectable, PLATFORM_ID } from '@angular/core';
 
 @Injectable({ providedIn: 'root' })
 export class HeaderStyleService {
