Fix/dev to main

jest.config.js

@@ -62,56 +62,21 @@ module.exports = {
   testPathIgnorePatterns: [
     '<rootDir>/src/app/app.config.ts',
     '<rootDir>/src/app/app.routes.ts',
-    '<rootDir>/src/app/features/project/addons/components/configure-configure-addon/',
-    '<rootDir>/src/app/features/project/addons/components/connect-configured-addon/',
-    '<rootDir>/src/app/features/project/addons/components/disconnect-addon-modal/',
-    '<rootDir>/src/app/features/project/addons/components/confirm-account-connection-modal/',
-    '<rootDir>/src/app/features/files/components/create-folder-dialog',
-    '<rootDir>/src/app/features/files/components/edit-file-metadata-dialog',
-    '<rootDir>/src/app/features/files/components/file-keywords',
-    '<rootDir>/src/app/features/files/components/file-metadata',
-    '<rootDir>/src/app/features/files/components/file-resource-metadata',
-    '<rootDir>/src/app/features/files/components/move-file-dialog',
-    '<rootDir>/src/app/features/files/components/rename-file-dialog',
-    '<rootDir>/src/app/features/files/pages/community-metadata',
-    '<rootDir>/src/app/features/my-projects/',
-    '<rootDir>/src/app/features/project/analytics/',
-    '<rootDir>/src/app/features/project/contributors/',
-    '<rootDir>/src/app/features/project/files/',
-    '<rootDir>/src/app/features/project/metadata/',
-    '<rootDir>/src/app/features/project/registrations',
-    '<rootDir>/src/app/features/project/settings',
-    '<rootDir>/src/app/features/project/wiki',
-    '<rootDir>/src/app/features/project/project.component.ts',
-    '<rootDir>/src/app/features/registries/pages',
-    '<rootDir>/src/app/features/registries/registries.component.spec.ts',
-    '<rootDir>/src/app/features/registries/components/metadata/contributors',
-    '<rootDir>/src/app/features/registries/components/metadata/registries-license',
-    '<rootDir>/src/app/features/registries/components/metadata/registries-subjects',
-    '<rootDir>/src/app/features/registries/components/confirm-continue-editing-dialog',
-    '<rootDir>/src/app/features/registries/components/confirm-registration-dialog',
-    '<rootDir>/src/app/features/registries/components/custom-step',
-    '<rootDir>/src/app/features/registries/components/drafts',
-    '<rootDir>/src/app/features/registries/components/files-control',
-    '<rootDir>/src/app/features/registries/components/justification-review',
-    '<rootDir>/src/app/features/registries/components/justification-step',
-    '<rootDir>/src/app/features/registries/components/new-registration',
-    '<rootDir>/src/app/features/registries/components/registry-provider-hero',
-    '<rootDir>/src/app/features/registries/components/registry-services',
-    '<rootDir>/src/app/features/registries/components/review',
-    '<rootDir>/src/app/features/registries/components/select-components-dialog',
+    '<rootDir>/src/app/features/files/components',
+    '<rootDir>/src/app/features/files/pages/file-detail',
+    '<rootDir>/src/app/features/preprints/',
+    '<rootDir>/src/app/features/project/',
+    '<rootDir>/src/app/features/registries/',
+    '<rootDir>/src/app/features/registry/',
     '<rootDir>/src/app/features/settings/addons/',
-    '<rootDir>/src/app/features/settings/tokens/mappers/',
     '<rootDir>/src/app/features/settings/tokens/store/',
     '<rootDir>/src/app/shared/components/file-menu/',
+    '<rootDir>/src/app/shared/components/files-tree/',
     '<rootDir>/src/app/shared/components/line-chart/',
     '<rootDir>/src/app/shared/components/make-decision-dialog/',
     '<rootDir>/src/app/shared/components/pie-chart/',
     '<rootDir>/src/app/shared/components/resource-citations/',
     '<rootDir>/src/app/shared/components/reusable-filter/',
-    '<rootDir>/src/app/shared/components/shared-metadata/dialogs/affiliated-institutions-dialog/',
-    '<rootDir>/src/app/shared/components/shared-metadata/dialogs/contributors-dialog/',
-    '<rootDir>/src/app/shared/components/shared-metadata/shared-metadata',
     '<rootDir>/src/app/shared/components/wiki/edit-section/',
     '<rootDir>/src/app/shared/components/wiki/wiki-list/',
   ],

package.json

@@ -39,7 +39,6 @@
     "@angular/platform-browser": "^19.2.0",
     "@angular/platform-browser-dynamic": "^19.2.0",
     "@angular/router": "^19.2.0",
-    "@angular/service-worker": "^19.2.0",
     "@fortawesome/fontawesome-free": "^6.7.2",
     "@ngx-translate/core": "^16.0.4",
     "@ngx-translate/http-loader": "^16.0.1",

src/app/app.component.spec.ts

@@ -12,7 +12,7 @@ import { OSFConfigService } from '@core/services/osf-config.service';
 import { GetCurrentUser, UserState } from '@core/store/user';
 import { UserEmailsState } from '@core/store/user-emails';
 
-import { FullScreenLoaderComponent, ToastComponent } from './shared/components';
+import { CookieConsentComponent, FullScreenLoaderComponent, ToastComponent } from './shared/components';
 import { TranslateServiceMock } from './shared/mocks';
 import { AppComponent } from './app.component';
 
@@ -33,7 +33,11 @@ describe('Component: App', () => {
     } as any;
 
     await TestBed.configureTestingModule({
-      imports: [OSFTestingModule, AppComponent, ...MockComponents(ToastComponent, FullScreenLoaderComponent)],
+      imports: [
+        OSFTestingModule,
+        AppComponent,
+        ...MockComponents(ToastComponent, FullScreenLoaderComponent, CookieConsentComponent),
+      ],
       providers: [
         provideStore([UserState, UserEmailsState]),
         TranslateServiceMock,

src/app/app.routes.ts

@@ -35,11 +35,6 @@ export const routes: Routes = [
         canActivate: [authGuard],
         providers: [provideStates([ProjectsState])],
       },
-      {
-        path: 'confirm/:userId/:token',
-        loadComponent: () => import('./features/home/home.component').then((mod) => mod.HomeComponent),
-        data: { skipBreadcrumbs: true },
-      },
       {
         path: 'register',
         canActivate: [redirectIfLoggedInGuard],

src/app/core/components/breadcrumb/breadcrumb.component.ts

@@ -17,7 +17,7 @@ export class BreadcrumbComponent {
   private readonly router = inject(Router);
   private readonly route = inject(ActivatedRoute);
 
-  protected readonly url = toSignal(
+  readonly url = toSignal(
     this.router.events.pipe(
       filter((event) => event instanceof NavigationEnd),
       map(() => this.router.url),
@@ -26,7 +26,7 @@ export class BreadcrumbComponent {
     { initialValue: this.router.url }
   );
 
-  protected readonly routeData = toSignal(
+  readonly routeData = toSignal(
     this.router.events.pipe(
       filter((event) => event instanceof NavigationEnd),
       map(() => this.getCurrentRouteData()),
@@ -35,9 +35,9 @@ export class BreadcrumbComponent {
     { initialValue: { skipBreadcrumbs: false } as RouteData }
   );
 
-  protected readonly showBreadcrumb = computed(() => this.routeData()?.skipBreadcrumbs !== true);
+  readonly showBreadcrumb = computed(() => this.routeData()?.skipBreadcrumbs !== true);
 
-  protected readonly parsedUrl = computed(() =>
+  readonly parsedUrl = computed(() =>
     this.url()
       .split('?')[0]
       .split('/')

src/app/core/components/footer/footer.component.html

@@ -6,7 +6,7 @@
       </div>
     </div>
 
-    <div class="footer-socials flex justify-content-center align-items-center" [class]="isWeb() ? 'm-y-12' : 'm-y-24'">
+    <div class="footer-socials flex justify-content-center align-items-center" [class]="isWeb() ? 'my-3' : 'my-4'">
       @for (icon of socialIcons; track icon.name) {
         <a
           class="social-link flex align-items-center justify-content-center"
@@ -21,9 +21,9 @@
 
   <div
     class="footer-secondary-nav flex flex-column justify-content-center align-items-center md:flex-row md:justify-content-between"
-    [class.m-t-24]="!isWeb()"
+    [class.mt-4]="!isWeb()"
   >
-    <div class="footer-links flex flex-wrap justify-content-center m-t-4">
+    <div class="footer-links flex flex-wrap justify-content-center mt-1">
       <a routerLink="/terms-of-use">{{ 'footer.links.termsOfUse' | translate }}</a>
 
       <span class="separator">|</span>
@@ -43,6 +43,6 @@
       <a href="https://www.cos.io/initiatives/top-guidelines">{{ 'footer.links.topGuidelines' | translate }}</a>
     </div>
 
-    <div class="flex justify-content-center m-y-12">{{ 'footer.copyright' | translate }}</div>
+    <div class="flex justify-content-center my-3">{{ 'footer.copyright' | translate }}</div>
   </div>
 </footer>

src/app/core/components/footer/footer.component.ts

@@ -18,5 +18,5 @@ import { IS_WEB } from '@osf/shared/helpers';
 export class FooterComponent {
   isWeb = toSignal(inject(IS_WEB));
 
-  protected readonly socialIcons = SOCIAL_ICONS;
+  readonly socialIcons = SOCIAL_ICONS;
 }

src/app/core/components/nav-menu/nav-menu.component.ts

@@ -38,7 +38,7 @@ export class NavMenuComponent {
   private readonly isAuthenticated = select(UserSelectors.isAuthenticated);
   private readonly currentResource = select(CurrentResourceSelectors.getCurrentResource);
 
-  protected readonly mainMenuItems = computed(() => {
+  readonly mainMenuItems = computed(() => {
     const isAuthenticated = this.isAuthenticated();
     const filtered = filterMenuItems(MENU_ITEMS, isAuthenticated);
 
@@ -63,7 +63,7 @@ export class NavMenuComponent {
     return items;
   });
 
-  protected readonly currentRoute = toSignal(
+  readonly currentRoute = toSignal(
     this.router.events.pipe(
       filter((event): event is NavigationEnd => event instanceof NavigationEnd),
       map(() => this.getRouteInfo())
@@ -73,11 +73,11 @@ export class NavMenuComponent {
     }
   );
 
-  protected readonly currentResourceId = computed(() => this.currentRoute().resourceId);
-  protected readonly currentProviderId = computed(() => this.currentRoute().providerId);
-  protected readonly isCollectionsRoute = computed(() => this.currentRoute().isCollectionsWithId);
-  protected readonly isPreprintRoute = computed(() => this.currentRoute().isPreprintRoute);
-  protected readonly canUserViewReviews = select(UserSelectors.getCanViewReviews);
+  readonly currentResourceId = computed(() => this.currentRoute().resourceId);
+  readonly currentProviderId = computed(() => this.currentRoute().providerId);
+  readonly isCollectionsRoute = computed(() => this.currentRoute().isCollectionsWithId);
+  readonly isPreprintRoute = computed(() => this.currentRoute().isPreprintRoute);
+  readonly canUserViewReviews = select(UserSelectors.getCanViewReviews);
 
   private getRouteInfo() {
     const urlSegments = this.router.url.split('/').filter((segment) => segment);
@@ -115,6 +115,6 @@ export class NavMenuComponent {
     }
   }
 
-  protected readonly hasVisibleChildren = (item: MenuItem): boolean =>
+  readonly hasVisibleChildren = (item: MenuItem): boolean =>
     Array.isArray(item.items) && item.items.some((child) => !!child.visible);
 }

src/app/core/components/root/root.component.html

@@ -26,4 +26,4 @@
   </div>
 }
 
-<p-confirm-dialog styleClass="w-full md:w-6 xl:w-5" />
+<p-confirm-dialog id="dialog" styleClass="w-full md:w-6 xl:w-5" [header]="'common.dialogs.confirmation' | translate" />

src/app/core/components/root/root.component.ts

@@ -1,3 +1,5 @@
+import { TranslatePipe } from '@ngx-translate/core';
+
 import { ConfirmDialog } from 'primeng/confirmdialog';
 
 import { CommonModule } from '@angular/common';
@@ -23,6 +25,7 @@ import { IS_MEDIUM, IS_WEB } from '@osf/shared/helpers';
     BreadcrumbComponent,
     RouterOutlet,
     SidenavComponent,
+    TranslatePipe,
   ],
   templateUrl: './root.component.html',
   styleUrls: ['./root.component.scss'],

src/app/core/components/sidenav/sidenav.component.html

@@ -1,4 +1,4 @@
 <aside class="custom-scrollbar flex flex-column p-4 h-full">
   <img ngSrc="assets/images/logo.svg" alt="OSF Logo" height="36" width="106" />
-  <osf-nav-menu class="m-t-36" />
+  <osf-nav-menu class="mt-5" />
 </aside>

src/app/core/constants/environment.token.ts

@@ -1,8 +1,10 @@
 import { InjectionToken } from '@angular/core';
 
+import { AppEnvironment } from '@shared/models/environment.model';
+
 import { environment } from 'src/environments/environment';
 
-export const ENVIRONMENT = new InjectionToken<typeof environment>('App Environment', {
+export const ENVIRONMENT = new InjectionToken<AppEnvironment>('App Environment', {
   providedIn: 'root',
-  factory: () => environment,
+  factory: () => environment as AppEnvironment,
 });

src/app/core/constants/index.ts

@@ -2,4 +2,3 @@ export * from './error-messages';
 export * from './nav-items.constant';
 export * from './ngxs-states.constant';
 export * from './social-icons.constant';
-export * from './storage-locations.constant';

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

@@ -6,7 +6,6 @@ export const AUTHENTICATED_MENU_ITEMS: string[] = [
   'my-registrations',
   'my-projects',
   'my-preprints',
-  'registries-overview',
   'settings',
 ];
 
@@ -31,14 +30,14 @@ export const PROJECT_MENU_ITEMS: MenuItem[] = [
     label: 'navigation.overview',
     routerLink: 'overview',
     visible: true,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'project-metadata',
     label: 'navigation.metadata',
     routerLink: 'metadata',
     visible: true,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'project-files',
@@ -82,6 +81,13 @@ export const PROJECT_MENU_ITEMS: MenuItem[] = [
     visible: true,
     routerLinkActiveOptions: { exact: true },
   },
+  {
+    id: 'project-linked-services',
+    label: 'navigation.linkedServices',
+    routerLink: 'links',
+    visible: true,
+    routerLinkActiveOptions: { exact: true },
+  },
   {
     id: 'project-settings',
     label: 'navigation.settings',
@@ -107,14 +113,14 @@ export const REGISTRATION_MENU_ITEMS: MenuItem[] = [
     label: 'navigation.overview',
     routerLink: 'overview',
     visible: true,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'registration-metadata',
     label: 'navigation.metadata',
     routerLink: 'metadata',
     visible: true,
-    routerLinkActiveOptions: { exact: true },
+    routerLinkActiveOptions: { exact: false },
   },
   {
     id: 'registration-files',
@@ -165,6 +171,13 @@ export const REGISTRATION_MENU_ITEMS: MenuItem[] = [
     visible: true,
     routerLinkActiveOptions: { exact: false },
   },
+  {
+    id: 'registration-recent-activity',
+    label: 'navigation.recentActivity',
+    routerLink: 'recent-activity',
+    visible: true,
+    routerLinkActiveOptions: { exact: true },
+  },
 ];
 
 export const MENU_ITEMS: MenuItem[] = [
@@ -254,14 +267,14 @@ export const MENU_ITEMS: MenuItem[] = [
         routerLink: '/registries/discover',
         label: 'navigation.discover',
         visible: true,
-        routerLinkActiveOptions: { exact: true },
+        routerLinkActiveOptions: { exact: false },
       },
       {
         id: 'registries-moderation',
-        routerLink: '/registries/osf/moderation',
+        routerLink: '/registries',
         label: 'navigation.moderation',
         visible: false,
-        routerLinkActiveOptions: { exact: true },
+        routerLinkActiveOptions: { exact: false },
       },
       {
         id: 'registry-details',

src/app/core/guards/auth.guard.ts

@@ -5,12 +5,14 @@ import { map, switchMap, take } from 'rxjs';
 import { inject } from '@angular/core';
 import { CanActivateFn, Router } from '@angular/router';
 
+import { AuthService } from '@core/services';
 import { GetCurrentUser, UserSelectors } from '@osf/core/store/user';
 import { hasViewOnlyParam } from '@osf/shared/helpers';
 
 export const authGuard: CanActivateFn = () => {
   const store = inject(Store);
   const router = inject(Router);
+  const authService = inject(AuthService);
 
   const isAuthenticated = store.selectSnapshot(UserSelectors.isAuthenticated);
 
@@ -28,7 +30,7 @@ export const authGuard: CanActivateFn = () => {
         take(1),
         map((isAuthenticated) => {
           if (!isAuthenticated) {
-            router.navigate(['/']);
+            authService.navigateToSignIn();
             return false;
           }