From 3657e61b59c4c87b914e1b12715ad3dc98dd0260 Mon Sep 17 00:00:00 2001 From: nsemets Date: Thu, 23 Oct 2025 20:36:19 +0300 Subject: [PATCH 1/3] fix(imports): updated imports for stores --- src/app/app.routes.ts | 3 ++- .../nav-menu/nav-menu.component.spec.ts | 2 +- .../components/nav-menu/nav-menu.component.ts | 2 +- .../core/constants/ngxs-states.constant.ts | 5 +++- src/app/core/guards/is-file.guard.ts | 3 ++- src/app/core/guards/is-project.guard.ts | 2 +- src/app/core/guards/is-registry.guard.ts | 2 +- .../view-duplicates.component.spec.ts | 2 +- .../view-duplicates.component.ts | 3 ++- .../collections/collections.routes.ts | 6 ++++- .../add-to-collection.component.spec.ts | 2 +- .../add-to-collection.component.ts | 2 +- ...collection-metadata-step.component.spec.ts | 2 +- .../collection-metadata-step.component.ts | 2 +- .../project-contributors-step.component.ts | 4 +-- .../project-metadata-step.component.ts | 3 ++- .../select-project-step.component.spec.ts | 2 +- .../select-project-step.component.ts | 2 +- .../collections-discover.component.spec.ts | 2 +- .../collections-discover.component.ts | 2 +- .../create-view-link-dialog.component.spec.ts | 2 +- .../create-view-link-dialog.component.ts | 2 +- .../contributors.component.spec.ts | 4 ++- .../contributors/contributors.component.ts | 18 ++++++++----- .../move-file-dialog.component.spec.ts | 2 +- .../move-file-dialog.component.ts | 6 ++++- .../files/pages/files/files.component.spec.ts | 2 +- .../files/pages/files/files.component.ts | 2 +- .../dashboard/dashboard.component.spec.ts | 2 +- .../pages/dashboard/dashboard.component.ts | 2 +- .../institutions-list.component.ts | 2 +- ...ated-institutions-dialog.component.spec.ts | 2 +- ...ffiliated-institutions-dialog.component.ts | 2 +- .../contributors-dialog.component.spec.ts | 2 +- .../contributors-dialog.component.ts | 2 +- .../features/metadata/metadata.component.ts | 18 ++++++++----- ...n-moderation-submissions.component.spec.ts | 2 +- ...ection-moderation-submissions.component.ts | 2 +- ...llection-submission-item.component.spec.ts | 2 +- .../collection-submission-item.component.ts | 2 +- .../collection-moderation.component.ts | 2 +- .../create-project-dialog.component.spec.ts | 2 +- .../create-project-dialog.component.ts | 2 +- .../my-projects/my-projects.component.spec.ts | 3 ++- .../my-projects/my-projects.component.ts | 5 ++-- .../additional-info.component.spec.ts | 2 +- .../additional-info.component.ts | 2 +- .../citation-section.component.spec.ts | 2 +- .../citation-section.component.ts | 2 +- .../general-information.component.spec.ts | 3 ++- .../general-information.component.ts | 5 ++-- .../preprint-tombstone.component.spec.ts | 3 ++- .../preprint-tombstone.component.ts | 5 ++-- .../preprints-contributors.component.spec.ts | 2 +- .../preprints-contributors.component.ts | 2 +- .../preprints-subjects.component.spec.ts | 2 +- .../preprints-subjects.component.ts | 2 +- .../review-step/review-step.component.spec.ts | 4 ++- .../review-step/review-step.component.ts | 5 ++-- .../preprint-details.component.spec.ts | 2 +- .../preprint-details.component.ts | 2 +- .../features/preprints/preprints.routes.ts | 4 ++- .../linked-services.component.spec.ts | 2 +- .../linked-services.component.ts | 2 +- .../add-component-dialog.component.ts | 2 +- .../citation-addon-card.component.ts | 2 +- .../delete-component-dialog.component.ts | 2 +- .../delete-node-link-dialog.component.ts | 2 +- .../link-resource-dialog.component.ts | 11 ++------ .../linked-resources.component.ts | 2 +- .../overview-collections.component.ts | 2 +- .../overview-components.component.ts | 2 +- .../overview-toolbar.component.ts | 9 ++----- .../overview-wiki/overview-wiki.component.ts | 2 +- .../toggle-publicity-dialog.component.ts | 2 +- .../overview/project-overview.component.ts | 27 +++++++++---------- .../configure-addon.component.spec.ts | 2 +- .../configure-addon.component.ts | 2 +- ...firm-account-connection-modal.component.ts | 2 +- .../connect-configured-addon.component.ts | 2 +- .../disconnect-addon-modal.component.ts | 7 +++-- .../project-addons.component.spec.ts | 2 +- src/app/features/project/project.routes.ts | 14 +++++----- .../registrations/registrations.component.ts | 2 +- .../delete-project-dialog.component.ts | 2 +- ...ings-project-affiliation.component.spec.ts | 2 +- .../settings-project-affiliation.component.ts | 2 +- .../settings/settings.component.spec.ts | 2 +- .../project/settings/settings.component.ts | 9 ++----- .../wiki/legacy-wiki-redirect.component.ts | 2 +- .../project/wiki/wiki.component.spec.ts | 2 +- .../features/project/wiki/wiki.component.ts | 4 +-- .../drafts/drafts.component.spec.ts | 3 ++- .../components/drafts/drafts.component.ts | 8 ++---- ...s-affiliated-institution.component.spec.ts | 2 +- ...stries-affiliated-institution.component.ts | 2 +- .../registries-contributors.component.ts | 2 +- ...registries-metadata-step.component.spec.ts | 15 ++++++----- .../registries-metadata-step.component.ts | 3 ++- .../registries-subjects.component.spec.ts | 2 +- .../registries-subjects.component.ts | 2 +- .../review/review.component.spec.ts | 3 ++- .../components/review/review.component.ts | 5 ++-- .../features/registries/registries.routes.ts | 4 ++- .../registry-overview.component.ts | 7 +++-- .../registry-wiki.component.spec.ts | 2 +- .../registry-wiki/registry-wiki.component.ts | 2 +- src/app/features/registry/registry.routes.ts | 5 +++- .../account-settings.component.spec.ts | 14 +++++----- .../account-settings.component.ts | 2 +- ...default-storage-location.component.spec.ts | 2 +- .../add-project-form.component.spec.ts | 4 ++- .../add-project-form.component.ts | 3 ++- .../storage-item-selector.component.spec.ts | 2 +- .../storage-item-selector.component.ts | 2 +- .../add-contributor-dialog.component.spec.ts | 2 +- .../add-contributor-dialog.component.ts | 2 +- .../files-tree/files-tree.component.spec.ts | 2 +- .../files-tree/files-tree.component.ts | 2 +- .../google-file-picker.component.ts | 2 +- .../make-decision-dialog.component.spec.ts | 2 +- .../make-decision-dialog.component.ts | 2 +- .../project-selector.component.spec.ts | 2 +- .../project-selector.component.ts | 3 +-- .../resource-citations.component.spec.ts | 2 +- .../resource-citations.component.ts | 2 +- .../subjects/subjects.component.spec.ts | 2 +- .../components/subjects/subjects.component.ts | 2 +- .../add-wiki-dialog.component.spec.ts | 2 +- .../add-wiki-dialog.component.ts | 2 +- src/app/shared/stores/index.ts | 17 ------------ 131 files changed, 230 insertions(+), 235 deletions(-) delete mode 100644 src/app/shared/stores/index.ts diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index fefa6332e..7010bec6a 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -3,7 +3,6 @@ import { provideStates } from '@ngxs/store'; import { Routes } from '@angular/router'; import { isFileGuard } from '@core/guards/is-file.guard'; -import { BookmarksState, ProjectsState } from '@shared/stores'; import { authGuard, redirectIfLoggedInGuard } from './core/guards'; import { isProjectGuard } from './core/guards/is-project.guard'; @@ -14,6 +13,8 @@ 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 { LicensesService } from './shared/services'; +import { BookmarksState } from './shared/stores/bookmarks'; +import { ProjectsState } from './shared/stores/projects'; export const routes: Routes = [ { diff --git a/src/app/core/components/nav-menu/nav-menu.component.spec.ts b/src/app/core/components/nav-menu/nav-menu.component.spec.ts index 2ab3830a4..26a43c3aa 100644 --- a/src/app/core/components/nav-menu/nav-menu.component.spec.ts +++ b/src/app/core/components/nav-menu/nav-menu.component.spec.ts @@ -8,7 +8,7 @@ import { CustomMenuItem } from '@osf/core/models'; import { AuthService } from '@osf/core/services'; import { ProviderSelectors } from '@osf/core/store/provider/provider.selectors'; import { UserSelectors } from '@osf/core/store/user/user.selectors'; -import { CurrentResourceSelectors } from '@osf/shared/stores'; +import { CurrentResourceSelectors } from '@osf/shared/stores/current-resource'; import { NavMenuComponent } from './nav-menu.component'; diff --git a/src/app/core/components/nav-menu/nav-menu.component.ts b/src/app/core/components/nav-menu/nav-menu.component.ts index 496ef7c72..6ac7d0bbd 100644 --- a/src/app/core/components/nav-menu/nav-menu.component.ts +++ b/src/app/core/components/nav-menu/nav-menu.component.ts @@ -20,7 +20,7 @@ import { IconComponent } from '@osf/shared/components'; import { CurrentResourceType, ReviewPermissions } from '@osf/shared/enums'; import { getViewOnlyParam } from '@osf/shared/helpers'; import { WrapFnPipe } from '@osf/shared/pipes'; -import { CurrentResourceSelectors, GetResourceDetails } from '@osf/shared/stores'; +import { CurrentResourceSelectors, GetResourceDetails } from '@osf/shared/stores/current-resource'; @Component({ selector: 'osf-nav-menu', diff --git a/src/app/core/constants/ngxs-states.constant.ts b/src/app/core/constants/ngxs-states.constant.ts index b41f1c6a5..08e715223 100644 --- a/src/app/core/constants/ngxs-states.constant.ts +++ b/src/app/core/constants/ngxs-states.constant.ts @@ -6,8 +6,11 @@ import { FilesState } from '@osf/features/files/store'; 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, ContributorsState, CurrentResourceState, WikiState } from '@osf/shared/stores'; +import { AddonsState } from '@osf/shared/stores/addons'; import { BannersState } from '@osf/shared/stores/banners'; +import { ContributorsState } from '@osf/shared/stores/contributors'; +import { CurrentResourceState } from '@osf/shared/stores/current-resource'; +import { WikiState } from '@osf/shared/stores/wiki'; import { GlobalSearchState } from '@shared/stores/global-search'; import { InstitutionsState } from '@shared/stores/institutions'; import { InstitutionsSearchState } from '@shared/stores/institutions-search'; diff --git a/src/app/core/guards/is-file.guard.ts b/src/app/core/guards/is-file.guard.ts index d94cfbdc3..c1e543139 100644 --- a/src/app/core/guards/is-file.guard.ts +++ b/src/app/core/guards/is-file.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 { CurrentResourceSelectors, GetResource } from '@osf/shared/stores/current-resource'; + import { CurrentResourceType } from '../../shared/enums'; -import { CurrentResourceSelectors, GetResource } from '../../shared/stores'; export const isFileGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) => { const store = inject(Store); diff --git a/src/app/core/guards/is-project.guard.ts b/src/app/core/guards/is-project.guard.ts index d1eb1d6fb..43fbc078a 100644 --- a/src/app/core/guards/is-project.guard.ts +++ b/src/app/core/guards/is-project.guard.ts @@ -6,8 +6,8 @@ import { inject } from '@angular/core'; import { CanMatchFn, Route, Router, UrlSegment } from '@angular/router'; import { UserSelectors } from '@core/store/user'; +import { CurrentResourceSelectors, GetResource } from '@osf/shared/stores/current-resource'; import { CurrentResourceType } from '@shared/enums'; -import { CurrentResourceSelectors, GetResource } from '@shared/stores'; export const isProjectGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) => { const store = inject(Store); diff --git a/src/app/core/guards/is-registry.guard.ts b/src/app/core/guards/is-registry.guard.ts index 63dfe4a28..ca713439e 100644 --- a/src/app/core/guards/is-registry.guard.ts +++ b/src/app/core/guards/is-registry.guard.ts @@ -7,7 +7,7 @@ import { CanMatchFn, Route, Router, UrlSegment } from '@angular/router'; import { UserSelectors } from '@core/store/user'; import { CurrentResourceType } from '@shared/enums'; -import { CurrentResourceSelectors, GetResource } from '@shared/stores'; +import { CurrentResourceSelectors, GetResource } from '@shared/stores/current-resource'; export const isRegistryGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) => { const store = inject(Store); diff --git a/src/app/features/analytics/components/view-duplicates/view-duplicates.component.spec.ts b/src/app/features/analytics/components/view-duplicates/view-duplicates.component.spec.ts index dbec46a29..fbdec8174 100644 --- a/src/app/features/analytics/components/view-duplicates/view-duplicates.component.spec.ts +++ b/src/app/features/analytics/components/view-duplicates/view-duplicates.component.spec.ts @@ -10,7 +10,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { ProjectOverviewSelectors } from '@osf/features/project/overview/store'; import { RegistryOverviewSelectors } from '@osf/features/registry/store/registry-overview'; import { ResourceType } from '@osf/shared/enums'; -import { DuplicatesSelectors } from '@osf/shared/stores'; +import { DuplicatesSelectors } from '@osf/shared/stores/duplicates'; import { ContributorsListComponent, CustomPaginatorComponent, diff --git a/src/app/features/analytics/components/view-duplicates/view-duplicates.component.ts b/src/app/features/analytics/components/view-duplicates/view-duplicates.component.ts index 176e26edd..519453b58 100644 --- a/src/app/features/analytics/components/view-duplicates/view-duplicates.component.ts +++ b/src/app/features/analytics/components/view-duplicates/view-duplicates.component.ts @@ -41,7 +41,8 @@ import { import { ResourceType, UserPermissions } from '@osf/shared/enums'; import { BaseNodeModel, ToolbarResource } from '@osf/shared/models'; import { CustomDialogService, LoaderService } from '@osf/shared/services'; -import { ClearDuplicates, DuplicatesSelectors, GetAllDuplicates, GetResourceWithChildren } from '@osf/shared/stores'; +import { GetResourceWithChildren } from '@osf/shared/stores/current-resource'; +import { ClearDuplicates, DuplicatesSelectors, GetAllDuplicates } from '@osf/shared/stores/duplicates'; @Component({ selector: 'osf-view-duplicates', diff --git a/src/app/features/collections/collections.routes.ts b/src/app/features/collections/collections.routes.ts index 851ebacb3..bbdeac48a 100644 --- a/src/app/features/collections/collections.routes.ts +++ b/src/app/features/collections/collections.routes.ts @@ -6,8 +6,12 @@ import { authGuard } from '@osf/core/guards'; import { AddToCollectionState } from '@osf/features/collections/store/add-to-collection'; import { CollectionsModerationState } from '@osf/features/moderation/store/collections-moderation'; import { ConfirmLeavingGuard } from '@shared/guards'; -import { BookmarksState, CitationsState, NodeLinksState, ProjectsState, SubjectsState } from '@shared/stores'; +import { BookmarksState } from '@shared/stores/bookmarks'; +import { CitationsState } from '@shared/stores/citations'; import { CollectionsState } from '@shared/stores/collections'; +import { NodeLinksState } from '@shared/stores/node-links'; +import { ProjectsState } from '@shared/stores/projects'; +import { SubjectsState } from '@shared/stores/subjects'; export const collectionsRoutes: Routes = [ { diff --git a/src/app/features/collections/components/add-to-collection/add-to-collection.component.spec.ts b/src/app/features/collections/components/add-to-collection/add-to-collection.component.spec.ts index c72bcec32..b8125eb79 100644 --- a/src/app/features/collections/components/add-to-collection/add-to-collection.component.spec.ts +++ b/src/app/features/collections/components/add-to-collection/add-to-collection.component.spec.ts @@ -12,7 +12,7 @@ import { SelectProjectStepComponent } from '@osf/features/collections/components import { AddToCollectionSteps } from '@osf/features/collections/enums'; import { LoadingSpinnerComponent } from '@shared/components'; import { CustomDialogService } from '@shared/services'; -import { CollectionsSelectors } from '@shared/stores'; +import { CollectionsSelectors } from '@shared/stores/collections'; import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors'; import { AddToCollectionComponent } from './add-to-collection.component'; diff --git a/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts b/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts index 17fc6b12a..78498c110 100644 --- a/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts +++ b/src/app/features/collections/components/add-to-collection/add-to-collection.component.ts @@ -30,7 +30,7 @@ import { LoadingSpinnerComponent } from '@shared/components'; import { HeaderStyleHelper } from '@shared/helpers'; import { CanDeactivateComponent } from '@shared/models'; import { BrandService, CustomDialogService } from '@shared/services'; -import { CollectionsSelectors, GetCollectionProvider } from '@shared/stores'; +import { CollectionsSelectors, GetCollectionProvider } from '@shared/stores/collections'; import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors'; import { diff --git a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts index 3fe9b9da9..5f1bb4023 100644 --- a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts +++ b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts @@ -6,7 +6,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { AddToCollectionSteps } from '@osf/features/collections/enums'; -import { CollectionsSelectors } from '@shared/stores'; +import { CollectionsSelectors } from '@shared/stores/collections'; import { CollectionMetadataStepComponent } from './collection-metadata-step.component'; diff --git a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts index 0c425e41e..482bc76fa 100644 --- a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts +++ b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts @@ -13,7 +13,7 @@ import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angula import { collectionFilterTypes } from '@osf/features/collections/constants/filter-types.const'; import { AddToCollectionSteps } from '@osf/features/collections/enums'; import { CollectionFilterEntry } from '@osf/features/collections/models'; -import { CollectionsSelectors, GetCollectionDetails } from '@shared/stores'; +import { CollectionsSelectors, GetCollectionDetails } from '@shared/stores/collections'; @Component({ selector: 'osf-collection-metadata-step', diff --git a/src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts b/src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts index 99581d068..d532a621c 100644 --- a/src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts +++ b/src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts @@ -41,8 +41,8 @@ import { ContributorsSelectors, DeleteContributor, LoadMoreContributors, - ProjectsSelectors, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/contributors'; +import { ProjectsSelectors } from '@osf/shared/stores/projects'; @Component({ selector: 'osf-project-contributors-step', diff --git a/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts b/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts index a9df80864..47c2a3862 100644 --- a/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts +++ b/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts @@ -40,7 +40,8 @@ import { LicenseModel } from '@shared/models'; import { ProjectModel } from '@shared/models/projects'; import { InterpolatePipe } from '@shared/pipes'; import { ToastService } from '@shared/services'; -import { ClearProjects, GetAllContributors, UpdateProjectMetadata } from '@shared/stores'; +import { GetAllContributors } from '@shared/stores/contributors'; +import { ClearProjects, UpdateProjectMetadata } from '@shared/stores/projects'; import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors'; @Component({ diff --git a/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.spec.ts b/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.spec.ts index dcd0917d5..237d3c88d 100644 --- a/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.spec.ts +++ b/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.spec.ts @@ -6,7 +6,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ProjectSelectorComponent } from '@shared/components'; import { ToastService } from '@shared/services'; -import { CollectionsSelectors } from '@shared/stores'; +import { CollectionsSelectors } from '@shared/stores/collections'; import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors'; import { SelectProjectStepComponent } from './select-project-step.component'; diff --git a/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts b/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts index 78d9953c3..bef7c72c5 100644 --- a/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts +++ b/src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts @@ -8,7 +8,7 @@ import { Step, StepItem, StepPanel } from 'primeng/stepper'; import { ChangeDetectionStrategy, Component, computed, input, output, signal } from '@angular/core'; import { AddToCollectionSteps } from '@osf/features/collections/enums'; -import { SetSelectedProject } from '@osf/shared/stores'; +import { SetSelectedProject } from '@osf/shared/stores/projects'; import { ProjectSelectorComponent } from '@shared/components'; import { ProjectModel } from '@shared/models/projects'; import { CollectionsSelectors, GetUserCollectionSubmissions } from '@shared/stores/collections'; diff --git a/src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts b/src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts index 3f2ad5eeb..27c54b634 100644 --- a/src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts +++ b/src/app/features/collections/components/collections-discover/collections-discover.component.spec.ts @@ -7,7 +7,7 @@ import { SENTRY_TOKEN } from '@core/provider/sentry.provider'; import { CollectionsMainContentComponent } from '@osf/features/collections/components'; import { LoadingSpinnerComponent, SearchInputComponent } from '@shared/components'; import { CustomDialogService, ToastService } from '@shared/services'; -import { CollectionsSelectors } from '@shared/stores'; +import { CollectionsSelectors } from '@shared/stores/collections'; import { CollectionsDiscoverComponent } from './collections-discover.component'; diff --git a/src/app/features/collections/components/collections-discover/collections-discover.component.ts b/src/app/features/collections/components/collections-discover/collections-discover.component.ts index 77a940823..80a7bf084 100644 --- a/src/app/features/collections/components/collections-discover/collections-discover.component.ts +++ b/src/app/features/collections/components/collections-discover/collections-discover.component.ts @@ -25,7 +25,7 @@ import { SearchCollectionSubmissions, SetPageNumber, SetSearchValue, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/collections'; import { CollectionsQuerySyncService } from '../../services'; import { CollectionsHelpDialogComponent } from '../collections-help-dialog/collections-help-dialog.component'; diff --git a/src/app/features/contributors/components/create-view-link-dialog/create-view-link-dialog.component.spec.ts b/src/app/features/contributors/components/create-view-link-dialog/create-view-link-dialog.component.spec.ts index e7d9849a2..688c92f82 100644 --- a/src/app/features/contributors/components/create-view-link-dialog/create-view-link-dialog.component.spec.ts +++ b/src/app/features/contributors/components/create-view-link-dialog/create-view-link-dialog.component.spec.ts @@ -4,7 +4,7 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { CurrentResourceSelectors } from '@osf/shared/stores'; +import { CurrentResourceSelectors } from '@osf/shared/stores/current-resource'; import { CreateViewLinkDialogComponent } from './create-view-link-dialog.component'; diff --git a/src/app/features/contributors/components/create-view-link-dialog/create-view-link-dialog.component.ts b/src/app/features/contributors/components/create-view-link-dialog/create-view-link-dialog.component.ts index f6c0c68b8..e3c1b4d75 100644 --- a/src/app/features/contributors/components/create-view-link-dialog/create-view-link-dialog.component.ts +++ b/src/app/features/contributors/components/create-view-link-dialog/create-view-link-dialog.component.ts @@ -13,7 +13,7 @@ import { ComponentCheckboxItemComponent, LoadingSpinnerComponent, TextInputCompo import { InputLimits } from '@osf/shared/constants'; import { CustomValidators } from '@osf/shared/helpers'; import { ComponentCheckboxItemModel } from '@osf/shared/models'; -import { CurrentResourceSelectors, GetResourceWithChildren } from '@osf/shared/stores'; +import { CurrentResourceSelectors, GetResourceWithChildren } from '@osf/shared/stores/current-resource'; import { ResourceInfoModel, ViewOnlyLinkComponentItem } from '../../models'; diff --git a/src/app/features/contributors/contributors.component.spec.ts b/src/app/features/contributors/contributors.component.spec.ts index 34f3afa23..4831001a0 100644 --- a/src/app/features/contributors/contributors.component.spec.ts +++ b/src/app/features/contributors/contributors.component.spec.ts @@ -10,7 +10,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ContributorPermission } from '@shared/enums'; import { ContributorModel } from '@shared/models'; import { CustomConfirmationService } from '@shared/services'; -import { ContributorsSelectors, CurrentResourceSelectors, ViewOnlyLinkSelectors } from '@shared/stores'; +import { ContributorsSelectors } from '@shared/stores/contributors'; +import { CurrentResourceSelectors } from '@shared/stores/current-resource'; +import { ViewOnlyLinkSelectors } from '@shared/stores/view-only-links'; import { ContributorsComponent } from './contributors.component'; diff --git a/src/app/features/contributors/contributors.component.ts b/src/app/features/contributors/contributors.component.ts index 226957548..5f620123e 100644 --- a/src/app/features/contributors/contributors.component.ts +++ b/src/app/features/contributors/contributors.component.ts @@ -53,23 +53,27 @@ import { BulkAddContributorsFromParentProject, BulkUpdateContributors, ContributorsSelectors, - CreateViewOnlyLink, - CurrentResourceSelectors, DeleteContributor, - DeleteViewOnlyLink, - FetchViewOnlyLinks, GetAllContributors, GetRequestAccessContributors, - GetResourceDetails, - GetResourceWithChildren, LoadMoreContributors, RejectRequestAccess, ResetContributorsState, UpdateBibliographyFilter, UpdateContributorsSearchValue, UpdatePermissionFilter, +} from '@osf/shared/stores/contributors'; +import { + CurrentResourceSelectors, + GetResourceDetails, + GetResourceWithChildren, +} from '@osf/shared/stores/current-resource'; +import { + CreateViewOnlyLink, + DeleteViewOnlyLink, + FetchViewOnlyLinks, ViewOnlyLinkSelectors, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/view-only-links'; import { CreateViewLinkDialogComponent } from './components'; import { ResourceInfoModel } from './models'; diff --git a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.spec.ts b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.spec.ts index e329e8643..97b2e0ca8 100644 --- a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.spec.ts +++ b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.spec.ts @@ -7,7 +7,7 @@ import { signal } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { CustomConfirmationService, FilesService, ToastService } from '@osf/shared/services'; -import { CurrentResourceSelectors } from '@shared/stores'; +import { CurrentResourceSelectors } from '@shared/stores/current-resource'; import { FilesSelectors } from '../../store'; diff --git a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts index 8e1ed529c..40c0f12bc 100644 --- a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts +++ b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.ts @@ -23,7 +23,11 @@ import { import { FileKind, ResourceType, SupportedFeature } from '@osf/shared/enums'; import { FilesMapper } from '@osf/shared/mappers/files/files.mapper'; import { FileFolderModel, FileModel } from '@osf/shared/models'; -import { CurrentResourceSelectors, GetResourceDetails, GetResourceWithChildren } from '@osf/shared/stores'; +import { + CurrentResourceSelectors, + GetResourceDetails, + GetResourceWithChildren, +} from '@osf/shared/stores/current-resource'; import { FileSelectDestinationComponent, IconComponent, LoadingSpinnerComponent } from '@shared/components'; import { CustomConfirmationService, FilesService, ToastService } from '@shared/services'; diff --git a/src/app/features/files/pages/files/files.component.spec.ts b/src/app/features/files/pages/files/files.component.spec.ts index 1c2955d04..7abc3d793 100644 --- a/src/app/features/files/pages/files/files.component.spec.ts +++ b/src/app/features/files/pages/files/files.component.spec.ts @@ -21,7 +21,7 @@ import { ViewOnlyLinkMessageComponent, } from '@osf/shared/components'; import { CustomConfirmationService, FilesService } from '@osf/shared/services'; -import { CurrentResourceSelectors } from '@osf/shared/stores'; +import { CurrentResourceSelectors } from '@osf/shared/stores/current-resource'; import { GoogleFilePickerComponent } from '@shared/components/google-file-picker/google-file-picker.component'; import { FilesSelectors } from '../../store'; diff --git a/src/app/features/files/pages/files/files.component.ts b/src/app/features/files/pages/files/files.component.ts index 431277fc1..28bde3f50 100644 --- a/src/app/features/files/pages/files/files.component.ts +++ b/src/app/features/files/pages/files/files.component.ts @@ -45,7 +45,7 @@ import { import { ALL_SORT_OPTIONS, FILE_SIZE_LIMIT } from '@osf/shared/constants'; import { FileMenuType, ResourceType, SupportedFeature, UserPermissions } from '@osf/shared/enums'; import { getViewOnlyParamFromUrl, hasViewOnlyParam } from '@osf/shared/helpers'; -import { CurrentResourceSelectors, GetResourceDetails } from '@osf/shared/stores'; +import { CurrentResourceSelectors, GetResourceDetails } from '@osf/shared/stores/current-resource'; import { FilesTreeComponent, FileUploadDialogComponent, diff --git a/src/app/features/home/pages/dashboard/dashboard.component.spec.ts b/src/app/features/home/pages/dashboard/dashboard.component.spec.ts index 7a0213dac..005ddcf6d 100644 --- a/src/app/features/home/pages/dashboard/dashboard.component.spec.ts +++ b/src/app/features/home/pages/dashboard/dashboard.component.spec.ts @@ -13,7 +13,7 @@ import { SearchInputComponent, SubHeaderComponent, } from '@shared/components'; -import { MyResourcesSelectors } from '@shared/stores'; +import { MyResourcesSelectors } from '@shared/stores/my-resources'; import { DashboardComponent } from './dashboard.component'; diff --git a/src/app/features/home/pages/dashboard/dashboard.component.ts b/src/app/features/home/pages/dashboard/dashboard.component.ts index 54aa5bba9..8a04adc12 100644 --- a/src/app/features/home/pages/dashboard/dashboard.component.ts +++ b/src/app/features/home/pages/dashboard/dashboard.component.ts @@ -26,7 +26,7 @@ import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants'; import { SortOrder } from '@osf/shared/enums'; import { MyResourcesItem, MyResourcesSearchFilters, TableParameters } from '@osf/shared/models'; import { CustomDialogService, ProjectRedirectDialogService } from '@osf/shared/services'; -import { ClearMyResources, GetMyProjects, MyResourcesSelectors } from '@osf/shared/stores'; +import { ClearMyResources, GetMyProjects, MyResourcesSelectors } from '@osf/shared/stores/my-resources'; @Component({ selector: 'osf-dashboard', diff --git a/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts b/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts index 17bbdac17..4b1fefc08 100644 --- a/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts +++ b/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts @@ -12,7 +12,7 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { ScheduledBannerComponent } from '@core/components/osf-banners/scheduled-banner/scheduled-banner.component'; import { LoadingSpinnerComponent, SearchInputComponent, SubHeaderComponent } from '@osf/shared/components'; -import { FetchInstitutions, InstitutionsSelectors } from '@osf/shared/stores'; +import { FetchInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions'; @Component({ selector: 'osf-institutions-list', diff --git a/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts b/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts index eb2bd4443..ab70fcd28 100644 --- a/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts +++ b/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.spec.ts @@ -5,7 +5,7 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Institution } from '@osf/shared/models'; -import { InstitutionsSelectors } from '@osf/shared/stores'; +import { InstitutionsSelectors } from '@osf/shared/stores/institutions'; import { AffiliatedInstitutionSelectComponent } from '@shared/components'; import { AffiliatedInstitutionsDialogComponent } from './affiliated-institutions-dialog.component'; diff --git a/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts b/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts index 1733ece21..3c8bb1ac0 100644 --- a/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts +++ b/src/app/features/metadata/dialogs/affiliated-institutions-dialog/affiliated-institutions-dialog.component.ts @@ -10,7 +10,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { AffiliatedInstitutionSelectComponent } from '@osf/shared/components'; import { Institution } from '@osf/shared/models'; -import { FetchUserInstitutions, InstitutionsSelectors } from '@osf/shared/stores'; +import { FetchUserInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions'; @Component({ selector: 'osf-affiliated-institutions-dialog', diff --git a/src/app/features/metadata/dialogs/contributors-dialog/contributors-dialog.component.spec.ts b/src/app/features/metadata/dialogs/contributors-dialog/contributors-dialog.component.spec.ts index 448901f5a..8f1fa353e 100644 --- a/src/app/features/metadata/dialogs/contributors-dialog/contributors-dialog.component.spec.ts +++ b/src/app/features/metadata/dialogs/contributors-dialog/contributors-dialog.component.spec.ts @@ -6,7 +6,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ContributorModel } from '@osf/shared/models'; import { CustomDialogService } from '@osf/shared/services'; -import { ContributorsSelectors } from '@osf/shared/stores'; +import { ContributorsSelectors } from '@osf/shared/stores/contributors'; import { SearchInputComponent } from '@shared/components'; import { ContributorsTableComponent } from '@shared/components/contributors'; diff --git a/src/app/features/metadata/dialogs/contributors-dialog/contributors-dialog.component.ts b/src/app/features/metadata/dialogs/contributors-dialog/contributors-dialog.component.ts index d3f9fd331..7f7d430e0 100644 --- a/src/app/features/metadata/dialogs/contributors-dialog/contributors-dialog.component.ts +++ b/src/app/features/metadata/dialogs/contributors-dialog/contributors-dialog.component.ts @@ -44,7 +44,7 @@ import { UpdateBibliographyFilter, UpdateContributorsSearchValue, UpdatePermissionFilter, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/contributors'; import { MetadataSelectors } from '../../store'; diff --git a/src/app/features/metadata/metadata.component.ts b/src/app/features/metadata/metadata.component.ts index c1ef63a77..157945f25 100644 --- a/src/app/features/metadata/metadata.component.ts +++ b/src/app/features/metadata/metadata.component.ts @@ -24,18 +24,22 @@ import { MetadataTabsModel, SubjectModel } from '@osf/shared/models'; import { CustomConfirmationService, CustomDialogService, ToastService } from '@osf/shared/services'; import { ContributorsSelectors, - FetchChildrenSubjects, - FetchResourceInstitutions, - FetchSelectedSubjects, - FetchSubjects, GetBibliographicContributors, - InstitutionsSelectors, LoadMoreBibliographicContributors, - SubjectsSelectors, UpdateContributorsSearchValue, +} from '@osf/shared/stores/contributors'; +import { + FetchResourceInstitutions, + InstitutionsSelectors, UpdateResourceInstitutions, +} from '@osf/shared/stores/institutions'; +import { + FetchChildrenSubjects, + FetchSelectedSubjects, + FetchSubjects, + SubjectsSelectors, UpdateResourceSubjects, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/subjects'; import { EditTitleDialogComponent } from './dialogs/edit-title-dialog/edit-title-dialog.component'; import { diff --git a/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.spec.ts b/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.spec.ts index bd7f22322..88d55311b 100644 --- a/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.spec.ts +++ b/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.spec.ts @@ -4,7 +4,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute, Router } from '@angular/router'; import { CollectionSubmissionsListComponent } from '@osf/features/moderation/components'; -import { CollectionsSelectors } from '@osf/shared/stores'; +import { CollectionsSelectors } from '@osf/shared/stores/collections'; import { CustomPaginatorComponent, IconComponent, LoadingSpinnerComponent, SelectComponent } from '@shared/components'; import { SubmissionReviewStatus } from '../../enums'; diff --git a/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts b/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts index 867e22cda..16f0fb2e4 100644 --- a/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts +++ b/src/app/features/moderation/components/collection-moderation-submissions/collection-moderation-submissions.component.ts @@ -24,7 +24,7 @@ import { GetCollectionDetails, SearchCollectionSubmissions, SetPageNumber, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/collections'; import { COLLECTIONS_SUBMISSIONS_REVIEW_OPTIONS } from '../../constants'; import { SubmissionReviewStatus } from '../../enums'; diff --git a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.spec.ts b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.spec.ts index 64180a945..6160eae16 100644 --- a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.spec.ts +++ b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.spec.ts @@ -4,7 +4,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute, Router } from '@angular/router'; import { CollectionSubmissionWithGuid } from '@osf/shared/models'; -import { CollectionsSelectors } from '@osf/shared/stores'; +import { CollectionsSelectors } from '@osf/shared/stores/collections'; import { IconComponent } from '@shared/components'; import { DateAgoPipe } from '@shared/pipes'; diff --git a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts index 01e5e221b..cea58dfca 100644 --- a/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts +++ b/src/app/features/moderation/components/collection-submission-item/collection-submission-item.component.ts @@ -11,7 +11,7 @@ import { collectionFilterNames } from '@osf/features/collections/constants'; import { IconComponent, TruncatedTextComponent } from '@osf/shared/components'; import { CollectionSubmissionWithGuid } from '@osf/shared/models'; import { DateAgoPipe } from '@osf/shared/pipes'; -import { CollectionsSelectors } from '@osf/shared/stores'; +import { CollectionsSelectors } from '@osf/shared/stores/collections'; import { ReviewStatusIcon } from '../../constants'; import { SubmissionReviewStatus } from '../../enums'; diff --git a/src/app/features/moderation/pages/collection-moderation/collection-moderation.component.ts b/src/app/features/moderation/pages/collection-moderation/collection-moderation.component.ts index a6ea58f3d..df433f843 100644 --- a/src/app/features/moderation/pages/collection-moderation/collection-moderation.component.ts +++ b/src/app/features/moderation/pages/collection-moderation/collection-moderation.component.ts @@ -12,7 +12,7 @@ import { ActivatedRoute, Router, RouterOutlet } from '@angular/router'; import { ClearCurrentProvider } from '@core/store/provider'; import { SelectComponent, SubHeaderComponent } from '@osf/shared/components'; import { IS_MEDIUM, Primitive } from '@osf/shared/helpers'; -import { GetCollectionProvider } from '@osf/shared/stores'; +import { GetCollectionProvider } from '@osf/shared/stores/collections'; import { COLLECTION_MODERATION_TABS } from '../../constants'; import { CollectionModerationTab } from '../../enums'; diff --git a/src/app/features/my-projects/components/create-project-dialog/create-project-dialog.component.spec.ts b/src/app/features/my-projects/components/create-project-dialog/create-project-dialog.component.spec.ts index 65f89d8c6..f3743edb5 100644 --- a/src/app/features/my-projects/components/create-project-dialog/create-project-dialog.component.spec.ts +++ b/src/app/features/my-projects/components/create-project-dialog/create-project-dialog.component.spec.ts @@ -10,7 +10,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants'; import { ProjectFormControls } from '@osf/shared/enums'; -import { CreateProject, GetMyProjects, MyResourcesSelectors } from '@osf/shared/stores'; +import { CreateProject, GetMyProjects, MyResourcesSelectors } from '@osf/shared/stores/my-resources'; import { AddProjectFormComponent } from '@shared/components'; import { CreateProjectDialogComponent } from './create-project-dialog.component'; diff --git a/src/app/features/my-projects/components/create-project-dialog/create-project-dialog.component.ts b/src/app/features/my-projects/components/create-project-dialog/create-project-dialog.component.ts index 6f74d333a..90eacddad 100644 --- a/src/app/features/my-projects/components/create-project-dialog/create-project-dialog.component.ts +++ b/src/app/features/my-projects/components/create-project-dialog/create-project-dialog.component.ts @@ -13,7 +13,7 @@ import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants'; import { ProjectFormControls } from '@osf/shared/enums'; import { CustomValidators } from '@osf/shared/helpers'; import { ProjectForm } from '@osf/shared/models'; -import { CreateProject, GetMyProjects, MyResourcesSelectors } from '@osf/shared/stores'; +import { CreateProject, GetMyProjects, MyResourcesSelectors } from '@osf/shared/stores/my-resources'; @Component({ selector: 'osf-create-project-dialog', diff --git a/src/app/features/my-projects/my-projects.component.spec.ts b/src/app/features/my-projects/my-projects.component.spec.ts index e8b958e17..a5868a1d5 100644 --- a/src/app/features/my-projects/my-projects.component.spec.ts +++ b/src/app/features/my-projects/my-projects.component.spec.ts @@ -8,7 +8,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { MyProjectsTab } from '@osf/features/my-projects/enums'; import { SortOrder } from '@osf/shared/enums'; import { IS_MEDIUM } from '@osf/shared/helpers'; -import { BookmarksSelectors, MyResourcesSelectors } from '@osf/shared/stores'; +import { BookmarksSelectors } from '@osf/shared/stores/bookmarks'; +import { MyResourcesSelectors } from '@osf/shared/stores/my-resources'; import { MyProjectsTableComponent, SearchInputComponent, diff --git a/src/app/features/my-projects/my-projects.component.ts b/src/app/features/my-projects/my-projects.component.ts index b9381dc6a..618c2df18 100644 --- a/src/app/features/my-projects/my-projects.component.ts +++ b/src/app/features/my-projects/my-projects.component.ts @@ -33,16 +33,15 @@ import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants'; import { ResourceType, SortOrder } from '@osf/shared/enums'; import { IS_MEDIUM } from '@osf/shared/helpers'; import { MyResourcesItem, MyResourcesSearchFilters, QueryParams, TableParameters } from '@osf/shared/models'; +import { BookmarksSelectors, GetBookmarksCollectionId } from '@osf/shared/stores/bookmarks'; import { - BookmarksSelectors, ClearMyResources, - GetBookmarksCollectionId, GetMyBookmarks, GetMyPreprints, GetMyProjects, GetMyRegistrations, MyResourcesSelectors, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/my-resources'; import { CustomDialogService, ProjectRedirectDialogService } from '@shared/services'; import { PROJECT_FILTER_OPTIONS } from './constants/project-filter-options.const'; diff --git a/src/app/features/preprints/components/preprint-details/additional-info/additional-info.component.spec.ts b/src/app/features/preprints/components/preprint-details/additional-info/additional-info.component.spec.ts index 5461b28aa..5ecafc126 100644 --- a/src/app/features/preprints/components/preprint-details/additional-info/additional-info.component.spec.ts +++ b/src/app/features/preprints/components/preprint-details/additional-info/additional-info.component.spec.ts @@ -5,7 +5,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { CitationSectionComponent } from '@osf/features/preprints/components/preprint-details/citation-section/citation-section.component'; import { PreprintSelectors } from '@osf/features/preprints/store/preprint'; import { InterpolatePipe } from '@shared/pipes'; -import { SubjectsSelectors } from '@shared/stores'; +import { SubjectsSelectors } from '@shared/stores/subjects'; import { AdditionalInfoComponent } from './additional-info.component'; diff --git a/src/app/features/preprints/components/preprint-details/additional-info/additional-info.component.ts b/src/app/features/preprints/components/preprint-details/additional-info/additional-info.component.ts index c18ba618d..80c132146 100644 --- a/src/app/features/preprints/components/preprint-details/additional-info/additional-info.component.ts +++ b/src/app/features/preprints/components/preprint-details/additional-info/additional-info.component.ts @@ -15,7 +15,7 @@ import { CitationSectionComponent } from '@osf/features/preprints/components/pre import { PreprintSelectors } from '@osf/features/preprints/store/preprint'; import { ResourceType } from '@shared/enums'; import { InterpolatePipe } from '@shared/pipes'; -import { FetchSelectedSubjects, SubjectsSelectors } from '@shared/stores'; +import { FetchSelectedSubjects, SubjectsSelectors } from '@shared/stores/subjects'; @Component({ selector: 'osf-preprint-additional-info', diff --git a/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.spec.ts b/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.spec.ts index 599b465d6..a6512b47c 100644 --- a/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.spec.ts +++ b/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { CitationStyle } from '@shared/models'; -import { CitationsSelectors } from '@shared/stores'; +import { CitationsSelectors } from '@shared/stores/citations'; import { CitationSectionComponent } from './citation-section.component'; diff --git a/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.ts b/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.ts index 81edf77a1..7e595f6ab 100644 --- a/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.ts +++ b/src/app/features/preprints/components/preprint-details/citation-section/citation-section.component.ts @@ -30,7 +30,7 @@ import { GetCitationStyles, GetStyledCitation, UpdateCustomCitation, -} from '@shared/stores'; +} from '@shared/stores/citations'; @Component({ selector: 'osf-preprint-citation-section', diff --git a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.spec.ts b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.spec.ts index c5e129de1..9baa56810 100644 --- a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.spec.ts +++ b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.spec.ts @@ -11,7 +11,8 @@ import { IconComponent, TruncatedTextComponent, } from '@shared/components'; -import { ContributorsSelectors, InstitutionsSelectors } from '@shared/stores'; +import { ContributorsSelectors } from '@shared/stores/contributors'; +import { InstitutionsSelectors } from '@shared/stores/institutions'; import { PreprintDoiSectionComponent } from '../preprint-doi-section/preprint-doi-section.component'; diff --git a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts index b2af64189..4f9b1650f 100644 --- a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts +++ b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts @@ -21,12 +21,11 @@ import { import { ResourceType } from '@osf/shared/enums'; import { ContributorsSelectors, - FetchResourceInstitutions, GetBibliographicContributors, - InstitutionsSelectors, LoadMoreBibliographicContributors, ResetContributorsState, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/contributors'; +import { FetchResourceInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions'; import { PreprintDoiSectionComponent } from '../preprint-doi-section/preprint-doi-section.component'; diff --git a/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.spec.ts b/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.spec.ts index be2c331e4..8b8a19bd3 100644 --- a/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.spec.ts +++ b/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.spec.ts @@ -6,7 +6,8 @@ import { PreprintProviderDetails } from '@osf/features/preprints/models'; import { PreprintSelectors } from '@osf/features/preprints/store/preprint'; import { ContributorsListComponent, TruncatedTextComponent } from '@osf/shared/components'; import { InterpolatePipe } from '@osf/shared/pipes'; -import { ContributorsSelectors, SubjectsSelectors } from '@osf/shared/stores'; +import { ContributorsSelectors } from '@osf/shared/stores/contributors'; +import { SubjectsSelectors } from '@osf/shared/stores/subjects'; import { PreprintDoiSectionComponent } from '../preprint-doi-section/preprint-doi-section.component'; diff --git a/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.ts b/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.ts index bb410923c..aaa407bc7 100644 --- a/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.ts +++ b/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.ts @@ -19,12 +19,11 @@ import { ResourceType } from '@osf/shared/enums'; import { InterpolatePipe } from '@osf/shared/pipes'; import { ContributorsSelectors, - FetchSelectedSubjects, GetBibliographicContributors, LoadMoreBibliographicContributors, ResetContributorsState, - SubjectsSelectors, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/contributors'; +import { FetchSelectedSubjects, SubjectsSelectors } from '@osf/shared/stores/subjects'; import { PreprintDoiSectionComponent } from '../preprint-doi-section/preprint-doi-section.component'; diff --git a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-contributors/preprints-contributors.component.spec.ts b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-contributors/preprints-contributors.component.spec.ts index abf7884cf..68481f6c6 100644 --- a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-contributors/preprints-contributors.component.spec.ts +++ b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-contributors/preprints-contributors.component.spec.ts @@ -6,7 +6,7 @@ import { UserSelectors } from '@core/store/user'; import { ContributorsTableComponent } from '@osf/shared/components/contributors'; import { ContributorModel } from '@shared/models'; import { CustomConfirmationService, CustomDialogService, ToastService } from '@shared/services'; -import { ContributorsSelectors } from '@shared/stores'; +import { ContributorsSelectors } from '@shared/stores/contributors'; import { PreprintsContributorsComponent } from './preprints-contributors.component'; diff --git a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-contributors/preprints-contributors.component.ts b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-contributors/preprints-contributors.component.ts index 0331b822f..d11782ce5 100644 --- a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-contributors/preprints-contributors.component.ts +++ b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-contributors/preprints-contributors.component.ts @@ -42,7 +42,7 @@ import { DeleteContributor, GetAllContributors, LoadMoreContributors, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/contributors'; @Component({ selector: 'osf-preprints-contributors', diff --git a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-subjects/preprints-subjects.component.spec.ts b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-subjects/preprints-subjects.component.spec.ts index 578e1174a..42e91469b 100644 --- a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-subjects/preprints-subjects.component.spec.ts +++ b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-subjects/preprints-subjects.component.spec.ts @@ -6,7 +6,7 @@ import { FormControl } from '@angular/forms'; import { PreprintStepperSelectors } from '@osf/features/preprints/store/preprint-stepper'; import { SubjectsComponent } from '@osf/shared/components'; import { SubjectModel } from '@osf/shared/models'; -import { SubjectsSelectors } from '@osf/shared/stores'; +import { SubjectsSelectors } from '@osf/shared/stores/subjects'; import { PreprintsSubjectsComponent } from './preprints-subjects.component'; diff --git a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-subjects/preprints-subjects.component.ts b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-subjects/preprints-subjects.component.ts index b7d18cdbe..8551451f4 100644 --- a/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-subjects/preprints-subjects.component.ts +++ b/src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-subjects/preprints-subjects.component.ts @@ -19,7 +19,7 @@ import { FetchSubjects, SubjectsSelectors, UpdateResourceSubjects, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/subjects'; @Component({ selector: 'osf-preprints-subjects', diff --git a/src/app/features/preprints/components/stepper/review-step/review-step.component.spec.ts b/src/app/features/preprints/components/stepper/review-step/review-step.component.spec.ts index 335b27a9f..455f94667 100644 --- a/src/app/features/preprints/components/stepper/review-step/review-step.component.spec.ts +++ b/src/app/features/preprints/components/stepper/review-step/review-step.component.spec.ts @@ -8,7 +8,9 @@ import { PreprintProviderDetails } from '@osf/features/preprints/models'; import { PreprintStepperSelectors } from '@osf/features/preprints/store/preprint-stepper'; import { InterpolatePipe } from '@shared/pipes'; import { ToastService } from '@shared/services'; -import { ContributorsSelectors, InstitutionsSelectors, SubjectsSelectors } from '@shared/stores'; +import { ContributorsSelectors } from '@shared/stores/contributors'; +import { InstitutionsSelectors } from '@shared/stores/institutions'; +import { SubjectsSelectors } from '@shared/stores/subjects'; import { ReviewStepComponent } from './review-step.component'; diff --git a/src/app/features/preprints/components/stepper/review-step/review-step.component.ts b/src/app/features/preprints/components/stepper/review-step/review-step.component.ts index 7c277d1d5..4dc31ccf1 100644 --- a/src/app/features/preprints/components/stepper/review-step/review-step.component.ts +++ b/src/app/features/preprints/components/stepper/review-step/review-step.component.ts @@ -33,12 +33,11 @@ import { InterpolatePipe } from '@shared/pipes'; import { ToastService } from '@shared/services'; import { ContributorsSelectors, - FetchSelectedSubjects, GetBibliographicContributors, LoadMoreBibliographicContributors, - SubjectsSelectors, -} from '@shared/stores'; +} from '@shared/stores/contributors'; import { FetchResourceInstitutions, InstitutionsSelectors } from '@shared/stores/institutions'; +import { FetchSelectedSubjects, SubjectsSelectors } from '@shared/stores/subjects'; @Component({ selector: 'osf-review-step', diff --git a/src/app/features/preprints/pages/preprint-details/preprint-details.component.spec.ts b/src/app/features/preprints/pages/preprint-details/preprint-details.component.spec.ts index cc766c833..2a57fd3c3 100644 --- a/src/app/features/preprints/pages/preprint-details/preprint-details.component.spec.ts +++ b/src/app/features/preprints/pages/preprint-details/preprint-details.component.spec.ts @@ -9,7 +9,7 @@ import { UserSelectors } from '@core/store/user'; import { UserPermissions } from '@osf/shared/enums'; import { CustomDialogService, MetaTagsService } from '@osf/shared/services'; import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; -import { ContributorsSelectors } from '@osf/shared/stores'; +import { ContributorsSelectors } from '@osf/shared/stores/contributors'; import { AdditionalInfoComponent, diff --git a/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts b/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts index 8db420ff6..ff01240b4 100644 --- a/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts +++ b/src/app/features/preprints/pages/preprint-details/preprint-details.component.ts @@ -55,7 +55,7 @@ import { ReviewPermissions, UserPermissions } from '@shared/enums'; import { CustomDialogService, MetaTagsService, ToastService } from '@shared/services'; import { AnalyticsService } from '@shared/services/analytics.service'; import { DataciteService } from '@shared/services/datacite/datacite.service'; -import { ContributorsSelectors } from '@shared/stores'; +import { ContributorsSelectors } from '@shared/stores/contributors'; import { PreprintWarningBannerComponent } from '../../components/preprint-details/preprint-warning-banner/preprint-warning-banner.component'; diff --git a/src/app/features/preprints/preprints.routes.ts b/src/app/features/preprints/preprints.routes.ts index 2f3ba9325..a1d8b12ad 100644 --- a/src/app/features/preprints/preprints.routes.ts +++ b/src/app/features/preprints/preprints.routes.ts @@ -9,7 +9,9 @@ import { PreprintState } from '@osf/features/preprints/store/preprint'; import { PreprintProvidersState } from '@osf/features/preprints/store/preprint-providers'; import { PreprintStepperState } from '@osf/features/preprints/store/preprint-stepper'; import { ConfirmLeavingGuard } from '@shared/guards'; -import { CitationsState, ProjectsState, SubjectsState } from '@shared/stores'; +import { CitationsState } from '@shared/stores/citations'; +import { ProjectsState } from '@shared/stores/projects'; +import { SubjectsState } from '@shared/stores/subjects'; import { PreprintModerationState } from '../moderation/store/preprint-moderation'; diff --git a/src/app/features/project/linked-services/linked-services.component.spec.ts b/src/app/features/project/linked-services/linked-services.component.spec.ts index 909cb5837..011fc0289 100644 --- a/src/app/features/project/linked-services/linked-services.component.spec.ts +++ b/src/app/features/project/linked-services/linked-services.component.spec.ts @@ -5,7 +5,7 @@ import { ActivatedRoute } from '@angular/router'; import { UserSelectors } from '@core/store/user'; import { LoadingSpinnerComponent, SubHeaderComponent } from '@osf/shared/components'; -import { AddonsSelectors } from '@shared/stores'; +import { AddonsSelectors } from '@shared/stores/addons'; import { CurrentResourceSelectors } from '@shared/stores/current-resource'; import { LinkedServicesComponent } from './linked-services.component'; diff --git a/src/app/features/project/linked-services/linked-services.component.ts b/src/app/features/project/linked-services/linked-services.component.ts index ff1e5834f..aea781e17 100644 --- a/src/app/features/project/linked-services/linked-services.component.ts +++ b/src/app/features/project/linked-services/linked-services.component.ts @@ -11,7 +11,7 @@ import { UserSelectors } from '@core/store/user'; import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components'; import { AddonServiceNames } from '@shared/enums'; import { convertCamelCaseToNormal } from '@shared/helpers'; -import { AddonsSelectors, GetAddonsResourceReference, GetConfiguredLinkAddons } from '@shared/stores'; +import { AddonsSelectors, GetAddonsResourceReference, GetConfiguredLinkAddons } from '@shared/stores/addons'; import { CurrentResourceSelectors } from '@shared/stores/current-resource'; @Component({ diff --git a/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts b/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts index 2e603a2d5..a996a4cfe 100644 --- a/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts +++ b/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts @@ -19,8 +19,8 @@ import { ComponentFormControls } from '@osf/shared/enums'; import { CustomValidators } from '@osf/shared/helpers'; import { ComponentForm, Institution } from '@osf/shared/models'; import { ToastService } from '@osf/shared/services'; -import { FetchRegions, RegionsSelectors } from '@osf/shared/stores'; import { FetchUserInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions'; +import { FetchRegions, RegionsSelectors } from '@osf/shared/stores/regions'; import { CreateComponent, GetComponents, ProjectOverviewSelectors } from '../../store'; diff --git a/src/app/features/project/overview/components/citation-addon-card/citation-addon-card.component.ts b/src/app/features/project/overview/components/citation-addon-card/citation-addon-card.component.ts index e0c9ac1bc..d8e56fdf6 100644 --- a/src/app/features/project/overview/components/citation-addon-card/citation-addon-card.component.ts +++ b/src/app/features/project/overview/components/citation-addon-card/citation-addon-card.component.ts @@ -25,8 +25,8 @@ import { OperationNames, StorageItemType } from '@shared/enums'; import { formatCitation, getItemUrl } from '@shared/helpers'; import { CitationStyle, ConfiguredAddonModel, CustomOption, StorageItem } from '@shared/models'; import { AddonOperationInvocationService, CslStyleManagerService } from '@shared/services'; -import { CitationsSelectors, GetCitationStyles } from '@shared/stores'; import { AddonsSelectors, CreateCitationAddonOperationInvocation } from '@shared/stores/addons'; +import { CitationsSelectors, GetCitationStyles } from '@shared/stores/citations'; import '@citation-js/plugin-csl'; diff --git a/src/app/features/project/overview/components/delete-component-dialog/delete-component-dialog.component.ts b/src/app/features/project/overview/components/delete-component-dialog/delete-component-dialog.component.ts index 85a36db14..fcbd08125 100644 --- a/src/app/features/project/overview/components/delete-component-dialog/delete-component-dialog.component.ts +++ b/src/app/features/project/overview/components/delete-component-dialog/delete-component-dialog.component.ts @@ -16,7 +16,7 @@ import { RegistryOverviewSelectors } from '@osf/features/registry/store/registry import { ScientistsNames } from '@osf/shared/constants'; import { ResourceType, UserPermissions } from '@osf/shared/enums'; import { ToastService } from '@osf/shared/services'; -import { CurrentResourceSelectors } from '@osf/shared/stores'; +import { CurrentResourceSelectors } from '@osf/shared/stores/current-resource'; import { GetComponents, ProjectOverviewSelectors } from '../../store'; diff --git a/src/app/features/project/overview/components/delete-node-link-dialog/delete-node-link-dialog.component.ts b/src/app/features/project/overview/components/delete-node-link-dialog/delete-node-link-dialog.component.ts index 97d9f20f3..78311fe83 100644 --- a/src/app/features/project/overview/components/delete-node-link-dialog/delete-node-link-dialog.component.ts +++ b/src/app/features/project/overview/components/delete-node-link-dialog/delete-node-link-dialog.component.ts @@ -8,7 +8,7 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; import { ChangeDetectionStrategy, Component, DestroyRef, inject } from '@angular/core'; import { ToastService } from '@osf/shared/services'; -import { DeleteNodeLink, GetLinkedResources, NodeLinksSelectors } from '@osf/shared/stores'; +import { DeleteNodeLink, GetLinkedResources, NodeLinksSelectors } from '@osf/shared/stores/node-links'; import { ProjectOverviewSelectors } from '../../store'; diff --git a/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.ts b/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.ts index 0f2058ec1..d0625131a 100644 --- a/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.ts +++ b/src/app/features/project/overview/components/link-resource-dialog/link-resource-dialog.component.ts @@ -28,15 +28,8 @@ import { FormControl, FormsModule } from '@angular/forms'; import { SearchInputComponent } from '@osf/shared/components'; import { ResourceSearchMode, ResourceType } from '@osf/shared/enums'; import { MyResourcesItem, MyResourcesSearchFilters } from '@osf/shared/models'; -import { - CreateNodeLink, - DeleteNodeLink, - GetLinkedResources, - GetMyProjects, - GetMyRegistrations, - MyResourcesSelectors, - NodeLinksSelectors, -} from '@osf/shared/stores'; +import { GetMyProjects, GetMyRegistrations, MyResourcesSelectors } from '@osf/shared/stores/my-resources'; +import { CreateNodeLink, DeleteNodeLink, GetLinkedResources, NodeLinksSelectors } from '@osf/shared/stores/node-links'; import { ProjectOverviewSelectors } from '../../store'; diff --git a/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts b/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts index 9a163e821..503e1f984 100644 --- a/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts +++ b/src/app/features/project/overview/components/linked-resources/linked-resources.component.ts @@ -9,7 +9,7 @@ import { ChangeDetectionStrategy, Component, inject, input } from '@angular/core import { ContributorsListComponent, IconComponent, TruncatedTextComponent } from '@osf/shared/components'; import { CustomDialogService } from '@osf/shared/services'; -import { NodeLinksSelectors } from '@osf/shared/stores'; +import { NodeLinksSelectors } from '@osf/shared/stores/node-links'; import { DeleteNodeLinkDialogComponent } from '../delete-node-link-dialog/delete-node-link-dialog.component'; import { LinkResourceDialogComponent } from '../link-resource-dialog/link-resource-dialog.component'; diff --git a/src/app/features/project/overview/components/overview-collections/overview-collections.component.ts b/src/app/features/project/overview/components/overview-collections/overview-collections.component.ts index b85f48c30..addec8fa1 100644 --- a/src/app/features/project/overview/components/overview-collections/overview-collections.component.ts +++ b/src/app/features/project/overview/components/overview-collections/overview-collections.component.ts @@ -14,7 +14,7 @@ import { collectionFilterNames } from '@osf/features/collections/constants'; import { SubmissionReviewStatus } from '@osf/features/moderation/enums'; import { StopPropagationDirective } from '@osf/shared/directives'; import { CollectionSubmission, ResourceOverview } from '@osf/shared/models'; -import { CollectionsSelectors, GetProjectSubmissions } from '@osf/shared/stores'; +import { CollectionsSelectors, GetProjectSubmissions } from '@osf/shared/stores/collections'; @Component({ selector: 'osf-overview-collections', diff --git a/src/app/features/project/overview/components/overview-components/overview-components.component.ts b/src/app/features/project/overview/components/overview-components/overview-components.component.ts index e66832c11..3f08be57b 100644 --- a/src/app/features/project/overview/components/overview-components/overview-components.component.ts +++ b/src/app/features/project/overview/components/overview-components/overview-components.component.ts @@ -12,7 +12,7 @@ import { Router } from '@angular/router'; import { ContributorsListComponent, IconComponent, TruncatedTextComponent } from '@osf/shared/components'; import { ResourceType, UserPermissions } from '@osf/shared/enums'; import { CustomDialogService, LoaderService } from '@osf/shared/services'; -import { GetResourceWithChildren } from '@osf/shared/stores'; +import { GetResourceWithChildren } from '@osf/shared/stores/current-resource'; import { ComponentOverview } from '@shared/models'; import { LoadMoreComponents, ProjectOverviewSelectors } from '../../store'; diff --git a/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts b/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts index 876e1c046..907acd44f 100644 --- a/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts +++ b/src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts @@ -22,13 +22,8 @@ import { ResourceType } from '@osf/shared/enums'; import { ToolbarResource } from '@osf/shared/models'; import { FileSizePipe } from '@osf/shared/pipes'; import { CustomDialogService, ToastService } from '@osf/shared/services'; -import { - AddResourceToBookmarks, - BookmarksSelectors, - GetMyBookmarks, - MyResourcesSelectors, - RemoveResourceFromBookmarks, -} from '@osf/shared/stores'; +import { AddResourceToBookmarks, BookmarksSelectors, RemoveResourceFromBookmarks } from '@osf/shared/stores/bookmarks'; +import { GetMyBookmarks, MyResourcesSelectors } from '@osf/shared/stores/my-resources'; import { hasViewOnlyParam } from '@shared/helpers'; import { DuplicateDialogComponent } from '../duplicate-dialog/duplicate-dialog.component'; diff --git a/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.ts b/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.ts index 979f1992f..ee38257ec 100644 --- a/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.ts +++ b/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.ts @@ -9,7 +9,7 @@ import { ChangeDetectionStrategy, Component, computed, inject, input } from '@an import { Router } from '@angular/router'; import { MarkdownComponent, TruncatedTextComponent } from '@osf/shared/components'; -import { WikiSelectors } from '@osf/shared/stores'; +import { WikiSelectors } from '@osf/shared/stores/wiki'; @Component({ selector: 'osf-overview-wiki', diff --git a/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.ts b/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.ts index ad83ae1d8..615be3309 100644 --- a/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.ts +++ b/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.ts @@ -21,7 +21,7 @@ import { ComponentsSelectionListComponent, LoadingSpinnerComponent } from '@osf/ import { UserPermissions } from '@osf/shared/enums'; import { ComponentCheckboxItemModel } from '@osf/shared/models'; import { ToastService } from '@osf/shared/services'; -import { CurrentResourceSelectors } from '@osf/shared/stores'; +import { CurrentResourceSelectors } from '@osf/shared/stores/current-resource'; import { TogglePublicityStep } from '../../enums'; import { PrivacyStatusModel } from '../../models'; diff --git a/src/app/features/project/overview/project-overview.component.ts b/src/app/features/project/overview/project-overview.component.ts index f53edbfc8..291cb4254 100644 --- a/src/app/features/project/overview/project-overview.component.ts +++ b/src/app/features/project/overview/project-overview.component.ts @@ -33,29 +33,26 @@ import { Mode, ResourceType } from '@osf/shared/enums'; import { hasViewOnlyParam } from '@osf/shared/helpers'; import { MapProjectOverview } from '@osf/shared/mappers'; import { CustomDialogService, MetaTagsService, ToastService } from '@osf/shared/services'; +import { GetActivityLogs } from '@osf/shared/stores/activity-logs'; import { AddonsSelectors, - ClearCollections, ClearConfiguredAddons, - ClearWiki, - CollectionsSelectors, - ContributorsSelectors, - CurrentResourceSelectors, - FetchSelectedSubjects, GetAddonsResourceReference, - GetBibliographicContributors, - GetBookmarksCollectionId, - GetCollectionProvider, GetConfiguredCitationAddons, GetConfiguredStorageAddons, - GetHomeWiki, - GetLinkedResources, - GetResourceWithChildren, +} from '@osf/shared/stores/addons'; +import { GetBookmarksCollectionId } from '@osf/shared/stores/bookmarks'; +import { ClearCollections, CollectionsSelectors, GetCollectionProvider } from '@osf/shared/stores/collections'; +import { + ContributorsSelectors, + GetBibliographicContributors, LoadMoreBibliographicContributors, ResetContributorsState, - SubjectsSelectors, -} from '@osf/shared/stores'; -import { GetActivityLogs } from '@osf/shared/stores/activity-logs'; +} from '@osf/shared/stores/contributors'; +import { CurrentResourceSelectors, GetResourceWithChildren } from '@osf/shared/stores/current-resource'; +import { GetLinkedResources } from '@osf/shared/stores/node-links'; +import { FetchSelectedSubjects, SubjectsSelectors } from '@osf/shared/stores/subjects'; +import { ClearWiki, GetHomeWiki } from '@osf/shared/stores/wiki'; import { LoadingSpinnerComponent, MakeDecisionDialogComponent, diff --git a/src/app/features/project/project-addons/components/configure-addon/configure-addon.component.spec.ts b/src/app/features/project/project-addons/components/configure-addon/configure-addon.component.spec.ts index 0dae909d5..182e23e10 100644 --- a/src/app/features/project/project-addons/components/configure-addon/configure-addon.component.spec.ts +++ b/src/app/features/project/project-addons/components/configure-addon/configure-addon.component.spec.ts @@ -8,7 +8,7 @@ import { HttpTestingController } from '@angular/common/http/testing'; import { ComponentFixture, inject, TestBed } from '@angular/core/testing'; import { ActivatedRoute, Router } from '@angular/router'; -import { AddonsState } from '@osf/shared/stores'; +import { AddonsState } from '@osf/shared/stores/addons'; import { ConfigureAddonComponent } from './configure-addon.component'; diff --git a/src/app/features/project/project-addons/components/configure-addon/configure-addon.component.ts b/src/app/features/project/project-addons/components/configure-addon/configure-addon.component.ts index bda7efa20..20a3b1cce 100644 --- a/src/app/features/project/project-addons/components/configure-addon/configure-addon.component.ts +++ b/src/app/features/project/project-addons/components/configure-addon/configure-addon.component.ts @@ -33,7 +33,7 @@ import { CreateAddonOperationInvocation, GetLinkAddons, UpdateConfiguredAddon, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/addons'; import { AddonDialogService } from '../../services/addon-dialog.service'; diff --git a/src/app/features/project/project-addons/components/confirm-account-connection-modal/confirm-account-connection-modal.component.ts b/src/app/features/project/project-addons/components/confirm-account-connection-modal/confirm-account-connection-modal.component.ts index 5c098c638..8ea7fda4b 100644 --- a/src/app/features/project/project-addons/components/confirm-account-connection-modal/confirm-account-connection-modal.component.ts +++ b/src/app/features/project/project-addons/components/confirm-account-connection-modal/confirm-account-connection-modal.component.ts @@ -9,7 +9,7 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { AddonOperationInvocationService } from '@osf/shared/services'; -import { AddonsSelectors, CreateAddonOperationInvocation } from '@osf/shared/stores'; +import { AddonsSelectors, CreateAddonOperationInvocation } from '@osf/shared/stores/addons'; import { OperationNames } from '@shared/enums'; @Component({ diff --git a/src/app/features/project/project-addons/components/connect-configured-addon/connect-configured-addon.component.ts b/src/app/features/project/project-addons/components/connect-configured-addon/connect-configured-addon.component.ts index 1d9c77d8d..05d1575ee 100644 --- a/src/app/features/project/project-addons/components/connect-configured-addon/connect-configured-addon.component.ts +++ b/src/app/features/project/project-addons/components/connect-configured-addon/connect-configured-addon.component.ts @@ -39,7 +39,7 @@ import { GetAuthorizedStorageAddons, UpdateAuthorizedAddon, UpdateConfiguredAddon, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/addons'; import { AddonConfigMap } from '../../models'; import { AddonDialogService } from '../../services'; diff --git a/src/app/features/project/project-addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts b/src/app/features/project/project-addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts index 4991e4aea..56ed5e320 100644 --- a/src/app/features/project/project-addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts +++ b/src/app/features/project/project-addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts @@ -9,7 +9,7 @@ import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/c import { AddonType } from '@osf/shared/enums'; import { getAddonTypeString } from '@osf/shared/helpers'; -import { AddonsSelectors, DeleteConfiguredAddon } from '@osf/shared/stores'; +import { AddonsSelectors, DeleteConfiguredAddon } from '@osf/shared/stores/addons'; @Component({ selector: 'osf-disconnect-addon-modal', @@ -31,9 +31,8 @@ export class DisconnectAddonModalComponent { ? 'settings.addons.configureAddon.linkedItem' : 'settings.addons.configureAddon.selectedFolder'; }); - actions = createDispatchMap({ - deleteConfiguredAddon: DeleteConfiguredAddon, - }); + + actions = createDispatchMap({ deleteConfiguredAddon: DeleteConfiguredAddon }); handleDisconnectAddonAccount(): void { if (!this.addon) return; diff --git a/src/app/features/project/project-addons/project-addons.component.spec.ts b/src/app/features/project/project-addons/project-addons.component.spec.ts index c29ff66bf..e4f6b109b 100644 --- a/src/app/features/project/project-addons/project-addons.component.spec.ts +++ b/src/app/features/project/project-addons/project-addons.component.spec.ts @@ -4,7 +4,7 @@ import { signal } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UserSelectors, UserState } from '@core/store/user'; -import { AddonsState } from '@osf/shared/stores'; +import { AddonsState } from '@osf/shared/stores/addons'; import { ProjectAddonsComponent } from './project-addons.component'; diff --git a/src/app/features/project/project.routes.ts b/src/app/features/project/project.routes.ts index 55951dc01..a6af0de78 100644 --- a/src/app/features/project/project.routes.ts +++ b/src/app/features/project/project.routes.ts @@ -5,15 +5,13 @@ import { Routes } from '@angular/router'; import { viewOnlyGuard } from '@osf/core/guards'; import { ResourceType } from '@osf/shared/enums'; import { LicensesService } from '@osf/shared/services'; -import { - CitationsState, - CollectionsState, - DuplicatesState, - NodeLinksState, - SubjectsState, - ViewOnlyLinkState, -} from '@osf/shared/stores'; import { ActivityLogsState } from '@osf/shared/stores/activity-logs'; +import { CitationsState } from '@osf/shared/stores/citations'; +import { CollectionsState } from '@osf/shared/stores/collections'; +import { DuplicatesState } from '@osf/shared/stores/duplicates'; +import { NodeLinksState } from '@osf/shared/stores/node-links'; +import { SubjectsState } from '@osf/shared/stores/subjects'; +import { ViewOnlyLinkState } from '@osf/shared/stores/view-only-links'; import { AnalyticsState } from '../analytics/store'; import { CollectionsModerationState } from '../moderation/store/collections-moderation'; diff --git a/src/app/features/project/registrations/registrations.component.ts b/src/app/features/project/registrations/registrations.component.ts index 8ac6abb1c..bf0102113 100644 --- a/src/app/features/project/registrations/registrations.component.ts +++ b/src/app/features/project/registrations/registrations.component.ts @@ -18,7 +18,7 @@ import { RegistrationCardComponent, SubHeaderComponent, } from '@osf/shared/components'; -import { CurrentResourceSelectors } from '@shared/stores'; +import { CurrentResourceSelectors } from '@shared/stores/current-resource'; import { GetRegistrations, RegistrationsSelectors } from './store'; diff --git a/src/app/features/project/settings/components/delete-project-dialog/delete-project-dialog.component.ts b/src/app/features/project/settings/components/delete-project-dialog/delete-project-dialog.component.ts index 1a6a7713c..39cdb738e 100644 --- a/src/app/features/project/settings/components/delete-project-dialog/delete-project-dialog.component.ts +++ b/src/app/features/project/settings/components/delete-project-dialog/delete-project-dialog.component.ts @@ -15,7 +15,7 @@ import { Router } from '@angular/router'; import { ScientistsNames } from '@osf/shared/constants'; import { UserPermissions } from '@osf/shared/enums'; import { ToastService } from '@osf/shared/services'; -import { CurrentResourceSelectors } from '@osf/shared/stores'; +import { CurrentResourceSelectors } from '@osf/shared/stores/current-resource'; import { DeleteProject, SettingsSelectors } from '../../store'; diff --git a/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.spec.ts b/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.spec.ts index 74290b667..85f9371a3 100644 --- a/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.spec.ts +++ b/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Institution } from '@osf/shared/models'; -import { InstitutionsSelectors } from '@osf/shared/stores'; +import { InstitutionsSelectors } from '@osf/shared/stores/institutions'; import { SettingsProjectAffiliationComponent } from './settings-project-affiliation.component'; diff --git a/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.ts b/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.ts index 6d55ef188..9e764d439 100644 --- a/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.ts +++ b/src/app/features/project/settings/components/settings-project-affiliation/settings-project-affiliation.component.ts @@ -9,7 +9,7 @@ import { NgOptimizedImage } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, input, OnInit, output } from '@angular/core'; import { Institution } from '@osf/shared/models'; -import { FetchUserInstitutions, InstitutionsSelectors } from '@shared/stores'; +import { FetchUserInstitutions, InstitutionsSelectors } from '@shared/stores/institutions'; @Component({ selector: 'osf-settings-project-affiliation', diff --git a/src/app/features/project/settings/settings.component.spec.ts b/src/app/features/project/settings/settings.component.spec.ts index 18458936b..ed275c037 100644 --- a/src/app/features/project/settings/settings.component.spec.ts +++ b/src/app/features/project/settings/settings.component.spec.ts @@ -14,7 +14,7 @@ import { } from '@osf/features/project/settings/components'; import { LoadingSpinnerComponent, SubHeaderComponent } from '@osf/shared/components'; import { CustomConfirmationService, LoaderService, ToastService } from '@osf/shared/services'; -import { ViewOnlyLinkSelectors } from '@osf/shared/stores'; +import { ViewOnlyLinkSelectors } from '@osf/shared/stores/view-only-links'; import { SettingsComponent } from './settings.component'; import { SettingsSelectors } from './store'; diff --git a/src/app/features/project/settings/settings.component.ts b/src/app/features/project/settings/settings.component.ts index 3d00d1697..51cba11f5 100644 --- a/src/app/features/project/settings/settings.component.ts +++ b/src/app/features/project/settings/settings.component.ts @@ -14,13 +14,8 @@ import { LoadingSpinnerComponent, SubHeaderComponent } from '@osf/shared/compone import { ResourceType, SubscriptionEvent, SubscriptionFrequency } from '@osf/shared/enums'; import { Institution, UpdateNodeRequestModel, ViewOnlyLinkModel } from '@osf/shared/models'; import { CustomConfirmationService, CustomDialogService, LoaderService, ToastService } from '@osf/shared/services'; -import { - DeleteViewOnlyLink, - FetchViewOnlyLinks, - GetResource, - GetResourceWithChildren, - ViewOnlyLinkSelectors, -} from '@osf/shared/stores'; +import { GetResource, GetResourceWithChildren } from '@osf/shared/stores/current-resource'; +import { DeleteViewOnlyLink, FetchViewOnlyLinks, ViewOnlyLinkSelectors } from '@osf/shared/stores/view-only-links'; import { DeleteProjectDialogComponent, diff --git a/src/app/features/project/wiki/legacy-wiki-redirect.component.ts b/src/app/features/project/wiki/legacy-wiki-redirect.component.ts index 090ccb30e..fc4515624 100644 --- a/src/app/features/project/wiki/legacy-wiki-redirect.component.ts +++ b/src/app/features/project/wiki/legacy-wiki-redirect.component.ts @@ -8,7 +8,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { ResourceType } from '@osf/shared/enums'; import { LoaderService } from '@osf/shared/services'; -import { GetWikiList, WikiSelectors } from '@osf/shared/stores'; +import { GetWikiList, WikiSelectors } from '@osf/shared/stores/wiki'; @Component({ template: '', diff --git a/src/app/features/project/wiki/wiki.component.spec.ts b/src/app/features/project/wiki/wiki.component.spec.ts index a6a823274..a9f76c326 100644 --- a/src/app/features/project/wiki/wiki.component.spec.ts +++ b/src/app/features/project/wiki/wiki.component.spec.ts @@ -19,7 +19,7 @@ import { ViewSectionComponent, WikiListComponent, } from '@shared/components/wiki'; -import { WikiState } from '@shared/stores'; +import { WikiState } from '@shared/stores/wiki'; describe('WikiComponent', () => { let component: WikiComponent; diff --git a/src/app/features/project/wiki/wiki.component.ts b/src/app/features/project/wiki/wiki.component.ts index 7a324ed22..38eedf314 100644 --- a/src/app/features/project/wiki/wiki.component.ts +++ b/src/app/features/project/wiki/wiki.component.ts @@ -22,11 +22,11 @@ import { ResourceType } from '@osf/shared/enums'; import { hasViewOnlyParam } from '@osf/shared/helpers'; import { WikiModes } from '@osf/shared/models'; import { ToastService } from '@osf/shared/services'; +import { CurrentResourceSelectors } from '@osf/shared/stores/current-resource'; import { ClearWiki, CreateWiki, CreateWikiVersion, - CurrentResourceSelectors, DeleteWiki, GetCompareVersionContent, GetComponentsWikiList, @@ -39,7 +39,7 @@ import { ToggleMode, UpdateWikiPreviewContent, WikiSelectors, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/wiki'; import { ViewOnlyLinkMessageComponent } from '@shared/components/view-only-link-message/view-only-link-message.component'; @Component({ diff --git a/src/app/features/registries/components/drafts/drafts.component.spec.ts b/src/app/features/registries/components/drafts/drafts.component.spec.ts index cda932900..a38d7d65c 100644 --- a/src/app/features/registries/components/drafts/drafts.component.spec.ts +++ b/src/app/features/registries/components/drafts/drafts.component.spec.ts @@ -7,7 +7,8 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { RegistriesSelectors } from '@osf/features/registries/store'; import { StepperComponent, SubHeaderComponent } from '@osf/shared/components'; -import { ContributorsSelectors, SubjectsSelectors } from '@shared/stores'; +import { ContributorsSelectors } from '@shared/stores/contributors'; +import { SubjectsSelectors } from '@shared/stores/subjects'; import { DraftsComponent } from './drafts.component'; diff --git a/src/app/features/registries/components/drafts/drafts.component.ts b/src/app/features/registries/components/drafts/drafts.component.ts index 4c4c4c04f..ad9c6262c 100644 --- a/src/app/features/registries/components/drafts/drafts.component.ts +++ b/src/app/features/registries/components/drafts/drafts.component.ts @@ -22,12 +22,8 @@ import { StepperComponent, SubHeaderComponent } from '@osf/shared/components'; import { ResourceType } from '@osf/shared/enums'; import { PageSchema, Question, StepOption } from '@osf/shared/models'; import { LoaderService } from '@osf/shared/services'; -import { - ContributorsSelectors, - FetchSelectedSubjects, - GetAllContributors, - SubjectsSelectors, -} from '@osf/shared/stores'; +import { ContributorsSelectors, GetAllContributors } from '@osf/shared/stores/contributors'; +import { FetchSelectedSubjects, SubjectsSelectors } from '@osf/shared/stores/subjects'; import { DEFAULT_STEPS } from '../../constants'; import { ClearState, FetchDraft, FetchSchemaBlocks, RegistriesSelectors, UpdateStepState } from '../../store'; diff --git a/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.spec.ts b/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.spec.ts index ef6845138..1ca5f56ba 100644 --- a/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.spec.ts +++ b/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; -import { InstitutionsSelectors } from '@osf/shared/stores'; +import { InstitutionsSelectors } from '@osf/shared/stores/institutions'; import { RegistriesAffiliatedInstitutionComponent } from './registries-affiliated-institution.component'; diff --git a/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.ts b/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.ts index 1a6ffdad8..261eceddb 100644 --- a/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.ts +++ b/src/app/features/registries/components/registries-metadata-step/registries-affiliated-institution/registries-affiliated-institution.component.ts @@ -15,7 +15,7 @@ import { FetchUserInstitutions, InstitutionsSelectors, UpdateResourceInstitutions, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/institutions'; @Component({ selector: 'osf-registries-affiliated-institution', diff --git a/src/app/features/registries/components/registries-metadata-step/registries-contributors/registries-contributors.component.ts b/src/app/features/registries/components/registries-metadata-step/registries-contributors/registries-contributors.component.ts index b7fdc2449..1a8a71f66 100644 --- a/src/app/features/registries/components/registries-metadata-step/registries-contributors/registries-contributors.component.ts +++ b/src/app/features/registries/components/registries-metadata-step/registries-contributors/registries-contributors.component.ts @@ -43,7 +43,7 @@ import { GetAllContributors, LoadMoreContributors, ResetContributorsState, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/contributors'; @Component({ selector: 'osf-registries-contributors', diff --git a/src/app/features/registries/components/registries-metadata-step/registries-metadata-step.component.spec.ts b/src/app/features/registries/components/registries-metadata-step/registries-metadata-step.component.spec.ts index 02fc8dfe6..cac750345 100644 --- a/src/app/features/registries/components/registries-metadata-step/registries-metadata-step.component.spec.ts +++ b/src/app/features/registries/components/registries-metadata-step/registries-metadata-step.component.spec.ts @@ -3,15 +3,18 @@ import { MockComponents, MockProvider } from 'ng-mocks'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute, Router } from '@angular/router'; -import { RegistriesContributorsComponent } from '@osf/features/registries/components/registries-metadata-step/registries-contributors/registries-contributors.component'; -import { RegistriesLicenseComponent } from '@osf/features/registries/components/registries-metadata-step/registries-license/registries-license.component'; -import { RegistriesSubjectsComponent } from '@osf/features/registries/components/registries-metadata-step/registries-subjects/registries-subjects.component'; -import { RegistriesTagsComponent } from '@osf/features/registries/components/registries-metadata-step/registries-tags/registries-tags.component'; -import { RegistriesSelectors } from '@osf/features/registries/store'; import { CustomConfirmationService } from '@osf/shared/services'; -import { ContributorsSelectors, InstitutionsSelectors, SubjectsSelectors } from '@osf/shared/stores'; +import { ContributorsSelectors } from '@osf/shared/stores/contributors'; +import { InstitutionsSelectors } from '@osf/shared/stores/institutions'; +import { SubjectsSelectors } from '@osf/shared/stores/subjects'; import { TextInputComponent } from '@shared/components'; +import { RegistriesSelectors } from '../../store'; + +import { RegistriesContributorsComponent } from './registries-contributors/registries-contributors.component'; +import { RegistriesLicenseComponent } from './registries-license/registries-license.component'; +import { RegistriesSubjectsComponent } from './registries-subjects/registries-subjects.component'; +import { RegistriesTagsComponent } from './registries-tags/registries-tags.component'; import { RegistriesMetadataStepComponent } from './registries-metadata-step.component'; import { OSFTestingModule } from '@testing/osf.testing.module'; diff --git a/src/app/features/registries/components/registries-metadata-step/registries-metadata-step.component.ts b/src/app/features/registries/components/registries-metadata-step/registries-metadata-step.component.ts index 977b252c9..2ca52b2ab 100644 --- a/src/app/features/registries/components/registries-metadata-step/registries-metadata-step.component.ts +++ b/src/app/features/registries/components/registries-metadata-step/registries-metadata-step.component.ts @@ -18,7 +18,8 @@ import { INPUT_VALIDATION_MESSAGES, InputLimits } from '@osf/shared/constants'; import { CustomValidators, findChangedFields } from '@osf/shared/helpers'; import { ContributorModel, DraftRegistrationModel, SubjectModel } from '@osf/shared/models'; import { CustomConfirmationService } from '@osf/shared/services'; -import { ContributorsSelectors, SubjectsSelectors } from '@osf/shared/stores'; +import { ContributorsSelectors } from '@osf/shared/stores/contributors'; +import { SubjectsSelectors } from '@osf/shared/stores/subjects'; import { UserPermissions } from '@shared/enums'; import { ClearState, DeleteDraft, RegistriesSelectors, UpdateDraft, UpdateStepState } from '../../store'; diff --git a/src/app/features/registries/components/registries-metadata-step/registries-subjects/registries-subjects.component.spec.ts b/src/app/features/registries/components/registries-metadata-step/registries-subjects/registries-subjects.component.spec.ts index 4102b431a..822320ac4 100644 --- a/src/app/features/registries/components/registries-metadata-step/registries-subjects/registries-subjects.component.spec.ts +++ b/src/app/features/registries/components/registries-metadata-step/registries-subjects/registries-subjects.component.spec.ts @@ -8,7 +8,7 @@ import { ActivatedRoute } from '@angular/router'; import { RegistriesSelectors } from '@osf/features/registries/store'; import { ResourceType } from '@osf/shared/enums'; -import { SubjectsSelectors } from '@osf/shared/stores'; +import { SubjectsSelectors } from '@osf/shared/stores/subjects'; import { RegistriesSubjectsComponent } from './registries-subjects.component'; diff --git a/src/app/features/registries/components/registries-metadata-step/registries-subjects/registries-subjects.component.ts b/src/app/features/registries/components/registries-metadata-step/registries-subjects/registries-subjects.component.ts index ea6db6907..e7ad85599 100644 --- a/src/app/features/registries/components/registries-metadata-step/registries-subjects/registries-subjects.component.ts +++ b/src/app/features/registries/components/registries-metadata-step/registries-subjects/registries-subjects.component.ts @@ -20,7 +20,7 @@ import { FetchSubjects, SubjectsSelectors, UpdateResourceSubjects, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/subjects'; @Component({ selector: 'osf-registries-subjects', diff --git a/src/app/features/registries/components/review/review.component.spec.ts b/src/app/features/registries/components/review/review.component.spec.ts index 705ff9be9..2b9752afd 100644 --- a/src/app/features/registries/components/review/review.component.spec.ts +++ b/src/app/features/registries/components/review/review.component.spec.ts @@ -14,7 +14,8 @@ import { } from '@osf/shared/components'; import { FieldType } from '@osf/shared/enums'; import { CustomConfirmationService, CustomDialogService, ToastService } from '@osf/shared/services'; -import { ContributorsSelectors, SubjectsSelectors } from '@osf/shared/stores'; +import { ContributorsSelectors } from '@osf/shared/stores/contributors'; +import { SubjectsSelectors } from '@osf/shared/stores/subjects'; import { ReviewComponent } from './review.component'; diff --git a/src/app/features/registries/components/review/review.component.ts b/src/app/features/registries/components/review/review.component.ts index b0ff45a0d..3df64f67e 100644 --- a/src/app/features/registries/components/review/review.component.ts +++ b/src/app/features/registries/components/review/review.component.ts @@ -22,12 +22,11 @@ import { InterpolatePipe } from '@osf/shared/pipes'; import { CustomConfirmationService, CustomDialogService, ToastService } from '@osf/shared/services'; import { ContributorsSelectors, - FetchSelectedSubjects, GetAllContributors, LoadMoreContributors, ResetContributorsState, - SubjectsSelectors, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/contributors'; +import { FetchSelectedSubjects, SubjectsSelectors } from '@osf/shared/stores/subjects'; import { ClearState, diff --git a/src/app/features/registries/registries.routes.ts b/src/app/features/registries/registries.routes.ts index 9e5e74892..ecff049e7 100644 --- a/src/app/features/registries/registries.routes.ts +++ b/src/app/features/registries/registries.routes.ts @@ -6,8 +6,10 @@ import { registrationModerationGuard } from '@core/guards/registration-moderatio import { authGuard } from '@osf/core/guards'; import { RegistriesComponent } from '@osf/features/registries/registries.component'; import { RegistriesState } from '@osf/features/registries/store'; -import { CitationsState, ContributorsState, SubjectsState } from '@osf/shared/stores'; +import { CitationsState } from '@osf/shared/stores/citations'; +import { ContributorsState } from '@osf/shared/stores/contributors'; import { RegistrationProviderState } from '@osf/shared/stores/registration-provider'; +import { SubjectsState } from '@osf/shared/stores/subjects'; import { LicensesHandlers, ProjectsHandlers, ProvidersHandlers } from './store/handlers'; import { FilesHandlers } from './store/handlers/files.handlers'; diff --git a/src/app/features/registry/pages/registry-overview/registry-overview.component.ts b/src/app/features/registry/pages/registry-overview/registry-overview.component.ts index 7df422947..dddd713b2 100644 --- a/src/app/features/registry/pages/registry-overview/registry-overview.component.ts +++ b/src/app/features/registry/pages/registry-overview/registry-overview.component.ts @@ -35,14 +35,13 @@ import { hasViewOnlyParam, toCamelCase } from '@osf/shared/helpers'; import { MapRegistryOverview } from '@osf/shared/mappers'; import { SchemaResponse, ToolbarResource } from '@osf/shared/models'; import { CustomDialogService, ToastService } from '@osf/shared/services'; +import { GetBookmarksCollectionId } from '@osf/shared/stores/bookmarks'; import { ContributorsSelectors, - FetchSelectedSubjects, GetBibliographicContributors, - GetBookmarksCollectionId, LoadMoreBibliographicContributors, - SubjectsSelectors, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/contributors'; +import { FetchSelectedSubjects, SubjectsSelectors } from '@osf/shared/stores/subjects'; import { ArchivingMessageComponent, RegistryRevisionsComponent, RegistryStatusesComponent } from '../../components'; import { RegistryMakeDecisionComponent } from '../../components/registry-make-decision/registry-make-decision.component'; diff --git a/src/app/features/registry/pages/registry-wiki/registry-wiki.component.spec.ts b/src/app/features/registry/pages/registry-wiki/registry-wiki.component.spec.ts index 8dc9d21a5..7259a5d1f 100644 --- a/src/app/features/registry/pages/registry-wiki/registry-wiki.component.spec.ts +++ b/src/app/features/registry/pages/registry-wiki/registry-wiki.component.spec.ts @@ -7,7 +7,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { WikiModes } from '@osf/shared/models'; import { SubHeaderComponent, ViewOnlyLinkMessageComponent } from '@shared/components'; import { CompareSectionComponent, ViewSectionComponent, WikiListComponent } from '@shared/components/wiki'; -import { WikiSelectors } from '@shared/stores'; +import { WikiSelectors } from '@shared/stores/wiki'; import { RegistryWikiComponent } from './registry-wiki.component'; diff --git a/src/app/features/registry/pages/registry-wiki/registry-wiki.component.ts b/src/app/features/registry/pages/registry-wiki/registry-wiki.component.ts index f9c35ff7f..f8493272a 100644 --- a/src/app/features/registry/pages/registry-wiki/registry-wiki.component.ts +++ b/src/app/features/registry/pages/registry-wiki/registry-wiki.component.ts @@ -27,7 +27,7 @@ import { SetCurrentWiki, ToggleMode, WikiSelectors, -} from '@osf/shared/stores'; +} from '@osf/shared/stores/wiki'; @Component({ selector: 'osf-registry-wiki', diff --git a/src/app/features/registry/registry.routes.ts b/src/app/features/registry/registry.routes.ts index e4161724b..31815be3e 100644 --- a/src/app/features/registry/registry.routes.ts +++ b/src/app/features/registry/registry.routes.ts @@ -5,7 +5,10 @@ import { Routes } from '@angular/router'; import { viewOnlyGuard } from '@osf/core/guards'; import { ResourceType } from '@osf/shared/enums'; import { LicensesService } from '@osf/shared/services'; -import { CitationsState, DuplicatesState, SubjectsState, ViewOnlyLinkState } from '@osf/shared/stores'; +import { CitationsState } from '@osf/shared/stores/citations'; +import { DuplicatesState } from '@osf/shared/stores/duplicates'; +import { SubjectsState } from '@osf/shared/stores/subjects'; +import { ViewOnlyLinkState } from '@osf/shared/stores/view-only-links'; import { ActivityLogsState } from '@shared/stores/activity-logs'; import { AnalyticsState } from '../analytics/store'; diff --git a/src/app/features/settings/account-settings/account-settings.component.spec.ts b/src/app/features/settings/account-settings/account-settings.component.spec.ts index 6afd881fd..6a8cfd3c9 100644 --- a/src/app/features/settings/account-settings/account-settings.component.spec.ts +++ b/src/app/features/settings/account-settings/account-settings.component.spec.ts @@ -9,6 +9,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { provideNoopAnimations } from '@angular/platform-browser/animations'; import { UserSelectors } from '@osf/core/store/user'; +import { SubHeaderComponent } from '@osf/shared/components'; +import { ToastService } from '@osf/shared/services'; +import { RegionsSelectors } from '@osf/shared/stores/regions'; + +import { AccountSettingsComponent } from './account-settings.component'; import { AffiliatedInstitutionsComponent, ChangePasswordComponent, @@ -18,13 +23,8 @@ import { DefaultStorageLocationComponent, ShareIndexingComponent, TwoFactorAuthComponent, -} from '@osf/features/settings/account-settings/components'; -import { AccountSettingsSelectors } from '@osf/features/settings/account-settings/store'; -import { SubHeaderComponent } from '@osf/shared/components'; -import { RegionsSelectors } from '@osf/shared/stores'; -import { ToastService } from '@shared/services'; - -import { AccountSettingsComponent } from './account-settings.component'; +} from './components'; +import { AccountSettingsSelectors } from './store'; import { MOCK_STORE, MOCK_USER, MockCustomConfirmationServiceProvider, TranslateServiceMock } from '@testing/mocks'; diff --git a/src/app/features/settings/account-settings/account-settings.component.ts b/src/app/features/settings/account-settings/account-settings.component.ts index 2a0187d38..36882cb61 100644 --- a/src/app/features/settings/account-settings/account-settings.component.ts +++ b/src/app/features/settings/account-settings/account-settings.component.ts @@ -8,7 +8,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { GetEmails } from '@core/store/user-emails'; import { UserSelectors } from '@osf/core/store/user'; import { SubHeaderComponent } from '@osf/shared/components'; -import { FetchRegions } from '@osf/shared/stores'; +import { FetchRegions } from '@osf/shared/stores/regions'; import { AffiliatedInstitutionsComponent, diff --git a/src/app/features/settings/account-settings/components/default-storage-location/default-storage-location.component.spec.ts b/src/app/features/settings/account-settings/components/default-storage-location/default-storage-location.component.spec.ts index a5a9e723a..072034d2b 100644 --- a/src/app/features/settings/account-settings/components/default-storage-location/default-storage-location.component.spec.ts +++ b/src/app/features/settings/account-settings/components/default-storage-location/default-storage-location.component.spec.ts @@ -9,7 +9,7 @@ import { signal } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UserSelectors, UserState } from '@osf/core/store/user'; -import { RegionsSelectors, RegionsState } from '@osf/shared/stores'; +import { RegionsSelectors, RegionsState } from '@osf/shared/stores/regions'; import { LoaderService, ToastService } from '@shared/services'; import { AccountSettingsState } from '../../store'; diff --git a/src/app/shared/components/add-project-form/add-project-form.component.spec.ts b/src/app/shared/components/add-project-form/add-project-form.component.spec.ts index 9dfc2e78e..a066932db 100644 --- a/src/app/shared/components/add-project-form/add-project-form.component.spec.ts +++ b/src/app/shared/components/add-project-form/add-project-form.component.spec.ts @@ -11,7 +11,9 @@ import { ProjectFormControls } from '@osf/shared/enums'; import { CustomValidators } from '@osf/shared/helpers'; import { ProjectForm } from '@osf/shared/models'; import { ProjectModel } from '@osf/shared/models/projects'; -import { InstitutionsSelectors, ProjectsSelectors, RegionsSelectors } from '@osf/shared/stores'; +import { InstitutionsSelectors } from '@osf/shared/stores/institutions'; +import { ProjectsSelectors } from '@osf/shared/stores/projects'; +import { RegionsSelectors } from '@osf/shared/stores/regions'; import { AffiliatedInstitutionSelectComponent, ProjectSelectorComponent } from '@shared/components'; import { AddProjectFormComponent } from './add-project-form.component'; diff --git a/src/app/shared/components/add-project-form/add-project-form.component.ts b/src/app/shared/components/add-project-form/add-project-form.component.ts index c7c40f02b..876e92273 100644 --- a/src/app/shared/components/add-project-form/add-project-form.component.ts +++ b/src/app/shared/components/add-project-form/add-project-form.component.ts @@ -16,7 +16,8 @@ import { FormGroup, ReactiveFormsModule } from '@angular/forms'; import { UserSelectors } from '@core/store/user'; import { ProjectFormControls } from '@osf/shared/enums'; import { Institution, ProjectForm, ProjectModel } from '@osf/shared/models'; -import { FetchRegions, FetchUserInstitutions, InstitutionsSelectors, RegionsSelectors } from '@osf/shared/stores'; +import { FetchUserInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions'; +import { FetchRegions, RegionsSelectors } from '@osf/shared/stores/regions'; import { AffiliatedInstitutionSelectComponent } from '../affiliated-institution-select/affiliated-institution-select.component'; import { ProjectSelectorComponent } from '../project-selector/project-selector.component'; diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.spec.ts b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.spec.ts index 170ab3e57..18b50ae71 100644 --- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.spec.ts +++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.spec.ts @@ -7,7 +7,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { GoogleFilePickerComponent, SelectComponent } from '@shared/components'; import { StorageItemSelectorComponent } from '@shared/components/addons'; import { OperationNames } from '@shared/enums'; -import { AddonsSelectors } from '@shared/stores'; +import { AddonsSelectors } from '@shared/stores/addons'; import { OSFTestingModule } from '@testing/osf.testing.module'; import { DialogServiceMockBuilder } from '@testing/providers/dialog-provider.mock'; diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts index 6d36a4dfb..c965e907a 100644 --- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts +++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts @@ -30,7 +30,7 @@ import { AddonType, OperationNames, StorageItemType } from '@osf/shared/enums'; import { convertCamelCaseToNormal, IS_XSMALL } from '@osf/shared/helpers'; import { OperationInvokeData, StorageItem } from '@osf/shared/models'; import { CustomDialogService } from '@osf/shared/services'; -import { AddonsSelectors, ClearOperationInvocations } from '@osf/shared/stores'; +import { AddonsSelectors, ClearOperationInvocations } from '@osf/shared/stores/addons'; import { GoogleFilePickerComponent } from '../../google-file-picker/google-file-picker.component'; import { SelectComponent } from '../../select/select.component'; diff --git a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.spec.ts b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.spec.ts index 02795de00..32817212b 100644 --- a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.spec.ts +++ b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.spec.ts @@ -9,7 +9,7 @@ import { CustomPaginatorComponent, LoadingSpinnerComponent, SearchInputComponent import { AddContributorItemComponent } from '@shared/components/contributors/add-contributor-item/add-contributor-item.component'; import { AddContributorType, AddDialogState } from '@shared/enums/contributors'; import { ContributorAddModel } from '@shared/models'; -import { ContributorsSelectors } from '@shared/stores'; +import { ContributorsSelectors } from '@shared/stores/contributors'; import { AddContributorDialogComponent } from './add-contributor-dialog.component'; diff --git a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.ts b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.ts index cc4fb7387..d03750147 100644 --- a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.ts +++ b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.ts @@ -26,7 +26,7 @@ import { FormControl, FormsModule } from '@angular/forms'; import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants'; import { AddContributorType, AddDialogState } from '@osf/shared/enums'; import { ComponentCheckboxItemModel, ContributorAddModel, ContributorDialogAddModel } from '@osf/shared/models'; -import { ClearUsers, ContributorsSelectors, SearchUsers } from '@osf/shared/stores'; +import { ClearUsers, ContributorsSelectors, SearchUsers } from '@osf/shared/stores/contributors'; import { ComponentsSelectionListComponent } from '../../components-selection-list/components-selection-list.component'; import { CustomPaginatorComponent } from '../../custom-paginator/custom-paginator.component'; diff --git a/src/app/shared/components/files-tree/files-tree.component.spec.ts b/src/app/shared/components/files-tree/files-tree.component.spec.ts index 4c54804a0..1251d90e0 100644 --- a/src/app/shared/components/files-tree/files-tree.component.spec.ts +++ b/src/app/shared/components/files-tree/files-tree.component.spec.ts @@ -9,7 +9,7 @@ import { FileKind } from '@shared/enums'; import { FileFolderModel, FileLabelModel } from '@shared/models'; import { CustomConfirmationService, FilesService, ToastService } from '@shared/services'; import { DataciteService } from '@shared/services/datacite/datacite.service'; -import { CurrentResourceSelectors } from '@shared/stores'; +import { CurrentResourceSelectors } from '@shared/stores/current-resource'; import { FilesTreeComponent } from './files-tree.component'; diff --git a/src/app/shared/components/files-tree/files-tree.component.ts b/src/app/shared/components/files-tree/files-tree.component.ts index 5235f17cc..27fceacad 100644 --- a/src/app/shared/components/files-tree/files-tree.component.ts +++ b/src/app/shared/components/files-tree/files-tree.component.ts @@ -38,7 +38,7 @@ import { FileFolderModel, FileLabelModel, FileMenuAction, FileMenuFlags, FileMod import { FileSizePipe } from '@osf/shared/pipes'; import { CustomConfirmationService, CustomDialogService, FilesService, ToastService } from '@osf/shared/services'; import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; -import { CurrentResourceSelectors } from '@shared/stores'; +import { CurrentResourceSelectors } from '@shared/stores/current-resource'; import { FileMenuComponent } from '../file-menu/file-menu.component'; import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component'; diff --git a/src/app/shared/components/google-file-picker/google-file-picker.component.ts b/src/app/shared/components/google-file-picker/google-file-picker.component.ts index 6e6160851..b49154bde 100644 --- a/src/app/shared/components/google-file-picker/google-file-picker.component.ts +++ b/src/app/shared/components/google-file-picker/google-file-picker.component.ts @@ -13,7 +13,7 @@ import { StorageItem } from '@shared/models'; import { GoogleFileDataModel } from '@shared/models/files/google-file.data.model'; import { GoogleFilePickerModel } from '@shared/models/files/google-file.picker.model'; import { GoogleFilePickerDownloadService } from '@shared/services'; -import { AddonsSelectors, GetAuthorizedStorageOauthToken } from '@shared/stores'; +import { AddonsSelectors, GetAuthorizedStorageOauthToken } from '@shared/stores/addons'; @Component({ selector: 'osf-google-file-picker', diff --git a/src/app/shared/components/make-decision-dialog/make-decision-dialog.component.spec.ts b/src/app/shared/components/make-decision-dialog/make-decision-dialog.component.spec.ts index 814db2a44..973428d1f 100644 --- a/src/app/shared/components/make-decision-dialog/make-decision-dialog.component.spec.ts +++ b/src/app/shared/components/make-decision-dialog/make-decision-dialog.component.spec.ts @@ -8,7 +8,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ModerationType, SubmissionReviewStatus } from '@osf/features/moderation/enums'; import { CollectionsModerationSelectors } from '@osf/features/moderation/store/collections-moderation'; import { ModerationDecisionFormControls, ModerationSubmitType } from '@osf/shared/enums'; -import { CollectionsSelectors } from '@osf/shared/stores'; +import { CollectionsSelectors } from '@osf/shared/stores/collections'; import { MakeDecisionDialogComponent } from './make-decision-dialog.component'; diff --git a/src/app/shared/components/make-decision-dialog/make-decision-dialog.component.ts b/src/app/shared/components/make-decision-dialog/make-decision-dialog.component.ts index 62d6ab181..e67247b1e 100644 --- a/src/app/shared/components/make-decision-dialog/make-decision-dialog.component.ts +++ b/src/app/shared/components/make-decision-dialog/make-decision-dialog.component.ts @@ -18,7 +18,7 @@ import { import { InputLimits } from '@osf/shared/constants'; import { ModerationDecisionFormControls, ModerationSubmitType } from '@osf/shared/enums'; import { DateAgoPipe } from '@osf/shared/pipes'; -import { CollectionsSelectors } from '@osf/shared/stores'; +import { CollectionsSelectors } from '@osf/shared/stores/collections'; @Component({ selector: 'osf-make-decision-dialog', diff --git a/src/app/shared/components/project-selector/project-selector.component.spec.ts b/src/app/shared/components/project-selector/project-selector.component.spec.ts index 855e593fa..9b33e2e3e 100644 --- a/src/app/shared/components/project-selector/project-selector.component.spec.ts +++ b/src/app/shared/components/project-selector/project-selector.component.spec.ts @@ -6,7 +6,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UserState } from '@core/store/user'; import { ToastService } from '@shared/services'; -import { ProjectsState } from '@shared/stores'; +import { ProjectsState } from '@shared/stores/projects'; import { ProjectSelectorComponent } from './project-selector.component'; diff --git a/src/app/shared/components/project-selector/project-selector.component.ts b/src/app/shared/components/project-selector/project-selector.component.ts index af934dcd8..7ece1bfdf 100644 --- a/src/app/shared/components/project-selector/project-selector.component.ts +++ b/src/app/shared/components/project-selector/project-selector.component.ts @@ -24,8 +24,7 @@ import { FormsModule } from '@angular/forms'; import { UserSelectors } from '@core/store/user'; import { CustomOption } from '@shared/models'; import { ProjectModel } from '@shared/models/projects'; -import { GetProjects } from '@shared/stores'; -import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors'; +import { GetProjects, ProjectsSelectors } from '@shared/stores/projects'; @Component({ selector: 'osf-project-selector', diff --git a/src/app/shared/components/resource-citations/resource-citations.component.spec.ts b/src/app/shared/components/resource-citations/resource-citations.component.spec.ts index a5fef81f8..1a412fda0 100644 --- a/src/app/shared/components/resource-citations/resource-citations.component.spec.ts +++ b/src/app/shared/components/resource-citations/resource-citations.component.spec.ts @@ -6,7 +6,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ResourceOverview } from '@shared/models'; import { ToastService } from '@shared/services'; -import { CitationsSelectors } from '@shared/stores'; +import { CitationsSelectors } from '@shared/stores/citations'; import { ResourceCitationsComponent } from './resource-citations.component'; diff --git a/src/app/shared/components/resource-citations/resource-citations.component.ts b/src/app/shared/components/resource-citations/resource-citations.component.ts index 07b3dee7e..e3f73d608 100644 --- a/src/app/shared/components/resource-citations/resource-citations.component.ts +++ b/src/app/shared/components/resource-citations/resource-citations.component.ts @@ -36,7 +36,7 @@ import { GetDefaultCitations, GetStyledCitation, UpdateCustomCitation, -} from '@shared/stores'; +} from '@shared/stores/citations'; @Component({ selector: 'osf-resource-citations', diff --git a/src/app/shared/components/subjects/subjects.component.spec.ts b/src/app/shared/components/subjects/subjects.component.spec.ts index 257ca3d16..54b62ea68 100644 --- a/src/app/shared/components/subjects/subjects.component.spec.ts +++ b/src/app/shared/components/subjects/subjects.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { SubjectsSelectors } from '@osf/shared/stores'; +import { SubjectsSelectors } from '@osf/shared/stores/subjects'; import { SubjectsComponent } from './subjects.component'; diff --git a/src/app/shared/components/subjects/subjects.component.ts b/src/app/shared/components/subjects/subjects.component.ts index 2b986b7dc..63f86297b 100644 --- a/src/app/shared/components/subjects/subjects.component.ts +++ b/src/app/shared/components/subjects/subjects.component.ts @@ -15,7 +15,7 @@ import { ChangeDetectionStrategy, Component, computed, input, output } from '@an import { FormControl, FormsModule } from '@angular/forms'; import { SubjectModel } from '@osf/shared/models'; -import { SubjectsSelectors } from '@osf/shared/stores'; +import { SubjectsSelectors } from '@osf/shared/stores/subjects'; import { SearchInputComponent } from '../search-input/search-input.component'; diff --git a/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.spec.ts b/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.spec.ts index c1b8b9399..06ea0bf4d 100644 --- a/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.spec.ts +++ b/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.spec.ts @@ -7,7 +7,7 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; -import { WikiSelectors } from '@osf/shared/stores'; +import { WikiSelectors } from '@osf/shared/stores/wiki'; import { ToastService } from '@shared/services'; import { AddWikiDialogComponent } from './add-wiki-dialog.component'; diff --git a/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.ts b/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.ts index 40e062cbe..4e80244de 100644 --- a/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.ts +++ b/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.ts @@ -12,7 +12,7 @@ import { InputLimits } from '@osf/shared/constants'; import { ResourceType } from '@osf/shared/enums'; import { CustomValidators } from '@osf/shared/helpers'; import { ToastService } from '@osf/shared/services'; -import { CreateWiki, WikiSelectors } from '@osf/shared/stores'; +import { CreateWiki, WikiSelectors } from '@osf/shared/stores/wiki'; import { TextInputComponent } from '../../text-input/text-input.component'; diff --git a/src/app/shared/stores/index.ts b/src/app/shared/stores/index.ts deleted file mode 100644 index bc94b95fa..000000000 --- a/src/app/shared/stores/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -export * from './addons'; -export * from './banners'; -export * from './bookmarks'; -export * from './citations'; -export * from './collections'; -export * from './contributors'; -export * from './current-resource'; -export * from './duplicates'; -export * from './institutions'; -export * from './licenses'; -export * from './my-resources'; -export * from './node-links'; -export * from './projects'; -export * from './regions'; -export * from './subjects'; -export * from './view-only-links'; -export * from './wiki'; From 413e32f060d1314795b92e3c10912304ae4fd45f Mon Sep 17 00:00:00 2001 From: nsemets Date: Fri, 24 Oct 2025 11:12:27 +0300 Subject: [PATCH 2/3] fix(packages): updated packages for better performance --- angular.json | 10 +++++----- package-lock.json | 38 -------------------------------------- package.json | 2 -- src/app/app.config.ts | 3 +-- src/styles/styles.scss | 5 +++++ 5 files changed, 11 insertions(+), 47 deletions(-) diff --git a/angular.json b/angular.json index a799f5f67..97bef37ee 100644 --- a/angular.json +++ b/angular.json @@ -48,7 +48,6 @@ "styles": [ "src/styles/styles.scss", "node_modules/primeflex/primeflex.css", - "node_modules/@fortawesome/fontawesome-free/css/all.min.css", "node_modules/ngx-markdown-editor/assets/highlight.js/agate.min.css" ], "stylePreprocessorOptions": { @@ -74,7 +73,8 @@ "maximumError": "25kB" } ], - "outputHashing": "all" + "outputHashing": "all", + "optimization": true }, "analyze-bundle": { "sourceMap": true, @@ -147,15 +147,15 @@ }, "development": { "buildTarget": "osf:build:development", - "hmr": false + "hmr": true }, "docker": { "buildTarget": "osf:build:docker", - "hmr": false + "hmr": true }, "staging": { "buildTarget": "osf:build:staging", - "hmr": false + "hmr": true }, "test": { "buildTarget": "osf:build:test", diff --git a/package-lock.json b/package-lock.json index 08471af56..634d5efc9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,8 +22,6 @@ "@fortawesome/fontawesome-free": "^6.7.2", "@ngx-translate/core": "^16.0.4", "@ngx-translate/http-loader": "^16.0.1", - "@ngxs/devtools-plugin": "^19.0.0", - "@ngxs/logger-plugin": "^19.0.0", "@ngxs/store": "^19.0.0", "@primeng/themes": "^19.0.9", "@sentry/angular": "^10.10.0", @@ -6409,42 +6407,6 @@ "@angular/core": ">=16" } }, - "node_modules/@ngxs/devtools-plugin": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/@ngxs/devtools-plugin/-/devtools-plugin-19.0.0.tgz", - "integrity": "sha512-z3O/G0fGeSc/mQRMBWwQ98W+kB0QpIMPZg2FLIubyZwWydouVatjhYck4IDLR/h5i6lq4McKioMK2tn/mXZqnQ==", - "license": "MIT", - "dependencies": { - "tslib": "^2.3.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/ngxs" - }, - "peerDependencies": { - "@angular/core": ">=19.0.0 <20.0.0", - "@ngxs/store": "^19.0.0 || ^19.0.0-dev", - "rxjs": ">=6.5.5" - } - }, - "node_modules/@ngxs/logger-plugin": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/@ngxs/logger-plugin/-/logger-plugin-19.0.0.tgz", - "integrity": "sha512-qLGB4muiLlDDYVUOLgXalWYjd3DumMJDM/JCuyQD7xJl9wwixbMWVME1tnZ1e2/FFqKRPuL+54OnEtQ3SrSpOg==", - "license": "MIT", - "dependencies": { - "tslib": "^2.3.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/ngxs" - }, - "peerDependencies": { - "@angular/core": ">=19.0.0 <20.0.0", - "@ngxs/store": "^19.0.0 || ^19.0.0-dev", - "rxjs": ">=6.5.5" - } - }, "node_modules/@ngxs/store": { "version": "19.0.0", "resolved": "https://registry.npmjs.org/@ngxs/store/-/store-19.0.0.tgz", diff --git a/package.json b/package.json index 190ded296..36086b4d2 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,6 @@ "@fortawesome/fontawesome-free": "^6.7.2", "@ngx-translate/core": "^16.0.4", "@ngx-translate/http-loader": "^16.0.1", - "@ngxs/devtools-plugin": "^19.0.0", - "@ngxs/logger-plugin": "^19.0.0", "@ngxs/store": "^19.0.0", "@primeng/themes": "^19.0.9", "@sentry/angular": "^10.10.0", diff --git a/src/app/app.config.ts b/src/app/app.config.ts index 0f53a5184..45474cd08 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -1,4 +1,3 @@ -import { withNgxsReduxDevtoolsPlugin } from '@ngxs/devtools-plugin'; import { provideStore } from '@ngxs/store'; import { TranslateModule } from '@ngx-translate/core'; @@ -49,7 +48,7 @@ export const appConfig: ApplicationConfig = { }), provideHttpClient(withInterceptors([authInterceptor, viewOnlyInterceptor, errorInterceptor])), provideRouter(routes, withInMemoryScrolling({ scrollPositionRestoration: 'top', anchorScrolling: 'enabled' })), - provideStore(STATES, withNgxsReduxDevtoolsPlugin({ disabled: true })), + provideStore(STATES), provideZoneChangeDetection({ eventCoalescing: true }), SENTRY_PROVIDER, ], diff --git a/src/styles/styles.scss b/src/styles/styles.scss index f192f1d5d..a51b536b8 100644 --- a/src/styles/styles.scss +++ b/src/styles/styles.scss @@ -7,6 +7,11 @@ @use "base"; @use "icons"; +@use "@fortawesome/fontawesome-free/scss/fontawesome.scss"; +@use "@fortawesome/fontawesome-free/scss/solid.scss"; +@use "@fortawesome/fontawesome-free/scss/brands.scss"; +@use "@fortawesome/fontawesome-free/scss/regular.scss"; + @use "./components/md-editor"; @use "./components/preprints"; @use "./components/collections"; From 608470ac745c727be3b7c21674c45a0058525b5e Mon Sep 17 00:00:00 2001 From: Nazar Semets Date: Fri, 24 Oct 2025 11:14:12 +0300 Subject: [PATCH 3/3] fix(tests): fixed tests --- .../moderators-list/moderators-list.component.spec.ts | 10 ++++++---- .../moderators-table.component.spec.ts | 10 +++++----- .../profile-information.component.spec.ts | 9 --------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/app/features/moderation/components/moderators-list/moderators-list.component.spec.ts b/src/app/features/moderation/components/moderators-list/moderators-list.component.spec.ts index 499c4cd7f..d70f3ef85 100644 --- a/src/app/features/moderation/components/moderators-list/moderators-list.component.spec.ts +++ b/src/app/features/moderation/components/moderators-list/moderators-list.component.spec.ts @@ -5,15 +5,16 @@ import { of } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { ProviderSelectors } from '@core/store/provider'; import { UserSelectors } from '@core/store/user'; -import { ModeratorsTableComponent } from '@osf/features/moderation/components'; +import { SearchInputComponent } from '@osf/shared/components'; import { ResourceType } from '@osf/shared/enums'; -import { SearchInputComponent } from '@shared/components'; import { CustomConfirmationService, CustomDialogService } from '@shared/services'; import { ModeratorPermission } from '../../enums'; import { ModeratorModel } from '../../models'; import { ModeratorsSelectors } from '../../store/moderators'; +import { ModeratorsTableComponent } from '../moderators-table/moderators-table.component'; import { ModeratorsListComponent } from './moderators-list.component'; @@ -71,6 +72,7 @@ describe('ModeratorsListComponent', () => { signals: [ { selector: UserSelectors.getCurrentUser, value: mockCurrentUser }, { selector: ModeratorsSelectors.getModerators, value: mockModerators }, + { selector: ProviderSelectors.hasAdminAccess, value: false }, { selector: ModeratorsSelectors.isModeratorsLoading, value: false }, ], }), @@ -110,7 +112,7 @@ describe('ModeratorsListComponent', () => { fixture.detectChanges(); - expect(component.isCurrentUserAdminModerator()).toBe(false); + expect(component.hasAdminAccess()).toBe(false); }); it('should return false for admin moderator when user is not found', () => { @@ -121,7 +123,7 @@ describe('ModeratorsListComponent', () => { fixture.detectChanges(); - expect(component.isCurrentUserAdminModerator()).toBe(false); + expect(component.hasAdminAccess()).toBe(false); }); it('should load moderators on initialization', () => { diff --git a/src/app/features/moderation/components/moderators-table/moderators-table.component.spec.ts b/src/app/features/moderation/components/moderators-table/moderators-table.component.spec.ts index 312360ba1..0df3b64a4 100644 --- a/src/app/features/moderation/components/moderators-table/moderators-table.component.spec.ts +++ b/src/app/features/moderation/components/moderators-table/moderators-table.component.spec.ts @@ -44,7 +44,7 @@ describe('ModeratorsTableComponent', () => { fixture.componentRef.setInput('tableParams', mockTableParams); fixture.componentRef.setInput('currentUserId', 'test-user-id'); - fixture.componentRef.setInput('isCurrentUserAdminModerator', false); + fixture.componentRef.setInput('hasAdminAccess', false); }); it('should create', () => { @@ -56,7 +56,7 @@ describe('ModeratorsTableComponent', () => { fixture.componentRef.setInput('items', mockModerators); fixture.componentRef.setInput('isLoading', true); fixture.componentRef.setInput('currentUserId', 'current-user-123'); - fixture.componentRef.setInput('isCurrentUserAdminModerator', true); + fixture.componentRef.setInput('hasAdminAccess', true); fixture.componentRef.setInput('tableParams', mockTableParams); fixture.detectChanges(); @@ -64,7 +64,7 @@ describe('ModeratorsTableComponent', () => { expect(component.items()).toEqual(mockModerators); expect(component.isLoading()).toBe(true); expect(component.currentUserId()).toBe('current-user-123'); - expect(component.isCurrentUserAdminModerator()).toBe(true); + expect(component.hasAdminAccess()).toBe(true); expect(component.tableParams()).toEqual(mockTableParams); }); @@ -118,7 +118,7 @@ describe('ModeratorsTableComponent', () => { fixture.componentRef.setInput('items', []); fixture.componentRef.setInput('tableParams', mockTableParams); fixture.componentRef.setInput('currentUserId', 'test-user-id'); - fixture.componentRef.setInput('isCurrentUserAdminModerator', false); + fixture.componentRef.setInput('hasAdminAccess', false); fixture.detectChanges(); @@ -128,7 +128,7 @@ describe('ModeratorsTableComponent', () => { it('should handle undefined currentUserId', () => { fixture.componentRef.setInput('currentUserId', undefined); fixture.componentRef.setInput('tableParams', mockTableParams); - fixture.componentRef.setInput('isCurrentUserAdminModerator', false); + fixture.componentRef.setInput('hasAdminAccess', false); fixture.detectChanges(); diff --git a/src/app/features/profile/components/profile-information/profile-information.component.spec.ts b/src/app/features/profile/components/profile-information/profile-information.component.spec.ts index c1ca8d324..eb0415ab0 100644 --- a/src/app/features/profile/components/profile-information/profile-information.component.spec.ts +++ b/src/app/features/profile/components/profile-information/profile-information.component.spec.ts @@ -156,15 +156,6 @@ describe('ProfileInformationComponent', () => { expect(socials).toEqual([]); }); - it('should not include profileWebsites in social links', () => { - fixture.componentRef.setInput('currentUser', mockUser); - fixture.detectChanges(); - - const socials = component.userSocials(); - const websites = socials.filter((s) => s.alt === 'settings.profileSettings.social.labels.profileWebsites'); - expect(websites.length).toBe(0); - }); - it('should emit editProfile event when called', (done) => { component.editProfile.subscribe(() => { expect(true).toBe(true);