[ENG-10251] Standardize model file naming convention

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/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';

src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts

@@ -14,7 +14,7 @@ import { collectionFilterTypes } from '@osf/features/collections/constants';
 import { AddToCollectionSteps, CollectionFilterType } from '@osf/features/collections/enums';
 import { CollectionFilterEntry } from '@osf/features/collections/models/collection-filter-entry.model';
 import { AddToCollectionSelectors } from '@osf/features/collections/store/add-to-collection';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
 import { CollectionsSelectors, GetCollectionDetails } from '@osf/shared/stores/collections';
 
 @Component({

src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts

@@ -40,7 +40,7 @@ import { TruncatedTextComponent } from '@osf/shared/components/truncated-text/tr
 import { InputLimits } from '@osf/shared/constants/input-limits.const';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
 import { LicenseModel } from '@osf/shared/models/license/license.model';
-import { ProjectModel } from '@osf/shared/models/projects/projects.models';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { InterpolatePipe } from '@osf/shared/pipes/interpolate.pipe';
 import { ToastService } from '@osf/shared/services/toast.service';
 import { GetAllContributors } from '@osf/shared/stores/contributors';

src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts

@@ -9,8 +9,8 @@ import { ChangeDetectionStrategy, Component, computed, input, output, signal } f
 
 import { AddToCollectionSteps } from '@osf/features/collections/enums';
 import { ProjectSelectorComponent } from '@osf/shared/components/project-selector/project-selector.component';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { SetSelectedProject } from '@osf/shared/stores/projects';
-import { ProjectModel } from '@shared/models/projects/projects.models';
 import { CollectionsSelectors, GetUserCollectionSubmissions } from '@shared/stores/collections';
 import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors';
 

src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.spec.ts

@@ -4,7 +4,7 @@ import { ComponentRef } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
 
 import { CollectionsSearchResultCardComponent } from './collections-search-result-card.component';
 

src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts

@@ -5,7 +5,7 @@ import { ChangeDetectionStrategy, Component, computed, input } from '@angular/co
 
 import { collectionFilterNames } from '@osf/features/collections/constants';
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
-import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmissionWithGuid } from '@osf/shared/models/collections/collections.model';
 
 @Component({
   selector: 'osf-collections-search-result-card',

src/app/features/collections/services/project-metadata-form.service.ts

@@ -3,9 +3,9 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 
 import { ProjectMetadataFormControls } from '@osf/features/collections/enums';
 import { CustomValidators } from '@osf/shared/helpers/custom-form-validators.helper';
+import { ProjectModel } from '@osf/shared/models/projects/projects.model';
 import { LicenseModel } from '@shared/models/license/license.model';
 import { ProjectMetadataUpdatePayload } from '@shared/models/project-metadata-update-payload.model';
-import { ProjectModel } from '@shared/models/projects/projects.models';
 
 import { ProjectMetadataForm } from '../models/project-metadata-form.model';
 

src/app/features/collections/store/add-to-collection/add-to-collection.model.ts

@@ -1,4 +1,4 @@
-import { CollectionProjectSubmission } from '@osf/shared/models/collections/collections.models';
+import { CollectionProjectSubmission } from '@osf/shared/models/collections/collections.model';
 import { LicenseModel } from '@shared/models/license/license.model';
 import { AsyncStateModel } from '@shared/models/store/async-state.model';
 

src/app/features/contributors/models/index.ts

@@ -1,2 +1,2 @@
 export * from './resource-info.model';
-export * from './view-only-components.models';
+export * from './view-only-components.model';

src/app/features/home/pages/dashboard/dashboard.component.ts

@@ -23,11 +23,11 @@ import { SearchInputComponent } from '@osf/shared/components/search-input/search
 import { SubHeaderComponent } from '@osf/shared/components/sub-header/sub-header.component';
 import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants/default-table-params.constants';
 import { SortOrder } from '@osf/shared/enums/sort-order.enum';
+import { MyResourcesItem } from '@osf/shared/models/my-resources/my-resources.model';
+import { MyResourcesSearchFilters } from '@osf/shared/models/my-resources/my-resources-search-filters.model';
 import { CustomDialogService } from '@osf/shared/services/custom-dialog.service';
 import { ProjectRedirectDialogService } from '@osf/shared/services/project-redirect-dialog.service';
 import { ClearMyResources, GetMyProjects, MyResourcesSelectors } from '@osf/shared/stores/my-resources';
-import { MyResourcesItem } from '@shared/models/my-resources/my-resources.models';
-import { MyResourcesSearchFilters } from '@shared/models/my-resources/my-resources-search-filters.models';
 import { TableParameters } from '@shared/models/table-parameters.model';
 
 @Component({

src/app/features/meetings/models/index.ts

@@ -1,4 +1,4 @@
 export * from './meeting-feature-card.model';
-export * from './meetings.models';
+export * from './meetings.model';
 export * from './meetings-json-api.model';
 export * from './partner-organization.model';

src/app/features/metadata/components/metadata-affiliated-institutions/metadata-affiliated-institutions.component.ts

@@ -6,7 +6,7 @@ import { Card } from 'primeng/card';
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
 import { AffiliatedInstitutionsViewComponent } from '@osf/shared/components/affiliated-institutions-view/affiliated-institutions-view.component';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 
 @Component({
   selector: 'osf-metadata-affiliated-institutions',

src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.spec.ts

@@ -3,7 +3,7 @@ import { MockComponents } from 'ng-mocks';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
 
 import { MetadataCollectionItemComponent } from './metadata-collection-item.component';
 

src/app/features/metadata/components/metadata-collection-item/metadata-collection-item.component.ts

@@ -8,7 +8,7 @@ import { RouterLink } from '@angular/router';
 
 import { collectionFilterNames } from '@osf/features/collections/constants';
 import { CollectionSubmissionReviewState } from '@osf/shared/enums/collection-submission-review-state.enum';
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
 import { KeyValueModel } from '@osf/shared/models/common/key-value.model';
 import { CollectionStatusSeverityPipe } from '@osf/shared/pipes/collection-status-severity.pipe';
 

src/app/features/metadata/components/metadata-collections/metadata-collections.component.ts

@@ -5,7 +5,7 @@ import { Skeleton } from 'primeng/skeleton';
 
 import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 
-import { CollectionSubmission } from '@osf/shared/models/collections/collections.models';
+import { CollectionSubmission } from '@osf/shared/models/collections/collections.model';
 
 import { MetadataCollectionItemComponent } from '../metadata-collection-item/metadata-collection-item.component';
 

src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts

@@ -5,8 +5,8 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AffiliatedInstitutionSelectComponent } from '@osf/shared/components/affiliated-institution-select/affiliated-institution-select.component';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { InstitutionsSelectors } from '@osf/shared/stores/institutions';
-import { Institution } from '@shared/models/institutions/institutions.models';
 
 import { AffiliatedInstitutionsDialogComponent } from './affiliated-institutions-dialog.component';
 

src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts

@@ -9,7 +9,7 @@ import { ChangeDetectionStrategy, Component, inject, OnInit, signal } from '@ang
 import { ReactiveFormsModule } from '@angular/forms';
 
 import { AffiliatedInstitutionSelectComponent } from '@osf/shared/components/affiliated-institution-select/affiliated-institution-select.component';
-import { Institution } from '@osf/shared/models/institutions/institutions.models';
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { FetchUserInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions';
 
 @Component({

src/app/features/metadata/models/metadata.model.ts

@@ -1,6 +1,6 @@
+import { Institution } from '@osf/shared/models/institutions/institutions.model';
 import { UserPermissions } from '@shared/enums/user-permissions.enum';
 import { IdentifierModel } from '@shared/models/identifiers/identifier.model';
-import { Institution } from '@shared/models/institutions/institutions.models';
 import { LicenseModel } from '@shared/models/license/license.model';
 
 export interface MetadataModel {