Fix import order

slifty · slifty · commit 054794a82f64 · 2025-07-17T14:49:55.000-04:00
diff --git a/src/app/core/components/change-password/change-password.component.spec.ts b/src/app/core/components/change-password/change-password.component.spec.ts
@@ -1,9 +1,8 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { MessageService } from '@shared/services/message/message.service';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ChangePasswordComponent } from './change-password.component';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 class MessageStub {
   public showMessage(_msg: string): void {}
diff --git a/src/app/core/services/relationship/relationship.service.spec.ts b/src/app/core/services/relationship/relationship.service.spec.ts
@@ -1,14 +1,13 @@
 import { TestBed, inject } from '@angular/core/testing';
 import * as Testing from '@root/test/testbedConfig';
-
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { AccountService } from '@shared/services/account/account.service';
 import { cloneDeep } from 'lodash';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { CookieService } from 'ngx-cookie-service';
 import { StorageService } from '@shared/services/storage/storage.service';
 import { RelationshipService } from './relationship.service';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('RelationshipService', () => {
   beforeEach(() => {
diff --git a/src/app/core/services/tags/tags.service.spec.ts b/src/app/core/services/tags/tags.service.spec.ts
@@ -1,14 +1,13 @@
 /* @format */
 import { TestBed } from '@angular/core/testing';
 import { Subscription } from 'rxjs';
-
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { AccountService } from '@shared/services/account/account.service';
 import { ArchiveVO, RecordVO, TagVO } from '@models';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ApiService } from '@shared/services/api/api.service';
 import { EventEmitter } from '@angular/core';
 import { TagsService } from './tags.service';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 class MockApiService {
   public tag = new MockTagsRepo();
diff --git a/src/app/directive/components/directive-dialog/directive-dialog.component.spec.ts b/src/app/directive/components/directive-dialog/directive-dialog.component.spec.ts
@@ -1,12 +1,11 @@
 /* @format */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { ApiService } from '@shared/services/api/api.service';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { AccountService } from '@shared/services/account/account.service';
 import { AccountVO } from '@models/account-vo';
 import { DirectiveDialogComponent } from './directive-dialog.component';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('DirectiveDialogComponent', () => {
   let component: DirectiveDialogComponent;
diff --git a/src/app/directive/components/legacy-contact-dialog/legacy-contact-dialog.component.spec.ts b/src/app/directive/components/legacy-contact-dialog/legacy-contact-dialog.component.spec.ts
@@ -5,8 +5,8 @@ import { ApiService } from '@shared/services/api/api.service';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { AccountService } from '@shared/services/account/account.service';
 import { AccountVO } from '@models/account-vo';
-import { LegacyContactDialogComponent } from './legacy-contact-dialog.component';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { LegacyContactDialogComponent } from './legacy-contact-dialog.component';
 
 describe('LegacyContactDialogComponent', () => {
   let component: LegacyContactDialogComponent;
diff --git a/src/app/feature-flag/services/feature-flag-api.service.spec.ts b/src/app/feature-flag/services/feature-flag-api.service.spec.ts
@@ -3,9 +3,9 @@ import { TestBed } from '@angular/core/testing';
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { HttpV2Service } from '@shared/services/http-v2/http-v2.service';
 import { environment } from '@root/environments/environment';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { FeatureFlag } from '../types/feature-flag';
 import { FeatureFlagApiService } from './feature-flag-api.service';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('FeatureFlagApiService', () => {
   let service: FeatureFlagApiService;
diff --git a/src/app/file-browser/components/download-button/download-button.component.spec.ts b/src/app/file-browser/components/download-button/download-button.component.spec.ts
@@ -3,9 +3,8 @@ import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { DataService } from '@shared/services/data/data.service';
 import { MessageService } from '@shared/services/message/message.service';
-
-import { DownloadButtonComponent } from './download-button.component';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { DownloadButtonComponent } from './download-button.component';
 
 describe('DownloadButtonComponent', () => {
   let component: DownloadButtonComponent;
diff --git a/src/app/filesystem/filesystem-api.service.spec.ts b/src/app/filesystem/filesystem-api.service.spec.ts
@@ -3,8 +3,8 @@ import { TestBed } from '@angular/core/testing';
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { environment } from '@root/environments/environment';
 import { FolderResponse } from '@shared/services/api/folder.repo';
-import { FilesystemApiService } from './filesystem-api.service';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { FilesystemApiService } from './filesystem-api.service';
 
 describe('FilesystemApiService', () => {
   let service: FilesystemApiService;
diff --git a/src/app/gallery/services/featured-archive.service.spec.ts b/src/app/gallery/services/featured-archive.service.spec.ts
@@ -3,9 +3,9 @@ import { TestBed } from '@angular/core/testing';
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { HttpV2Service } from '@shared/services/http-v2/http-v2.service';
 import { environment } from '@root/environments/environment';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { FeaturedArchive } from '../types/featured-archive';
 import { FeaturedArchiveService } from './featured-archive.service';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('FeaturedArchiveService', () => {
   let service: FeaturedArchiveService;
diff --git a/src/app/notifications/services/notification.service.spec.ts b/src/app/notifications/services/notification.service.spec.ts
@@ -8,14 +8,14 @@ import {
 import { SharedModule } from '@shared/shared.module';
 import { RouterTestingModule } from '@angular/router/testing';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { MessageService } from '@shared/services/message/message.service';
 import { AccountService } from '@shared/services/account/account.service';
 import { ApiService } from '@shared/services/api/api.service';
 import { NotificationResponse } from '@shared/services/api/index.repo';
 import { NotificationVOData } from '@models/notification-vo';
 import { cloneDeep } from 'lodash';
 import { NotificationService } from './notification.service';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 const allNotificationsData: NotificationVOData[] = [
   {
diff --git a/src/app/public/components/archive-search/archive-search.component.spec.ts b/src/app/public/components/archive-search/archive-search.component.spec.ts
@@ -1,5 +1,6 @@
 /* @format */
 import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
 import { of } from 'rxjs';
@@ -8,7 +9,6 @@ import { PublicProfileService } from '@public/services/public-profile/public-pro
 import { ArchiveVO, TagVO } from '@models/index';
 import { Router } from '@angular/router';
 import { ArchiveSearchComponent } from './archive-search.component';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('ArchiveSearchComponent', () => {
   let component: ArchiveSearchComponent;
diff --git a/src/app/public/components/public-search-results/public-search-results.component.spec.ts b/src/app/public/components/public-search-results/public-search-results.component.spec.ts
@@ -4,9 +4,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FolderVO } from '@root/app/models';
 import { SearchService } from '@search/services/search.service';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { DataService } from '../../../shared/services/data/data.service';
 import { PublicSearchResultsComponent } from './public-search-results.component';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('PublicSearchResultsComponent', () => {
   let component: PublicSearchResultsComponent;
diff --git a/src/app/share-links/services/share-links-api.service.spec.ts b/src/app/share-links/services/share-links-api.service.spec.ts
@@ -3,9 +3,9 @@ import { HttpTestingController, provideHttpClientTesting } from '@angular/common
 import { HttpV2Service } from '@shared/services/http-v2/http-v2.service';
 import { environment } from '@root/environments/environment';
 import { StelaItems } from '@root/utils/stela-items';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { ShareLink } from '../models/share-link';
 import { ShareLinksApiService } from './share-links-api.service';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('ShareLinksApiService', () => {
   let service: ShareLinksApiService;
diff --git a/src/app/shared/components/archive-picker/archive-picker.component.spec.ts b/src/app/shared/components/archive-picker/archive-picker.component.spec.ts
@@ -4,8 +4,8 @@ import { AccountService } from '@shared/services/account/account.service';
 import { ApiService } from '@shared/services/api/api.service';
 import { MessageService } from '@shared/services/message/message.service';
 import { DialogRef, DIALOG_DATA } from '@angular/cdk/dialog';
-import { ArchivePickerComponent } from './archive-picker.component';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { ArchivePickerComponent } from './archive-picker.component';
 
 class MockDialogRef {
   close() {}
diff --git a/src/app/shared/components/archive-search-box/archive-search-box.component.spec.ts b/src/app/shared/components/archive-search-box/archive-search-box.component.spec.ts
@@ -1,5 +1,6 @@
 import { DOWN_ARROW, UP_ARROW } from '@angular/cdk/keycodes';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import {
   ComponentFixture,
   fakeAsync,
@@ -14,7 +15,6 @@ import { ApiService } from '@shared/services/api/api.service';
 import { SearchResponse } from '@shared/services/api/index.repo';
 import { of } from 'rxjs';
 import { ArchiveSearchBoxComponent } from './archive-search-box.component';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('ArchiveSearchBoxComponent', () => {
   let relationshipService: RelationshipService;
diff --git a/src/app/shared/services/analytics/analytics.service.spec.ts b/src/app/shared/services/analytics/analytics.service.spec.ts
@@ -3,6 +3,7 @@ import { HttpTestingController, provideHttpClientTesting } from '@angular/common
 import { environment } from '@root/environments/environment';
 import { AccountVO } from '@models/account-vo';
 import { Directive, FolderType, FolderVO, RecordVO } from '@models/index';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { HttpV2Service } from '../http-v2/http-v2.service';
 import { StorageService } from '../storage/storage.service';
 import { DeviceService } from '../device/device.service';
@@ -19,7 +20,6 @@ import {
   PermanentEvent,
 } from '../event/event-types';
 import { AnalyticsService, EventRequestBody } from './analytics.service';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 class MockDeviceMobileWidth {
   private mobileWidth: boolean = false;
diff --git a/src/app/shared/services/api/account.repo.spec.ts b/src/app/shared/services/api/account.repo.spec.ts
@@ -5,8 +5,8 @@ import { environment } from '@root/environments/environment';
 import { HttpService } from '@shared/services/http/http.service';
 import { AccountRepo } from '@shared/services/api/account.repo';
 import { AccountVO } from '@root/app/models';
-import { HttpV2Service } from '../http-v2/http-v2.service';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpV2Service } from '../http-v2/http-v2.service';
 
 describe('AccountRepo', () => {
   let repo: AccountRepo;
diff --git a/src/app/shared/services/api/auth.repo.spec.ts b/src/app/shared/services/api/auth.repo.spec.ts
@@ -12,8 +12,8 @@ import {
   AccountVO,
   ArchiveVO,
 } from '@root/app/models';
-import { HttpV2Service } from '../http-v2/http-v2.service';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpV2Service } from '../http-v2/http-v2.service';
 
 describe('AuthRepo', () => {
   let repo: AuthRepo;
diff --git a/src/app/shared/services/api/billing.repo.spec.ts b/src/app/shared/services/api/billing.repo.spec.ts
@@ -9,8 +9,8 @@ import {
   BillingResponse,
   ClaimingPromoResponse,
 } from '@shared/services/api/billing.repo';
-import { HttpV2Service } from '../http-v2/http-v2.service';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpV2Service } from '../http-v2/http-v2.service';
 
 const apiUrl = (endpoint: string) => `${environment.apiUrl}${endpoint}`;
 
diff --git a/src/app/shared/services/api/directive.repo.spec.ts b/src/app/shared/services/api/directive.repo.spec.ts
@@ -10,9 +10,9 @@ import {
   DirectiveCreateRequest,
   DirectiveUpdateRequest,
 } from '@models/index';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { HttpV2Service } from '../http-v2/http-v2.service';
 import { DirectiveRepo } from './directive.repo';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 const apiUrl = (endpoint: string) => `${environment.apiUrl}${endpoint}`;
 
diff --git a/src/app/shared/services/api/idpuser.repo.spec.ts b/src/app/shared/services/api/idpuser.repo.spec.ts
@@ -4,9 +4,9 @@ import { HttpTestingController, provideHttpClientTesting } from '@angular/common
 import { environment } from '@root/environments/environment';
 
 import { HttpService } from '@shared/services/http/http.service';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { HttpV2Service } from '../http-v2/http-v2.service';
 import { IdPuser } from './idpuser.repo';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('IdpUser', () => {
   let repo: IdPuser;
diff --git a/src/app/shared/services/api/invite.repo.spec.ts b/src/app/shared/services/api/invite.repo.spec.ts
@@ -13,8 +13,8 @@ import {
   RecordVO,
 } from '@root/app/models';
 import { AccessRoleType } from '@models/access-role';
-import { HttpV2Service } from '../http-v2/http-v2.service';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpV2Service } from '../http-v2/http-v2.service';
 
 describe('InviteRepo', () => {
   let repo: InviteRepo;
diff --git a/src/app/shared/services/api/record.repo.spec.ts b/src/app/shared/services/api/record.repo.spec.ts
@@ -4,8 +4,8 @@ import { environment } from '@root/environments/environment';
 import { HttpService } from '@shared/services/http/http.service';
 import { RecordRepo } from '@shared/services/api/record.repo';
 import { RecordVO } from '@root/app/models';
-import { HttpV2Service } from '../http-v2/http-v2.service';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpV2Service } from '../http-v2/http-v2.service';
 
 describe('RecordRepo', () => {
   let repo: RecordRepo;
diff --git a/src/app/shared/services/api/search.repo.spec.ts b/src/app/shared/services/api/search.repo.spec.ts
@@ -2,12 +2,11 @@
 import { TestBed } from '@angular/core/testing';
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { environment } from '@root/environments/environment';
-
 import { HttpService } from '@shared/services/http/http.service';
 import { TagVO } from '@models/tag-vo';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { HttpV2Service } from '../http-v2/http-v2.service';
 import { SearchRepo, SearchResponse } from './search.repo';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('SearchRepo', () => {
   let repo: SearchRepo;
diff --git a/src/app/shared/services/http/http.service.spec.ts b/src/app/shared/services/http/http.service.spec.ts
@@ -3,8 +3,8 @@ import { TestBed } from '@angular/core/testing';
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { HttpService } from '@shared/services/http/http.service';
 import { environment } from '@root/environments/environment';
-import { StorageService } from '../storage/storage.service';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { StorageService } from '../storage/storage.service';
 
 describe('HttpService', () => {
   let service: HttpService;
diff --git a/src/app/shared/services/payer/payer.service.spec.ts b/src/app/shared/services/payer/payer.service.spec.ts
@@ -1,9 +1,9 @@
 /* @format */
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { AccountService } from '../account/account.service';
 import { PayerService } from './payer.service';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('PayerService', () => {
   let service: PayerService;
diff --git a/src/app/user-checklist/services/user-checklist.service.spec.ts b/src/app/user-checklist/services/user-checklist.service.spec.ts
@@ -6,10 +6,10 @@ import { environment } from '@root/environments/environment';
 import { AccountService } from '@shared/services/account/account.service';
 import { AccountVO } from '@models/account-vo';
 import { ArchiveVO } from '@models/index';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { ChecklistApiResponse } from '../types/checklist-item';
 import { UserChecklistService } from './user-checklist.service';
 import { ChecklistEventObserverService } from './checklist-event-observer.service';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('UserChecklistService', () => {
   let service: UserChecklistService;
