Fix - Search

src/app/app.routes.ts

@@ -8,16 +8,11 @@ import { BookmarksState, ProjectsState } from '@shared/stores';
 import { authGuard, redirectIfLoggedInGuard } from './core/guards';
 import { isProjectGuard } from './core/guards/is-project.guard';
 import { isRegistryGuard } from './core/guards/is-registry.guard';
-import { MyProfileResourceFiltersOptionsState } from './features/my-profile/components/filters/store';
-import { MyProfileResourceFiltersState } from './features/my-profile/components/my-profile-resource-filters/store';
-import { MyProfileState } from './features/my-profile/store';
 import { PreprintState } from './features/preprints/store/preprint';
+import { ProfileState } from './features/profile/store';
 import { RegistriesState } from './features/registries/store';
 import { LicensesHandlers, ProjectsHandlers, ProvidersHandlers } from './features/registries/store/handlers';
 import { FilesHandlers } from './features/registries/store/handlers/files.handlers';
-import { ResourceFiltersOptionsState } from './features/search/components/filters/store';
-import { ResourceFiltersState } from './features/search/components/resource-filters/store';
-import { SearchState } from './features/search/store';
 import { LicensesService } from './shared/services';
 
 export const routes: Routes = [
@@ -71,7 +66,6 @@ export const routes: Routes = [
       {
         path: 'search',
         loadComponent: () => import('./features/search/search.component').then((mod) => mod.SearchComponent),
-        providers: [provideStates([ResourceFiltersState, ResourceFiltersOptionsState, SearchState])],
       },
       {
         path: 'my-projects',
@@ -119,12 +113,19 @@ export const routes: Routes = [
       },
       {
         path: 'my-profile',
-        loadComponent: () => import('./features/my-profile/my-profile.component').then((mod) => mod.MyProfileComponent),
-        providers: [
-          provideStates([MyProfileResourceFiltersState, MyProfileResourceFiltersOptionsState, MyProfileState]),
-        ],
+        loadComponent: () =>
+          import('./features/profile/pages/my-profile/my-profile.component').then((mod) => mod.MyProfileComponent),
+        providers: [provideStates([ProfileState])],
         canActivate: [authGuard],
       },
+      {
+        path: 'user/:id',
+        loadComponent: () =>
+          import('./features/profile/pages/user-profile/user-profile.component').then(
+            (mod) => mod.UserProfileComponent
+          ),
+        providers: [provideStates([ProfileState])],
+      },
       {
         path: 'institutions',
         loadChildren: () => import('./features/institutions/institutions.routes').then((r) => r.routes),

src/app/core/constants/ngxs-states.constant.ts

@@ -6,6 +6,7 @@ import { MetadataState } from '@osf/features/metadata/store';
 import { ProjectOverviewState } from '@osf/features/project/overview/store';
 import { RegistrationsState } from '@osf/features/project/registrations/store';
 import { AddonsState, CurrentResourceState, WikiState } from '@osf/shared/stores';
+import { GlobalSearchState } from '@shared/stores/global-search';
 import { InstitutionsState } from '@shared/stores/institutions';
 import { LicensesState } from '@shared/stores/licenses';
 import { MyResourcesState } from '@shared/stores/my-resources';
@@ -26,4 +27,5 @@ export const STATES = [
   FilesState,
   MetadataState,
   CurrentResourceState,
+  GlobalSearchState,
 ];

src/app/core/guards/is-project.guard.ts

@@ -5,8 +5,9 @@ import { map, switchMap } from 'rxjs/operators';
 import { inject } from '@angular/core';
 import { CanMatchFn, Route, Router, UrlSegment } from '@angular/router';
 
-import { CurrentResourceType } from '../../shared/enums';
-import { CurrentResourceSelectors, GetResource } from '../../shared/stores';
+import { UserSelectors } from '@core/store/user';
+import { CurrentResourceType } from '@shared/enums';
+import { CurrentResourceSelectors, GetResource } from '@shared/stores';
 
 export const isProjectGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) => {
   const store = inject(Store);
@@ -19,8 +20,9 @@ export const isProjectGuard: CanMatchFn = (route: Route, segments: UrlSegment[])
   }
 
   const currentResource = store.selectSnapshot(CurrentResourceSelectors.getCurrentResource);
+  const currentUser = store.selectSnapshot(UserSelectors.getCurrentUser);
 
-  if (currentResource && currentResource.id === id) {
+  if (currentResource && !id.startsWith(currentResource.id)) {
     if (currentResource.type === CurrentResourceType.Projects && currentResource.parentId) {
       router.navigate(['/', currentResource.parentId, 'files', id]);
       return true;
@@ -32,7 +34,11 @@ export const isProjectGuard: CanMatchFn = (route: Route, segments: UrlSegment[])
     }
 
     if (currentResource.type === CurrentResourceType.Users) {
-      router.navigate(['/profile', id]);
+      if (currentUser && currentUser.id === currentResource.id) {
+        router.navigate(['/profile']);
+      } else {
+        router.navigate(['/user', id]);
+      }
       return false;
     }
 
@@ -42,7 +48,7 @@ export const isProjectGuard: CanMatchFn = (route: Route, segments: UrlSegment[])
   return store.dispatch(new GetResource(id)).pipe(
     switchMap(() => store.select(CurrentResourceSelectors.getCurrentResource)),
     map((resource) => {
-      if (!resource || resource.id !== id) {
+      if (!resource || !id.startsWith(resource.id)) {
         return false;
       }
 
@@ -57,7 +63,11 @@ export const isProjectGuard: CanMatchFn = (route: Route, segments: UrlSegment[])
       }
 
       if (resource.type === CurrentResourceType.Users) {
-        router.navigate(['/user', id]);
+        if (currentUser && currentUser.id === resource.id) {
+          router.navigate(['/profile']);
+        } else {
+          router.navigate(['/user', id]);
+        }
         return false;
       }
 

src/app/core/guards/is-registry.guard.ts

@@ -5,8 +5,9 @@ import { map, switchMap } from 'rxjs/operators';
 import { inject } from '@angular/core';
 import { CanMatchFn, Route, Router, UrlSegment } from '@angular/router';
 
-import { CurrentResourceType } from '../../shared/enums';
-import { CurrentResourceSelectors, GetResource } from '../../shared/stores';
+import { UserSelectors } from '@core/store/user';
+import { CurrentResourceType } from '@shared/enums';
+import { CurrentResourceSelectors, GetResource } from '@shared/stores';
 
 export const isRegistryGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) => {
   const store = inject(Store);
@@ -19,8 +20,9 @@ export const isRegistryGuard: CanMatchFn = (route: Route, segments: UrlSegment[]
   }
 
   const currentResource = store.selectSnapshot(CurrentResourceSelectors.getCurrentResource);
+  const currentUser = store.selectSnapshot(UserSelectors.getCurrentUser);
 
-  if (currentResource && currentResource.id === id) {
+  if (currentResource && !id.startsWith(currentResource.id)) {
     if (currentResource.type === CurrentResourceType.Registrations && currentResource.parentId) {
       router.navigate(['/', currentResource.parentId, 'files', id]);
       return true;
@@ -32,7 +34,11 @@ export const isRegistryGuard: CanMatchFn = (route: Route, segments: UrlSegment[]
     }
 
     if (currentResource.type === CurrentResourceType.Users) {
-      router.navigate(['/user', id]);
+      if (currentUser && currentUser.id === currentResource.id) {
+        router.navigate(['/profile']);
+      } else {
+        router.navigate(['/user', id]);
+      }
       return false;
     }
 
@@ -42,7 +48,7 @@ export const isRegistryGuard: CanMatchFn = (route: Route, segments: UrlSegment[]
   return store.dispatch(new GetResource(id)).pipe(
     switchMap(() => store.select(CurrentResourceSelectors.getCurrentResource)),
     map((resource) => {
-      if (!resource || resource.id !== id) {
+      if (!resource || !id.startsWith(resource.id)) {
         return false;
       }
 
@@ -57,7 +63,11 @@ export const isRegistryGuard: CanMatchFn = (route: Route, segments: UrlSegment[]
       }
 
       if (resource.type === CurrentResourceType.Users) {
-        router.navigate(['/profile', id]);
+        if (currentUser && currentUser.id === resource.id) {
+          router.navigate(['/profile']);
+        } else {
+          router.navigate(['/user', id]);
+        }
         return false;
       }
 

src/app/core/services/user.service.ts

@@ -9,13 +9,13 @@ import {
   ProfileSettingsUpdate,
   User,
   UserData,
+  UserDataJsonApi,
   UserDataResponseJsonApi,
-  UserGetResponse,
+  UserResponseJsonApi,
   UserSettings,
   UserSettingsGetResponse,
 } from '@osf/shared/models';
-
-import { JsonApiService } from '../../shared/services';
+import { JsonApiService } from '@shared/services';
 
 import { environment } from 'src/environments/environment';
 
@@ -25,6 +25,12 @@ import { environment } from 'src/environments/environment';
 export class UserService {
   jsonApiService = inject(JsonApiService);
 
+  getUserById(userId: string): Observable<User> {
+    return this.jsonApiService
+      .get<UserResponseJsonApi>(`${environment.apiUrl}/users/${userId}/`)
+      .pipe(map((response) => UserMapper.fromUserGetResponse(response.data)));
+  }
+
   getCurrentUser(): Observable<UserData> {
     return this.jsonApiService
       .get<UserDataResponseJsonApi>(`${environment.apiUrl}/`)
@@ -49,7 +55,7 @@ export class UserService {
     const patchedData = key === ProfileSettingsKey.User ? data : { [key]: data };
 
     return this.jsonApiService
-      .patch<UserGetResponse>(`${environment.apiUrl}/users/${userId}/`, {
+      .patch<UserDataJsonApi>(`${environment.apiUrl}/users/${userId}/`, {
         data: { type: 'users', id: userId, attributes: patchedData },
       })
       .pipe(map((response) => UserMapper.fromUserGetResponse(response)));

src/app/features/admin-institutions/admin-institutions.component.spec.ts

@@ -7,8 +7,8 @@ import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 
+import { InstitutionsSearchState } from '@osf/shared/stores/institutions-search';
 import { LoadingSpinnerComponent, SelectComponent } from '@shared/components';
-import { InstitutionsSearchState } from '@shared/stores';
 
 import { AdminInstitutionsComponent } from './admin-institutions.component';
 

src/app/features/admin-institutions/admin-institutions.component.ts

@@ -9,7 +9,7 @@ import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/cor
 import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
 
 import { Primitive } from '@osf/shared/helpers';
-import { FetchInstitutionById, InstitutionsSearchSelectors } from '@osf/shared/stores';
+import { FetchInstitutionById, InstitutionsSearchSelectors } from '@osf/shared/stores/institutions-search';
 import { LoadingSpinnerComponent, SelectComponent } from '@shared/components';
 
 import { resourceTabOptions } from './constants';

src/app/features/admin-institutions/pages/institutions-preprints/institutions-preprints.component.spec.ts

@@ -12,8 +12,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 
 import { AdminTableComponent } from '@osf/features/admin-institutions/components';
 import { InstitutionsAdminState } from '@osf/features/admin-institutions/store';
+import { InstitutionsSearchState } from '@osf/shared/stores/institutions-search';
 import { LoadingSpinnerComponent } from '@shared/components';
-import { InstitutionsSearchState } from '@shared/stores';
 
 import { InstitutionsPreprintsComponent } from './institutions-preprints.component';
 

src/app/features/admin-institutions/pages/institutions-preprints/institutions-preprints.component.ts

@@ -9,7 +9,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { TABLE_PARAMS } from '@osf/shared/constants';
 import { SortOrder } from '@osf/shared/enums';
 import { Institution, QueryParams } from '@osf/shared/models';
-import { InstitutionsSearchSelectors } from '@osf/shared/stores';
+import { InstitutionsSearchSelectors } from '@osf/shared/stores/institutions-search';
 
 import { AdminTableComponent } from '../../components';
 import { preprintsTableColumns } from '../../constants';

src/app/features/admin-institutions/pages/institutions-projects/institutions-projects.component.spec.ts

@@ -13,8 +13,8 @@ import { ActivatedRoute } from '@angular/router';
 import { AdminTableComponent } from '@osf/features/admin-institutions/components';
 import { InstitutionsAdminState } from '@osf/features/admin-institutions/store';
 import { ToastService } from '@osf/shared/services';
+import { InstitutionsSearchState } from '@osf/shared/stores/institutions-search';
 import { LoadingSpinnerComponent } from '@shared/components';
-import { InstitutionsSearchState } from '@shared/stores';
 
 import { InstitutionsProjectsComponent } from './institutions-projects.component';
 

src/app/features/admin-institutions/pages/institutions-projects/institutions-projects.component.ts

@@ -15,7 +15,7 @@ import { TABLE_PARAMS } from '@osf/shared/constants';
 import { SortOrder } from '@osf/shared/enums';
 import { Institution, QueryParams } from '@osf/shared/models';
 import { ToastService } from '@osf/shared/services';
-import { InstitutionsSearchSelectors } from '@osf/shared/stores';
+import { InstitutionsSearchSelectors } from '@osf/shared/stores/institutions-search';
 
 import { AdminTableComponent } from '../../components';
 import { projectTableColumns } from '../../constants';

src/app/features/admin-institutions/pages/institutions-registrations/institutions-registrations.component.spec.ts

@@ -11,8 +11,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 
 import { AdminTableComponent } from '@osf/features/admin-institutions/components';
 import { InstitutionsAdminState } from '@osf/features/admin-institutions/store';
+import { InstitutionsSearchState } from '@osf/shared/stores/institutions-search';
 import { LoadingSpinnerComponent } from '@shared/components';
-import { InstitutionsSearchState } from '@shared/stores';
 
 import { InstitutionsRegistrationsComponent } from './institutions-registrations.component';
 

src/app/features/admin-institutions/pages/institutions-registrations/institutions-registrations.component.ts

@@ -9,7 +9,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { TABLE_PARAMS } from '@osf/shared/constants';
 import { SortOrder } from '@osf/shared/enums';
 import { Institution, QueryParams } from '@osf/shared/models';
-import { InstitutionsSearchSelectors } from '@osf/shared/stores';
+import { InstitutionsSearchSelectors } from '@osf/shared/stores/institutions-search';
 
 import { AdminTableComponent } from '../../components';
 import { registrationTableColumns } from '../../constants';

src/app/features/admin-institutions/pages/institutions-users/institutions-users.component.spec.ts

@@ -14,7 +14,7 @@ import { UserState } from '@core/store/user';
 import { AdminTableComponent } from '@osf/features/admin-institutions/components';
 import { InstitutionsAdminState } from '@osf/features/admin-institutions/store';
 import { ToastService } from '@osf/shared/services';
-import { InstitutionsSearchState } from '@osf/shared/stores';
+import { InstitutionsSearchState } from '@osf/shared/stores/institutions-search';
 import { LoadingSpinnerComponent, SelectComponent } from '@shared/components';
 import { TranslateServiceMock } from '@shared/mocks';
 

src/app/features/admin-institutions/pages/institutions-users/institutions-users.component.ts

@@ -29,7 +29,7 @@ import { SortOrder } from '@osf/shared/enums';
 import { Primitive } from '@osf/shared/helpers';
 import { QueryParams } from '@osf/shared/models';
 import { ToastService } from '@osf/shared/services';
-import { InstitutionsSearchSelectors } from '@osf/shared/stores';
+import { InstitutionsSearchSelectors } from '@osf/shared/stores/institutions-search';
 
 import { AdminTableComponent } from '../../components';
 import { departmentOptions, userTableColumns } from '../../constants';

src/app/features/files/mappers/resource-metadata.mapper.ts

@@ -1,4 +1,4 @@
-import { ResourceMetadata } from '@osf/shared/models';
+import { ResourceMetadata } from '@shared/models';
 
 import { GetResourceCustomMetadataResponse } from '../models/get-resource-custom-metadata-response.model';
 import { GetResourceShortInfoResponse } from '../models/get-resource-short-info-response.model';

src/app/features/files/store/files.state.ts

@@ -4,11 +4,10 @@ import { catchError, finalize, forkJoin, tap } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
+import { MapResourceMetadata } from '@osf/features/files/mappers';
 import { handleSectionError } from '@osf/shared/helpers';
 import { FilesService, ToastService } from '@shared/services';
 
-import { MapResourceMetadata } from '../mappers/resource-metadata.mapper';
-
 import {
   CreateFolder,
   DeleteEntry,

src/app/features/institutions/institutions.routes.ts

@@ -3,7 +3,7 @@ import { provideStates } from '@ngxs/store';
 import { Routes } from '@angular/router';
 
 import { authGuard } from '@core/guards';
-import { InstitutionsSearchState } from '@osf/shared/stores';
+import { InstitutionsSearchState } from '@shared/stores/institutions-search';
 
 import { InstitutionsComponent } from './institutions.component';
 import { InstitutionsListComponent, InstitutionsSearchComponent } from './pages';