fix(merge): fixed merge changes

Author: nsemets

src/app/core/constants/nav-items.constant.ts

@@ -96,13 +96,6 @@ export const PROJECT_MENU_ITEMS: CustomMenuItem[] = [
     visible: true,
     routerLinkActiveOptions: { exact: false },
   },
-  {
-    id: 'project-linked-services',
-    label: 'navigation.linkedServices',
-    routerLink: 'links',
-    visible: true,
-    routerLinkActiveOptions: { exact: true },
-  },
   {
     id: 'project-settings',
     label: 'navigation.settings',

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

@@ -101,20 +101,4 @@ describe('Component: Analytics', () => {
 
     expect(navigateSpy).toHaveBeenCalledWith(['duplicates'], { relativeTo: expect.any(Object) });
   });
-
-  it('should set selectedRange via onRangeChange', () => {
-    fixture.detectChanges();
-    component.onRangeChange('month');
-    expect(component.selectedRange()).toBe('month');
-  });
-
-  it('should navigate to duplicates with correct relative route', () => {
-    const router = TestBed.inject(Router);
-    const navigateSpy = jest.spyOn(router, 'navigate');
-
-    fixture.detectChanges();
-    component.navigateToDuplicates();
-
-    expect(navigateSpy).toHaveBeenCalledWith(['duplicates'], { relativeTo: expect.any(Object) });
-  });
 });

src/app/features/files/pages/file-redirect/file-redirect.component.scss

@@ -0,0 +1,4 @@
+:host {
+  display: flex;
+  flex: 1;
+}

src/app/features/files/pages/file-redirect/file-redirect.component.ts

@@ -8,6 +8,7 @@ import { FilesService } from '@osf/shared/services';
   selector: 'osf-file-redirect',
   imports: [],
   templateUrl: './file-redirect.component.html',
+  styleUrl: './file-redirect.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FileRedirectComponent {

src/app/features/institutions/pages/institutions-list/institutions-list.component.ts

@@ -24,7 +24,6 @@ import { FetchInstitutions, InstitutionsSelectors } from '@osf/shared/stores';
     LoadingSpinnerComponent,
     ScheduledBannerComponent,
     RouterLink,
-    ScheduledBannerComponent,
   ],
   templateUrl: './institutions-list.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,

src/app/features/metadata/models/description-result.model.ts

@@ -1,6 +1,6 @@
 export enum PreprintSubmissionsSort {
   TitleAZ = 'title',
   TitleZA = '-title',
-  Oldest = '-date_last_transitioned',
-  Newest = 'date_last_transitioned',
+  Oldest = 'date_last_transitioned',
+  Newest = '-date_last_transitioned',
 }

src/app/features/moderation/enums/preprint-submissions-sort.enum.ts

@@ -66,9 +66,6 @@ describe('MyProjectsComponent', () => {
 
     fixture = TestBed.createComponent(MyProjectsComponent);
     component = fixture.componentInstance;
-
-    (component as any).queryParams = () => ({});
-
     fixture.detectChanges();
   });
 

src/app/features/my-projects/my-projects.component.spec.ts

@@ -11,6 +11,7 @@ <h2>{{ 'preprints.selectService.sectionTitle' | translate }}</h2>
       {{ 'preprints.selectService.learnMore' | translate }}
     </a>
   </p>
+
   <section class="mt-6 grid justify-content-center align-items-start gap-4">
     @if (areProvidersLoading()) {
       @for (_ of skeletonArray; track $index) {
@@ -59,7 +60,7 @@ <h4 class="mt-3">{{ provider.name }}</h4>
       }
     }
   </section>
-  <<<<<<< HEAD ======= >>>>>>> origin/main
+
   <section class="mt-6 flex flex-row justify-content-end">
     <p-button
       [label]="'common.buttons.next' | translate"