refactor(search): Refactored search logic for global, institutions page, registrations page search

Author: rrromchIk

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.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.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.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.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/institutions/institutions.routes.ts

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

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

@@ -38,7 +38,7 @@ import {
  UpdateFilterValue,
  UpdateResourceType,
  UpdateSortBy,
-} from '@osf/shared/stores';
+} from '@osf/shared/stores/institutions-search';
 import { StringOrNull } from '@shared/helpers';
 
 @Component({

src/app/features/registries/store/registries-provider-search/registries-provider-search.model.ts

@@ -1,19 +1,8 @@
 import { RegistryProviderDetails } from '@osf/features/registries/models/registry-provider.model';
-import { ResourceTab } from '@shared/enums';
-import { AsyncStateModel, DiscoverableFilter, Resource, SelectOption } from '@shared/models';
+import { AsyncStateModel } from '@shared/models';
+import { BaseSearchStateModel } from '@shared/stores';
 
-export interface RegistriesProviderSearchStateModel {
+export interface RegistriesProviderSearchStateModel extends BaseSearchStateModel {
  currentBrandedProvider: AsyncStateModel<RegistryProviderDetails | null>;
- resourceType: ResourceTab;
- resources: AsyncStateModel<Resource[]>;
- filters: DiscoverableFilter[];
- filterValues: Record<string, string | null>;
- filterOptionsCache: Record<string, SelectOption[]>;
  providerIri: string;
- resourcesCount: number;
- searchText: string;
- sortBy: string;
- first: string;
- next: string;
- previous: string;
 }

src/app/features/registries/store/registries-provider-search/registries-provider-search.selectors.ts

@@ -2,6 +2,7 @@ import { Selector } from '@ngxs/store';
 
 import { RegistriesProviderSearchStateModel } from '@osf/features/registries/store/registries-provider-search/registries-provider-search.model';
 import { RegistriesProviderSearchState } from '@osf/features/registries/store/registries-provider-search/registries-provider-search.state';
+import { StringOrNull } from '@shared/helpers';
 import { DiscoverableFilter, Resource, SelectOption } from '@shared/models';
 
 import { RegistryProviderDetails } from '../../models/registry-provider.model';
@@ -38,7 +39,7 @@ export class RegistriesProviderSearchSelectors {
  }
 
  @Selector([RegistriesProviderSearchState])
- static getSearchText(state: RegistriesProviderSearchStateModel): string {
+ static getSearchText(state: RegistriesProviderSearchStateModel): StringOrNull {
  return state.searchText;
  }
 
@@ -73,7 +74,7 @@ export class RegistriesProviderSearchSelectors {
  }
 
  @Selector([RegistriesProviderSearchState])
- static getFilterValues(state: RegistriesProviderSearchStateModel): Record<string, string | null> {
+ static getFilterValues(state: RegistriesProviderSearchStateModel): Record<string, StringOrNull> {
  return state.filterValues;
  }
 

src/app/features/registries/store/registries-provider-search/registries-provider-search.state.ts

@@ -19,6 +19,7 @@ import {
 import { RegistriesProviderSearchStateModel } from '@osf/features/registries/store/registries-provider-search/registries-provider-search.model';
 import { ResourcesData } from '@osf/features/search/models';
 import { getResourceTypes } from '@osf/shared/helpers';
+import { searchStateDefaults } from '@shared/constants';
 import { ResourceTab } from '@shared/enums';
 import { handleSectionError } from '@shared/helpers';
 import { SearchService } from '@shared/services';
@@ -31,24 +32,14 @@ import { SearchService } from '@shared/services';
  isLoading: false,
  error: null,
  },
- resources: { data: [], isLoading: false, error: null },
- filters: [],
- filterValues: {},
- filterOptionsCache: {},
  providerIri: '',
- resourcesCount: 0,
- searchText: '',
- sortBy: '-relevance',
- first: '',
- next: '',
- previous: '',
- resourceType: ResourceTab.All,
+ ...searchStateDefaults,
  },
 })
 @Injectable()
 export class RegistriesProviderSearchState {
- private readonly searchService = inject(SearchService);
- providersService = inject(ProvidersService);
+ private searchService = inject(SearchService);
+ private providersService = inject(ProvidersService);
 
  private updateResourcesState(ctx: StateContext<RegistriesProviderSearchStateModel>, response: ResourcesData) {
  const state = ctx.getState();