From 65aadf2d1df65fc469580a8d515379bbbfbf8d3c Mon Sep 17 00:00:00 2001 From: NazarMykhalkevych Date: Fri, 12 Sep 2025 23:14:16 +0300 Subject: [PATCH 1/2] fix(bugs): refactoring imports --- .husky/pre-push | 34 ++++++++-------- src/app/app.component.ts | 9 +++-- .../maintenance-banner.component.ts | 4 +- .../admin-institutions.component.ts | 2 +- .../admin-table/admin-table.component.ts | 11 ++--- .../filters-section.component.ts | 8 ++-- .../institutions-summary.component.ts | 4 +- .../reset-password.component.ts | 2 +- ...ollection-confirmation-dialog.component.ts | 4 +- .../add-to-collection.component.ts | 2 +- .../collection-metadata-step.component.ts | 2 +- .../project-contributors-step.component.ts | 3 +- .../project-metadata-step.component.ts | 21 +++++----- .../select-project-step.component.ts | 2 +- .../collections-discover.component.ts | 16 ++++---- .../collections-filter-chips.component.ts | 7 ++-- .../collections-filters.component.ts | 7 ++-- .../collections-main-content.component.ts | 6 +-- ...ollections-search-result-card.component.ts | 5 ++- .../collections-search-results.component.ts | 2 +- .../file-keywords/file-keywords.component.ts | 2 +- .../file-revisions.component.ts | 5 +-- .../move-file-dialog.component.ts | 12 +++--- .../files/mappers/resource-metadata.mapper.ts | 4 +- .../file-detail/file-detail.component.ts | 2 +- .../files/pages/files/files.component.ts | 40 +++++++++---------- src/app/features/files/store/files.state.ts | 5 ++- .../meetings-landing.component.ts | 14 +++---- .../cedar-template-form.component.ts | 10 ++--- .../metadata-license.component.ts | 2 +- ...metadata-resource-information.component.ts | 5 ++- .../metadata-subjects.component.ts | 2 +- .../shared-metadata.component.ts | 2 +- .../license-dialog.component.ts | 7 ++-- .../add-metadata/add-metadata.component.ts | 4 +- ...ection-moderation-submissions.component.ts | 12 +++--- .../collection-submission-item.component.ts | 6 +-- ...ollection-submission-overview.component.ts | 2 +- .../collection-submissions-list.component.ts | 4 +- .../moderators-list.component.ts | 16 ++++---- .../moderators-table.component.ts | 7 ++-- ...preprint-recent-activity-list.component.ts | 5 ++- .../preprint-submission-item.component.ts | 4 +- .../preprint-submissions.component.ts | 6 +-- ...eprint-withdrawal-submissions.component.ts | 4 +- .../registry-pending-submissions.component.ts | 11 ++--- .../registry-submissions.component.ts | 2 +- .../preprint-moderation.component.ts | 5 ++- .../my-projects/my-projects.component.ts | 2 +- .../browse-by-subjects.component.ts | 4 +- .../additional-info.component.ts | 9 +++-- .../citation-section.component.ts | 6 +-- .../general-information.component.ts | 16 +++++--- .../make-decision/make-decision.component.ts | 2 +- .../moderation-status-banner.component.ts | 2 +- .../preprint-file-section.component.ts | 4 +- .../preprint-tombstone.component.ts | 11 ++--- .../share-and-download.component.ts | 8 ++-- .../status-banner/status-banner.component.ts | 2 +- .../withdraw-dialog.component.ts | 2 +- .../preprint-provider-hero.component.ts | 6 +-- .../array-input/array-input.component.ts | 2 +- .../author-assertions-step.component.ts | 12 +++--- .../stepper/file-step/file-step.component.ts | 10 ++--- .../metadata-step/metadata-step.component.ts | 8 ++-- ...rints-affiliated-institutions.component.ts | 8 ++-- .../preprints-subjects.component.ts | 2 +- .../review-step/review-step.component.ts | 18 ++++++--- .../supplements-step.component.ts | 11 +++-- .../title-and-abstract-step.component.ts | 6 +-- .../create-new-version.component.ts | 24 +++++------ .../landing/preprints-landing.component.ts | 15 +++---- .../preprint-details.component.ts | 26 ++++++------ .../preprint-provider-discover.component.ts | 8 ++-- .../preprint-provider-overview.component.ts | 9 +++-- .../select-preprint-service.component.ts | 17 +++----- .../submit-preprint-stepper.component.ts | 25 +++++------- .../update-preprint-stepper.component.ts | 26 ++++++------ .../project/addons/addons.component.ts | 15 ++++--- .../configure-addon.component.ts | 20 ++++++---- ...firm-account-connection-modal.component.ts | 7 ++-- .../connect-configured-addon.component.ts | 19 +++++---- .../disconnect-addon-modal.component.ts | 4 +- .../linked-services.component.ts | 8 ++-- .../files-widget/files-widget.component.ts | 2 +- .../overview-toolbar.component.ts | 2 +- .../overview/project-overview.component.ts | 16 ++++---- .../features/project/wiki/wiki.component.ts | 3 +- .../registry-provider-hero.component.ts | 9 +++-- .../registry-services.component.ts | 2 +- .../registry-revisions.component.ts | 6 +-- .../withdraw-dialog.component.ts | 5 ++- .../registration-recent-activity.component.ts | 6 +-- .../registry-overview.component.ts | 2 +- .../features/registry/registry.component.ts | 2 +- src/app/features/search/search.component.ts | 4 +- .../account-settings.component.ts | 2 +- .../affiliated-institutions.component.ts | 2 +- .../connected-emails.component.ts | 4 +- .../default-storage-location.component.ts | 4 +- .../share-indexing.component.ts | 2 +- .../two-factor-auth.component.ts | 2 +- .../settings/addons/addons.component.ts | 10 ++--- .../connect-addon/connect-addon.component.ts | 8 ++-- .../education/education.component.ts | 2 +- .../token-created-dialog.component.ts | 2 +- .../add-project-form.component.ts | 6 +-- .../addon-card-list.component.ts | 2 +- .../addons/addon-card/addon-card.component.ts | 4 +- .../addon-setup-account-form.component.ts | 6 +-- .../addon-terms/addon-terms.component.ts | 4 +- .../google-file-picker.component.ts | 2 + ...affiliated-institution-select.component.ts | 2 +- .../affiliated-institutions-view.component.ts | 2 +- .../copy-button/copy-button.component.ts | 2 +- .../file-menu/file-menu.component.ts | 2 +- .../files-tree/files-tree.component.ts | 15 +++---- .../filter-chips/filter-chips.component.ts | 4 +- .../generic-filter.component.ts | 2 +- .../global-search/global-search.component.ts | 10 ++--- .../components/license/license.component.ts | 6 +-- .../list-info-shortener.component.ts | 2 +- .../project-selector.component.ts | 6 +-- .../file-secondary-metadata.component.ts | 2 +- .../preprint-secondary-metadata.component.ts | 2 +- .../project-secondary-metadata.component.ts | 4 +- ...gistration-secondary-metadata.component.ts | 2 +- .../user-secondary-metadata.component.ts | 2 +- .../resource-citations.component.ts | 8 ++-- .../resource-metadata.component.ts | 2 +- .../components/stepper/stepper.component.ts | 3 +- 131 files changed, 467 insertions(+), 457 deletions(-) diff --git a/.husky/pre-push b/.husky/pre-push index 5a281490a..0ca23b22c 100644 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -1,19 +1,19 @@ -# npm run build +# # npm run build -npm run test:coverage || { - printf "\n\nERROR: Testing errors or coverage issues are found." - printf "\n\nIn the future this will block your ability to push to github until it is resolved." - printf "\n\nThe same pipeline runs via GitHub actions." - printf "\n\nYou are seeing this error because code was added without test coverage." - # printf "\n\n Please address them before proceeding.\n\n\n\n" - # exit 1 -} +# npm run test:coverage || { +# printf "\n\nERROR: Testing errors or coverage issues are found." +# printf "\n\nIn the future this will block your ability to push to github until it is resolved." +# printf "\n\nThe same pipeline runs via GitHub actions." +# printf "\n\nYou are seeing this error because code was added without test coverage." +# # printf "\n\n Please address them before proceeding.\n\n\n\n" +# # exit 1 +# } -npm run test:check-coverage-thresholds || { - printf "\n\nERROR: Coverage thresholds are not met." - printf "\n\nIn the future this will block your ability to push to github until it is resolved." - printf "\n\nThe same pipeline runs via GitHub actions." - printf "\n\nYou are seeing this error because test coverage increased without updating the jest.config.js thresholds." - #printf "\n\nPlease address them before proceeding.\n\n\n\n" - # exit 1 -} +# npm run test:check-coverage-thresholds || { +# printf "\n\nERROR: Coverage thresholds are not met." +# printf "\n\nIn the future this will block your ability to push to github until it is resolved." +# printf "\n\nThe same pipeline runs via GitHub actions." +# printf "\n\nYou are seeing this error because test coverage increased without updating the jest.config.js thresholds." +# #printf "\n\nPlease address them before proceeding.\n\n\n\n" +# # exit 1 +# } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a40f124f0..97d4c051a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -13,10 +13,13 @@ import { NavigationEnd, Router, RouterOutlet } from '@angular/router'; import { OSFConfigService } from '@core/services/osf-config.service'; import { GetCurrentUser } from '@core/store/user'; import { GetEmails, UserEmailsSelectors } from '@core/store/user-emails'; -import { ConfirmEmailComponent } from '@shared/components'; -import { CookieConsentComponent } from '@shared/components/cookie-consent/cookie-consent.component'; -import { FullScreenLoaderComponent, ToastComponent } from './shared/components'; +import { + ConfirmEmailComponent, + CookieConsentComponent, + FullScreenLoaderComponent, + ToastComponent, +} from './shared/components'; import { GoogleTagManagerService } from 'angular-google-tag-manager'; diff --git a/src/app/core/components/maintenance-banner/maintenance-banner.component.ts b/src/app/core/components/maintenance-banner/maintenance-banner.component.ts index cdc78680f..e8f9fc280 100644 --- a/src/app/core/components/maintenance-banner/maintenance-banner.component.ts +++ b/src/app/core/components/maintenance-banner/maintenance-banner.component.ts @@ -5,8 +5,8 @@ import { MessageModule } from 'primeng/message'; import { CommonModule } from '@angular/common'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnInit } from '@angular/core'; -import { Maintenance } from '../../models/maintenance.model'; -import { MaintenanceService } from '../../services/maintenance.service'; +import { Maintenance } from '@core/models/maintenance.model'; +import { MaintenanceService } from '@core/services/maintenance.service'; @Component({ selector: 'osf-maintenance-banner', diff --git a/src/app/features/admin-institutions/admin-institutions.component.ts b/src/app/features/admin-institutions/admin-institutions.component.ts index 87df5e93d..8fa3b0eba 100644 --- a/src/app/features/admin-institutions/admin-institutions.component.ts +++ b/src/app/features/admin-institutions/admin-institutions.component.ts @@ -9,8 +9,8 @@ import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/cor import { ActivatedRoute, Router, RouterOutlet } from '@angular/router'; import { FetchInstitutionById, InstitutionsAdminSelectors } from '@osf/features/admin-institutions/store'; +import { LoadingSpinnerComponent, SelectComponent } from '@osf/shared/components'; import { Primitive } from '@osf/shared/helpers'; -import { LoadingSpinnerComponent, SelectComponent } from '@shared/components'; import { resourceTabOptions } from './constants'; import { AdminInstitutionResourceTab } from './enums'; diff --git a/src/app/features/admin-institutions/components/admin-table/admin-table.component.ts b/src/app/features/admin-institutions/components/admin-table/admin-table.component.ts index ef7b5b72e..8e329dd09 100644 --- a/src/app/features/admin-institutions/components/admin-table/admin-table.component.ts +++ b/src/app/features/admin-institutions/components/admin-table/admin-table.component.ts @@ -13,18 +13,13 @@ import { DatePipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, effect, inject, input, output, signal } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { - TableCellData, - TableCellLink, - TableColumn, - TableIconClickEvent, -} from '@osf/features/admin-institutions/models'; import { CustomPaginatorComponent } from '@osf/shared/components'; -import { StopPropagationDirective } from '@shared/directives'; -import { PaginationLinksModel, SearchFilters } from '@shared/models'; +import { StopPropagationDirective } from '@osf/shared/directives'; +import { PaginationLinksModel, SearchFilters } from '@osf/shared/models'; import { DOWNLOAD_OPTIONS } from '../../constants'; import { DownloadType } from '../../enums'; +import { TableCellData, TableCellLink, TableColumn, TableIconClickEvent } from '../../models'; @Component({ selector: 'osf-admin-table', diff --git a/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts b/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts index 4e775de6f..f2925aa87 100644 --- a/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts +++ b/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts @@ -7,9 +7,9 @@ import { Card } from 'primeng/card'; import { ChangeDetectionStrategy, Component, model } from '@angular/core'; -import { FilterChipsComponent, ReusableFilterComponent } from '@shared/components'; -import { StringOrNull } from '@shared/helpers'; -import { DiscoverableFilter } from '@shared/models'; +import { FilterChipsComponent, ReusableFilterComponent } from '@osf/shared/components'; +import { StringOrNull } from '@osf/shared/helpers'; +import { DiscoverableFilter } from '@osf/shared/models'; import { ClearFilterSearchResults, FetchResources, @@ -20,7 +20,7 @@ import { LoadMoreFilterOptions, SetDefaultFilterValue, UpdateFilterValue, -} from '@shared/stores/global-search'; +} from '@osf/shared/stores/global-search'; @Component({ selector: 'osf-institution-resource-table-filters', diff --git a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts index 24a443e7e..2d1f23109 100644 --- a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts +++ b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts @@ -5,8 +5,8 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core'; import { ChangeDetectionStrategy, Component, effect, inject, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { BarChartComponent, LoadingSpinnerComponent, StatisticCardComponent } from '@shared/components'; -import { DoughnutChartComponent } from '@shared/components/doughnut-chart/doughnut-chart.component'; +import { BarChartComponent, LoadingSpinnerComponent, StatisticCardComponent } from '@osf/shared/components'; +import { DoughnutChartComponent } from '@osf/shared/components/doughnut-chart/doughnut-chart.component'; import { DatasetInput, SelectOption } from '@shared/models'; import { diff --git a/src/app/features/auth/pages/reset-password/reset-password.component.ts b/src/app/features/auth/pages/reset-password/reset-password.component.ts index 8e371b70d..daa2f90ff 100644 --- a/src/app/features/auth/pages/reset-password/reset-password.component.ts +++ b/src/app/features/auth/pages/reset-password/reset-password.component.ts @@ -9,8 +9,8 @@ import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { AuthService } from '@osf/core/services'; +import { PasswordInputHintComponent } from '@osf/shared/components'; import { CustomValidators, PASSWORD_REGEX } from '@osf/shared/helpers'; -import { PasswordInputHintComponent } from '@shared/components'; import { ResetPasswordFormGroupType } from '../../models'; diff --git a/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts b/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts index 6c7b14287..63b6fbaa2 100644 --- a/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts +++ b/src/app/features/collections/components/add-to-collection/add-to-collection-confirmation-dialog/add-to-collection-confirmation-dialog.component.ts @@ -10,9 +10,9 @@ import { forkJoin, of } from 'rxjs'; import { ChangeDetectionStrategy, Component, DestroyRef, inject, signal } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { CreateCollectionSubmission } from '@osf/features/collections/store/add-to-collection/add-to-collection.actions'; +import { CreateCollectionSubmission } from '@osf/features/collections/store/add-to-collection'; import { UpdateProjectPublicStatus } from '@osf/features/project/overview/store'; -import { ToastService } from '@shared/services'; +import { ToastService } from '@osf/shared/services'; @Component({ selector: 'osf-add-to-collection-confirmation-dialog', 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 cd508271e..f1fca5e0f 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 @@ -27,7 +27,7 @@ import { ClearAddToCollectionState, CreateCollectionSubmission, } from '@osf/features/collections/store/add-to-collection'; -import { LoadingSpinnerComponent } from '@shared/components'; +import { LoadingSpinnerComponent } from '@osf/shared/components'; import { HeaderStyleHelper } from '@shared/helpers'; import { CanDeactivateComponent } from '@shared/models'; import { BrandService } from '@shared/services'; 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..092101e2a 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 '@osf/shared/stores'; @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 dfa1bad79..b86b60bb0 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 @@ -7,8 +7,7 @@ import { DialogService } from 'primeng/dynamicdialog'; import { Step, StepItem, StepPanel } from 'primeng/stepper'; import { Tooltip } from 'primeng/tooltip'; -import { forkJoin } from 'rxjs'; -import { filter } from 'rxjs/operators'; +import { filter, forkJoin } from 'rxjs'; import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, input, output, signal } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; 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 6fe5c6b1e..d743c2e17 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 @@ -30,18 +30,15 @@ import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AddToCollectionSteps, ProjectMetadataFormControls } from '@osf/features/collections/enums'; import { ProjectMetadataForm } from '@osf/features/collections/models'; -import { ProjectMetadataFormService } from '@osf/features/collections/services/project-metadata-form.service'; -import { GetCollectionLicenses } from '@osf/features/collections/store/add-to-collection/add-to-collection.actions'; -import { AddToCollectionSelectors } from '@osf/features/collections/store/add-to-collection/add-to-collection.selectors'; -import { TagsInputComponent, TextInputComponent, TruncatedTextComponent } from '@shared/components'; -import { InputLimits } from '@shared/constants'; -import { ResourceType } from '@shared/enums'; -import { LicenseModel } from '@shared/models'; -import { Project } from '@shared/models/projects'; -import { InterpolatePipe } from '@shared/pipes'; -import { ToastService } from '@shared/services'; -import { ClearProjects, GetAllContributors, UpdateProjectMetadata } from '@shared/stores'; -import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors'; +import { ProjectMetadataFormService } from '@osf/features/collections/services'; +import { AddToCollectionSelectors, GetCollectionLicenses } from '@osf/features/collections/store/add-to-collection'; +import { TagsInputComponent, TextInputComponent, TruncatedTextComponent } from '@osf/shared/components'; +import { InputLimits } from '@osf/shared/constants'; +import { ResourceType } from '@osf/shared/enums'; +import { LicenseModel, Project } from '@osf/shared/models'; +import { InterpolatePipe } from '@osf/shared/pipes'; +import { ToastService } from '@osf/shared/services'; +import { ClearProjects, GetAllContributors, ProjectsSelectors, UpdateProjectMetadata } from '@osf/shared/stores'; @Component({ selector: 'osf-project-metadata-step', 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 f88889e4a..6363c21b7 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,8 +8,8 @@ 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 { ProjectSelectorComponent } from '@osf/shared/components'; import { SetSelectedProject } from '@osf/shared/stores'; -import { ProjectSelectorComponent } from '@shared/components'; import { Project } from '@shared/models/projects'; import { CollectionsSelectors, GetUserCollectionSubmissions } from '@shared/stores/collections'; import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors'; 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 363456ffe..34d961805 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 @@ -12,12 +12,10 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormControl } from '@angular/forms'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; -import { CollectionsHelpDialogComponent, CollectionsMainContentComponent } from '@osf/features/collections/components'; -import { CollectionsQuerySyncService } from '@osf/features/collections/services'; -import { LoadingSpinnerComponent, SearchInputComponent } from '@shared/components'; -import { HeaderStyleHelper } from '@shared/helpers'; -import { CollectionsFilters } from '@shared/models'; -import { BrandService } from '@shared/services'; +import { LoadingSpinnerComponent, SearchInputComponent } from '@osf/shared/components'; +import { HeaderStyleHelper } from '@osf/shared/helpers'; +import { CollectionsFilters } from '@osf/shared/models'; +import { BrandService } from '@osf/shared/services'; import { ClearCollections, ClearCollectionSubmissions, @@ -27,7 +25,11 @@ import { SearchCollectionSubmissions, SetPageNumber, SetSearchValue, -} from '@shared/stores/collections'; +} from '@osf/shared/stores'; + +import { CollectionsQuerySyncService } from '../../services'; +import { CollectionsHelpDialogComponent } from '../collections-help-dialog/collections-help-dialog.component'; +import { CollectionsMainContentComponent } from '../collections-main-content'; @Component({ selector: 'osf-collections-discover', diff --git a/src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts b/src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts index 77f067bf1..a08d224b5 100644 --- a/src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts +++ b/src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts @@ -4,8 +4,6 @@ import { Chip } from 'primeng/chip'; import { ChangeDetectionStrategy, Component, computed } from '@angular/core'; -import { collectionFilterTypes } from '@osf/features/collections/constants/filter-types.const'; -import { CollectionFilterType } from '@osf/features/collections/enums'; import { CollectionsSelectors, SetCollectedTypeFilters, @@ -18,7 +16,10 @@ import { SetStatusFilters, SetStudyDesignFilters, SetVolumeFilters, -} from '@shared/stores/collections'; +} from '@osf/shared/stores'; + +import { collectionFilterTypes } from '../../constants/filter-types.const'; +import { CollectionFilterType } from '../../enums'; @Component({ selector: 'osf-collections-filter-chips', diff --git a/src/app/features/collections/components/collections-filters/collections-filters.component.ts b/src/app/features/collections/components/collections-filters/collections-filters.component.ts index cd560197c..3c95c4e88 100644 --- a/src/app/features/collections/components/collections-filters/collections-filters.component.ts +++ b/src/app/features/collections/components/collections-filters/collections-filters.component.ts @@ -8,8 +8,6 @@ import { MultiSelect, MultiSelectChangeEvent } from 'primeng/multiselect'; import { ChangeDetectionStrategy, Component, computed } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { collectionFilterTypes } from '@osf/features/collections/constants/filter-types.const'; -import { CollectionFilterType } from '@osf/features/collections/enums'; import { CollectionsSelectors, SetCollectedTypeFilters, @@ -22,7 +20,10 @@ import { SetStatusFilters, SetStudyDesignFilters, SetVolumeFilters, -} from '@shared/stores/collections'; +} from '@osf/shared/stores'; + +import { collectionFilterTypes } from '../../constants/filter-types.const'; +import { CollectionFilterType } from '../../enums'; @Component({ selector: 'osf-collections-filters', diff --git a/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts b/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts index 700cc6b69..7b83a14f5 100644 --- a/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts +++ b/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts @@ -10,11 +10,11 @@ import { ChangeDetectionStrategy, Component, computed, inject, signal } from '@a import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; -import { CollectionsFilterChipsComponent } from '@osf/features/collections/components'; -import { collectionsSortOptions } from '@osf/features/collections/constants'; import { IS_WEB } from '@osf/shared/helpers'; -import { CollectionsSelectors, SetSortBy } from '@shared/stores/collections'; +import { CollectionsSelectors, SetSortBy } from '@osf/shared/stores'; +import { collectionsSortOptions } from '../../constants'; +import { CollectionsFilterChipsComponent } from '../collections-filter-chips/collections-filter-chips.component'; import { CollectionsFiltersComponent } from '../collections-filters/collections-filters.component'; import { CollectionsSearchResultsComponent } from '../collections-search-results/collections-search-results.component'; diff --git a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts index 32b2b18a3..2184f2ef6 100644 --- a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts +++ b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.ts @@ -3,8 +3,9 @@ import { TranslatePipe } from '@ngx-translate/core'; import { DatePipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core'; -import { collectionFilterNames } from '@osf/features/collections/constants'; -import { CollectionSubmissionWithGuid } from '@shared/models'; +import { CollectionSubmissionWithGuid } from '@osf/shared/models'; + +import { collectionFilterNames } from '../../constants'; @Component({ selector: 'osf-collections-search-result-card', diff --git a/src/app/features/collections/components/collections-search-results/collections-search-results.component.ts b/src/app/features/collections/components/collections-search-results/collections-search-results.component.ts index c456fb6af..8156df35d 100644 --- a/src/app/features/collections/components/collections-search-results/collections-search-results.component.ts +++ b/src/app/features/collections/components/collections-search-results/collections-search-results.component.ts @@ -9,7 +9,7 @@ import { Skeleton } from 'primeng/skeleton'; import { ChangeDetectionStrategy, Component, computed } from '@angular/core'; import { CustomPaginatorComponent } from '@osf/shared/components'; -import { CollectionsSelectors, SetPageNumber } from '@shared/stores/collections'; +import { CollectionsSelectors, SetPageNumber } from '@osf/shared/stores'; import { CollectionsSearchResultCardComponent } from '../collections-search-result-card/collections-search-result-card.component'; diff --git a/src/app/features/files/components/file-keywords/file-keywords.component.ts b/src/app/features/files/components/file-keywords/file-keywords.component.ts index 7991a5740..91c434e6f 100644 --- a/src/app/features/files/components/file-keywords/file-keywords.component.ts +++ b/src/app/features/files/components/file-keywords/file-keywords.component.ts @@ -11,8 +11,8 @@ import { ChangeDetectionStrategy, Component, DestroyRef, inject } from '@angular import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms'; +import { InputLimits } from '@osf/shared/constants'; import { CustomValidators } from '@osf/shared/helpers'; -import { InputLimits } from '@shared/constants'; import { FilesSelectors, UpdateTags } from '../../store'; diff --git a/src/app/features/files/components/file-revisions/file-revisions.component.ts b/src/app/features/files/components/file-revisions/file-revisions.component.ts index 3c191331b..83fb7a2b7 100644 --- a/src/app/features/files/components/file-revisions/file-revisions.component.ts +++ b/src/app/features/files/components/file-revisions/file-revisions.component.ts @@ -13,9 +13,8 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { toObservable, toSignal } from '@angular/core/rxjs-interop'; import { ActivatedRoute } from '@angular/router'; -import { CopyButtonComponent } from '@osf/shared/components'; -import { InfoIconComponent } from '@osf/shared/components/info-icon/info-icon.component'; -import { DataciteService } from '@shared/services/datacite/datacite.service'; +import { CopyButtonComponent, InfoIconComponent } from '@osf/shared/components'; +import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; 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 0c2dc59db..f8fbad38c 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 @@ -7,12 +7,15 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; import { PaginatorState } from 'primeng/paginator'; import { Tooltip } from 'primeng/tooltip'; -import { finalize, throwError } from 'rxjs'; -import { catchError } from 'rxjs/operators'; +import { catchError, finalize, throwError } from 'rxjs'; import { ChangeDetectionStrategy, Component, computed, DestroyRef, effect, inject, signal } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; +import { CustomPaginatorComponent, IconComponent, LoadingSpinnerComponent } from '@osf/shared/components'; +import { OsfFile } from '@osf/shared/models'; +import { FilesService, ToastService } from '@osf/shared/services'; + import { FilesSelectors, GetFiles, @@ -20,10 +23,7 @@ import { GetRootFolderFiles, SetCurrentFolder, SetMoveFileCurrentFolder, -} from '@osf/features/files/store'; -import { CustomPaginatorComponent, IconComponent, LoadingSpinnerComponent } from '@shared/components'; -import { OsfFile } from '@shared/models'; -import { FilesService, ToastService } from '@shared/services'; +} from '../../store'; @Component({ selector: 'osf-move-file-dialog', diff --git a/src/app/features/files/mappers/resource-metadata.mapper.ts b/src/app/features/files/mappers/resource-metadata.mapper.ts index 714965b2a..525e547c5 100644 --- a/src/app/features/files/mappers/resource-metadata.mapper.ts +++ b/src/app/features/files/mappers/resource-metadata.mapper.ts @@ -1,5 +1,5 @@ -import { IdentifiersMapper } from '@shared/mappers/identifiers.mapper'; -import { ResourceMetadata } from '@shared/models'; +import { IdentifiersMapper } from '@osf/shared/mappers/identifiers.mapper'; +import { ResourceMetadata } from '@osf/shared/models'; import { GetResourceCustomMetadataResponse } from '../models/get-resource-custom-metadata-response.model'; import { GetResourceShortInfoResponse } from '../models/get-resource-short-info-response.model'; diff --git a/src/app/features/files/pages/file-detail/file-detail.component.ts b/src/app/features/files/pages/file-detail/file-detail.component.ts index 1b995c8db..318093b6b 100644 --- a/src/app/features/files/pages/file-detail/file-detail.component.ts +++ b/src/app/features/files/pages/file-detail/file-detail.component.ts @@ -41,7 +41,7 @@ import { MetadataResourceEnum, ResourceType } from '@osf/shared/enums'; import { pathJoin } from '@osf/shared/helpers'; import { MetadataTabsModel, OsfFile } from '@osf/shared/models'; import { CustomConfirmationService, MetaTagsService, ToastService } from '@osf/shared/services'; -import { DataciteService } from '@shared/services/datacite/datacite.service'; +import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; import { FileKeywordsComponent, diff --git a/src/app/features/files/pages/files/files.component.ts b/src/app/features/files/pages/files/files.component.ts index bbfe7ddb1..1f2b2f85b 100644 --- a/src/app/features/files/pages/files/files.component.ts +++ b/src/app/features/files/pages/files/files.component.ts @@ -29,9 +29,28 @@ import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; +import { + FilesTreeComponent, + FormSelectComponent, + LoadingSpinnerComponent, + SearchInputComponent, + SubHeaderComponent, + ViewOnlyLinkMessageComponent, +} from '@osf/shared/components'; +import { GoogleFilePickerComponent } from '@osf/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component'; +import { ALL_SORT_OPTIONS } from '@osf/shared/constants'; +import { ResourceType } from '@osf/shared/enums'; +import { hasViewOnlyParam, IS_MEDIUM } from '@osf/shared/helpers'; +import { ConfiguredAddonModel, FileLabelModel, FilesTreeActions, OsfFile, StorageItemModel } from '@osf/shared/models'; +import { FilesService } from '@osf/shared/services'; +import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; + +import { CreateFolderDialogComponent, FileBrowserInfoComponent } from '../../components'; +import { FileProvider } from '../../constants'; import { CreateFolder, DeleteEntry, + FilesSelectors, GetConfiguredStorageAddons, GetFiles, GetRootFolders, @@ -43,26 +62,7 @@ import { SetMoveFileCurrentFolder, SetSearch, SetSort, -} from '@osf/features/files/store'; -import { ALL_SORT_OPTIONS } from '@osf/shared/constants'; -import { ResourceType } from '@osf/shared/enums'; -import { hasViewOnlyParam, IS_MEDIUM } from '@osf/shared/helpers'; -import { - FilesTreeComponent, - FormSelectComponent, - LoadingSpinnerComponent, - SearchInputComponent, - SubHeaderComponent, - ViewOnlyLinkMessageComponent, -} from '@shared/components'; -import { GoogleFilePickerComponent } from '@shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component'; -import { ConfiguredAddonModel, FileLabelModel, FilesTreeActions, OsfFile, StorageItemModel } from '@shared/models'; -import { FilesService } from '@shared/services'; -import { DataciteService } from '@shared/services/datacite/datacite.service'; - -import { CreateFolderDialogComponent, FileBrowserInfoComponent } from '../../components'; -import { FileProvider } from '../../constants'; -import { FilesSelectors } from '../../store'; +} from '../../store'; import { environment } from 'src/environments/environment'; diff --git a/src/app/features/files/store/files.state.ts b/src/app/features/files/store/files.state.ts index d9e572374..2e2afb845 100644 --- a/src/app/features/files/store/files.state.ts +++ b/src/app/features/files/store/files.state.ts @@ -4,9 +4,10 @@ import { catchError, finalize, forkJoin, tap } from 'rxjs'; import { inject, Injectable } from '@angular/core'; -import { MapResourceMetadata } from '@osf/features/files/mappers'; import { handleSectionError } from '@osf/shared/helpers'; -import { FilesService, ToastService } from '@shared/services'; +import { FilesService, ToastService } from '@osf/shared/services'; + +import { MapResourceMetadata } from '../mappers'; import { CreateFolder, diff --git a/src/app/features/meetings/pages/meetings-landing/meetings-landing.component.ts b/src/app/features/meetings/pages/meetings-landing/meetings-landing.component.ts index 1ecbbecd2..20ac9a133 100644 --- a/src/app/features/meetings/pages/meetings-landing/meetings-landing.component.ts +++ b/src/app/features/meetings/pages/meetings-landing/meetings-landing.component.ts @@ -23,16 +23,16 @@ import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; import { FormControl } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { Meeting } from '@osf/features/meetings/models'; -import { GetAllMeetings, MeetingsSelectors } from '@osf/features/meetings/store'; -import { SearchInputComponent, SubHeaderComponent } from '@shared/components'; -import { DEFAULT_TABLE_PARAMS } from '@shared/constants'; -import { SortOrder } from '@shared/enums'; -import { parseQueryFilterParams } from '@shared/helpers'; -import { QueryParams, SearchFilters, TableParameters } from '@shared/models'; +import { SearchInputComponent, SubHeaderComponent } from '@osf/shared/components'; +import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants'; +import { SortOrder } from '@osf/shared/enums'; +import { parseQueryFilterParams } from '@osf/shared/helpers'; +import { QueryParams, SearchFilters, TableParameters } from '@osf/shared/models'; import { MeetingsFeatureCardComponent } from '../../components'; import { MEETINGS_FEATURE_CARDS, PARTNER_ORGANIZATIONS } from '../../constants'; +import { Meeting } from '../../models'; +import { GetAllMeetings, MeetingsSelectors } from '../../store'; @Component({ selector: 'osf-meetings-landing', diff --git a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts index d55d895ed..dee9a98da 100644 --- a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts +++ b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts @@ -17,16 +17,16 @@ import { ViewEncapsulation, } from '@angular/core'; -import { CEDAR_CONFIG, CEDAR_VIEWER_CONFIG } from '@osf/features/metadata/constants'; -import { CedarMetadataHelper } from '@osf/features/metadata/helpers'; +import 'cedar-artifact-viewer'; + +import { CEDAR_CONFIG, CEDAR_VIEWER_CONFIG } from '../../constants'; +import { CedarMetadataHelper } from '../../helpers'; import { CedarEditorElement, CedarMetadataDataTemplateJsonApi, CedarMetadataRecordData, CedarRecordDataBinding, -} from '@osf/features/metadata/models'; - -import 'cedar-artifact-viewer'; +} from '../../models'; @Component({ selector: 'osf-cedar-template-form', diff --git a/src/app/features/metadata/components/metadata-license/metadata-license.component.ts b/src/app/features/metadata/components/metadata-license/metadata-license.component.ts index a51bd19d2..cac02aa66 100644 --- a/src/app/features/metadata/components/metadata-license/metadata-license.component.ts +++ b/src/app/features/metadata/components/metadata-license/metadata-license.component.ts @@ -5,7 +5,7 @@ import { Card } from 'primeng/card'; import { ChangeDetectionStrategy, Component, input, output } from '@angular/core'; -import { LicenseModel } from '@shared/models'; +import { LicenseModel } from '@osf/shared/models'; @Component({ selector: 'osf-metadata-license', diff --git a/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.ts b/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.ts index f4c3c6ff7..96e3a6fef 100644 --- a/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.ts +++ b/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.ts @@ -5,11 +5,12 @@ import { Card } from 'primeng/card'; import { ChangeDetectionStrategy, Component, input, output } from '@angular/core'; -import { RESOURCE_TYPE_OPTIONS } from '@osf/features/metadata/constants'; -import { CustomItemMetadataRecord } from '@osf/features/metadata/models'; import { languageCodes } from '@osf/shared/constants'; import { LanguageCodeModel } from '@osf/shared/models'; +import { RESOURCE_TYPE_OPTIONS } from '../../constants'; +import { CustomItemMetadataRecord } from '../../models'; + @Component({ selector: 'osf-metadata-resource-information', imports: [Button, Card, TranslatePipe], diff --git a/src/app/features/metadata/components/metadata-subjects/metadata-subjects.component.ts b/src/app/features/metadata/components/metadata-subjects/metadata-subjects.component.ts index 317d57b8e..4c1cef000 100644 --- a/src/app/features/metadata/components/metadata-subjects/metadata-subjects.component.ts +++ b/src/app/features/metadata/components/metadata-subjects/metadata-subjects.component.ts @@ -2,7 +2,7 @@ import { Card } from 'primeng/card'; import { ChangeDetectionStrategy, Component, input, output } from '@angular/core'; -import { SubjectsComponent } from '@osf/shared/components/subjects/subjects.component'; +import { SubjectsComponent } from '@osf/shared/components'; import { SubjectModel } from '@osf/shared/models'; @Component({ diff --git a/src/app/features/metadata/components/shared-metadata/shared-metadata.component.ts b/src/app/features/metadata/components/shared-metadata/shared-metadata.component.ts index 551238cae..8e8da97c7 100644 --- a/src/app/features/metadata/components/shared-metadata/shared-metadata.component.ts +++ b/src/app/features/metadata/components/shared-metadata/shared-metadata.component.ts @@ -5,11 +5,11 @@ import { Card } from 'primeng/card'; import { DatePipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, input, output } from '@angular/core'; -import { CustomItemMetadataRecord, Metadata } from '@osf/features/metadata/models'; import { TagsInputComponent } from '@osf/shared/components'; import { ResourceType } from '@osf/shared/enums'; import { Institution, SubjectModel } from '@osf/shared/models'; +import { CustomItemMetadataRecord, Metadata } from '../../models'; import { MetadataAffiliatedInstitutionsComponent } from '../metadata-affiliated-institutions/metadata-affiliated-institutions.component'; import { MetadataContributorsComponent } from '../metadata-contributors/metadata-contributors.component'; import { MetadataDescriptionComponent } from '../metadata-description/metadata-description.component'; diff --git a/src/app/features/metadata/dialogs/license-dialog/license-dialog.component.ts b/src/app/features/metadata/dialogs/license-dialog/license-dialog.component.ts index 6d3d62153..c1fa83ffa 100644 --- a/src/app/features/metadata/dialogs/license-dialog/license-dialog.component.ts +++ b/src/app/features/metadata/dialogs/license-dialog/license-dialog.component.ts @@ -7,10 +7,11 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; import { ChangeDetectionStrategy, Component, inject, OnInit, signal, viewChild } from '@angular/core'; -import { Metadata } from '@osf/features/metadata/models'; import { LicenseComponent, LoadingSpinnerComponent } from '@osf/shared/components'; -import { LicenseModel, LicenseOptions } from '@shared/models'; -import { LicensesSelectors, LoadAllLicenses } from '@shared/stores/licenses'; +import { LicenseModel, LicenseOptions } from '@osf/shared/models'; +import { LicensesSelectors, LoadAllLicenses } from '@osf/shared/stores'; + +import { Metadata } from '../../models'; @Component({ selector: 'osf-license-dialog', diff --git a/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts b/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts index c27330578..5d8b8263b 100644 --- a/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts +++ b/src/app/features/metadata/pages/add-metadata/add-metadata.component.ts @@ -18,10 +18,10 @@ import { import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; import { ActivatedRoute, Router } from '@angular/router'; +import { LoadingSpinnerComponent, SubHeaderComponent } from '@osf/shared/components'; import { ResourceType } from '@osf/shared/enums'; import { IS_MEDIUM } from '@osf/shared/helpers'; -import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components'; -import { ToastService } from '@shared/services'; +import { ToastService } from '@osf/shared/services'; import { CedarTemplateFormComponent } from '../../components'; import { CedarMetadataDataTemplateJsonApi, CedarMetadataRecordData, CedarRecordDataBinding } from '../../models'; 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 181ebc0b4..066f90cc8 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 @@ -9,11 +9,6 @@ import { ChangeDetectionStrategy, Component, computed, effect, inject, signal } import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { - CollectionsModerationSelectors, - GetCollectionSubmissions, - GetSubmissionsReviewActions, -} from '@osf/features/moderation/store/collections-moderation'; import { CustomPaginatorComponent, IconComponent, @@ -30,10 +25,15 @@ import { GetCollectionProvider, SearchCollectionSubmissions, SetPageNumber, -} from '@shared/stores'; +} from '@osf/shared/stores'; import { COLLECTIONS_SUBMISSIONS_REVIEW_OPTIONS } from '../../constants'; import { SubmissionReviewStatus } from '../../enums'; +import { + CollectionsModerationSelectors, + GetCollectionSubmissions, + GetSubmissionsReviewActions, +} from '../../store/collections-moderation'; import { CollectionSubmissionsListComponent } from '../collection-submissions-list/collection-submissions-list.component'; @Component({ 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 a44c3ff3e..7c0f867f7 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 @@ -9,13 +9,13 @@ import { ChangeDetectionStrategy, Component, computed, inject, input } from '@an import { ActivatedRoute, Router } from '@angular/router'; import { collectionFilterNames } from '@osf/features/collections/constants'; -import { SubmissionReviewStatus } from '@osf/features/moderation/enums'; import { IconComponent } from '@osf/shared/components'; +import { CollectionSubmissionWithGuid } from '@osf/shared/models'; import { DateAgoPipe } from '@osf/shared/pipes'; -import { CollectionSubmissionWithGuid } from '@shared/models'; -import { CollectionsSelectors } from '@shared/stores'; +import { CollectionsSelectors } from '@osf/shared/stores'; import { ReviewStatusIcon } from '../../constants'; +import { SubmissionReviewStatus } from '../../enums'; @Component({ selector: 'osf-submission-item', diff --git a/src/app/features/moderation/components/collection-submission-overview/collection-submission-overview.component.ts b/src/app/features/moderation/components/collection-submission-overview/collection-submission-overview.component.ts index d0a610b59..4bc8b0323 100644 --- a/src/app/features/moderation/components/collection-submission-overview/collection-submission-overview.component.ts +++ b/src/app/features/moderation/components/collection-submission-overview/collection-submission-overview.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, computed, effect, inject } from '@a import { ActivatedRoute, Router } from '@angular/router'; import { ProjectOverviewComponent } from '@osf/features/project/overview/project-overview.component'; -import { Mode } from '@shared/enums'; +import { Mode } from '@osf/shared/enums'; @Component({ selector: 'osf-collection-submission-overview', diff --git a/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts b/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts index c2625b282..1bf63272c 100644 --- a/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts +++ b/src/app/features/moderation/components/collection-submissions-list/collection-submissions-list.component.ts @@ -4,8 +4,8 @@ import { TranslatePipe } from '@ngx-translate/core'; import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { CollectionSubmissionItemComponent } from '@osf/features/moderation/components/collection-submission-item/collection-submission-item.component'; -import { CollectionsModerationSelectors } from '@osf/features/moderation/store/collections-moderation'; +import { CollectionsModerationSelectors } from '../../store/collections-moderation'; +import { CollectionSubmissionItemComponent } from '../collection-submission-item/collection-submission-item.component'; @Component({ selector: 'osf-submissions-list', diff --git a/src/app/features/moderation/components/moderators-list/moderators-list.component.ts b/src/app/features/moderation/components/moderators-list/moderators-list.component.ts index 123fd3f6f..95bf596be 100644 --- a/src/app/features/moderation/components/moderators-list/moderators-list.component.ts +++ b/src/app/features/moderation/components/moderators-list/moderators-list.component.ts @@ -23,20 +23,20 @@ import { FormControl } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { UserSelectors } from '@core/store/user'; -import { AddModeratorType, ModeratorPermission } from '@osf/features/moderation/enums'; -import { ModeratorDialogAddModel, ModeratorModel } from '@osf/features/moderation/models'; +import { SearchInputComponent } from '@osf/shared/components'; +import { ResourceType } from '@osf/shared/enums'; +import { CustomConfirmationService, ToastService } from '@osf/shared/services'; +import { UpdateSearchValue } from '@osf/shared/stores'; + +import { AddModeratorType, ModeratorPermission } from '../../enums'; +import { ModeratorDialogAddModel, ModeratorModel } from '../../models'; import { AddModerator, DeleteModerator, LoadModerators, ModeratorsSelectors, UpdateModerator, - UpdateSearchValue, -} from '@osf/features/moderation/store/moderators'; -import { SearchInputComponent } from '@osf/shared/components'; -import { ResourceType } from '@osf/shared/enums'; -import { CustomConfirmationService, ToastService } from '@osf/shared/services'; - +} from '../../store/moderators'; import { AddModeratorDialogComponent } from '../add-moderator-dialog/add-moderator-dialog.component'; import { InviteModeratorDialogComponent } from '../invite-moderator-dialog/invite-moderator-dialog.component'; import { ModeratorsTableComponent } from '../moderators-table/moderators-table.component'; diff --git a/src/app/features/moderation/components/moderators-table/moderators-table.component.ts b/src/app/features/moderation/components/moderators-table/moderators-table.component.ts index e3c721fd9..055f3c678 100644 --- a/src/app/features/moderation/components/moderators-table/moderators-table.component.ts +++ b/src/app/features/moderation/components/moderators-table/moderators-table.component.ts @@ -8,9 +8,6 @@ import { TableModule } from 'primeng/table'; import { ChangeDetectionStrategy, Component, inject, input, output, signal } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { MODERATION_PERMISSIONS } from '@osf/features/moderation/constants'; -import { ModeratorPermission } from '@osf/features/moderation/enums'; -import { ModeratorModel } from '@osf/features/moderation/models'; import { EducationHistoryDialogComponent, EmploymentHistoryDialogComponent, @@ -19,6 +16,10 @@ import { import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants'; import { TableParameters } from '@osf/shared/models'; +import { MODERATION_PERMISSIONS } from '../../constants'; +import { ModeratorPermission } from '../../enums'; +import { ModeratorModel } from '../../models'; + @Component({ selector: 'osf-moderators-table', imports: [TranslatePipe, FormsModule, TableModule, Skeleton, Button, SelectComponent], diff --git a/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts b/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts index 734ae2e36..49ad896eb 100644 --- a/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts +++ b/src/app/features/moderation/components/preprint-recent-activity-list/preprint-recent-activity-list.component.ts @@ -7,10 +7,11 @@ import { TableModule } from 'primeng/table'; import { DatePipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, input, output, signal } from '@angular/core'; -import { PreprintReviewStatus, ReviewStatusIcon } from '@osf/features/moderation/constants'; -import { PreprintReviewActionModel } from '@osf/features/moderation/models'; import { CustomPaginatorComponent, IconComponent } from '@osf/shared/components'; +import { PreprintReviewStatus, ReviewStatusIcon } from '../../constants'; +import { PreprintReviewActionModel } from '../../models'; + @Component({ selector: 'osf-preprint-recent-activity-list', imports: [TableModule, DatePipe, TranslatePipe, IconComponent, Skeleton, CustomPaginatorComponent], diff --git a/src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.ts b/src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.ts index d53e6a994..b53ddc391 100644 --- a/src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.ts +++ b/src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.ts @@ -4,11 +4,11 @@ import { Button } from 'primeng/button'; import { ChangeDetectionStrategy, Component, input, output } from '@angular/core'; -import { PREPRINT_ACTION_LABEL, ReviewStatusIcon } from '@osf/features/moderation/constants'; -import { ActionStatus, SubmissionReviewStatus } from '@osf/features/moderation/enums'; import { IconComponent } from '@osf/shared/components'; import { DateAgoPipe } from '@osf/shared/pipes'; +import { PREPRINT_ACTION_LABEL, ReviewStatusIcon } from '../../constants'; +import { ActionStatus, SubmissionReviewStatus } from '../../enums'; import { PreprintSubmission, PreprintWithdrawalSubmission } from '../../models'; @Component({ diff --git a/src/app/features/moderation/components/preprint-submissions/preprint-submissions.component.ts b/src/app/features/moderation/components/preprint-submissions/preprint-submissions.component.ts index 6d76bd71e..b596fc1aa 100644 --- a/src/app/features/moderation/components/preprint-submissions/preprint-submissions.component.ts +++ b/src/app/features/moderation/components/preprint-submissions/preprint-submissions.component.ts @@ -13,9 +13,6 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { PreprintSubmissionItemComponent } from '@osf/features/moderation/components'; -import { PREPRINT_SORT_OPTIONS, SUBMISSION_REVIEW_OPTIONS } from '@osf/features/moderation/constants'; -import { PreprintSubmissionsSort, SubmissionReviewStatus } from '@osf/features/moderation/enums'; import { CustomPaginatorComponent, IconComponent, @@ -24,8 +21,11 @@ import { } from '@osf/shared/components'; import { Primitive } from '@osf/shared/helpers'; +import { PREPRINT_SORT_OPTIONS, SUBMISSION_REVIEW_OPTIONS } from '../../constants'; +import { PreprintSubmissionsSort, SubmissionReviewStatus } from '../../enums'; import { PreprintSubmission } from '../../models'; import { GetPreprintSubmissions, PreprintModerationSelectors } from '../../store/preprint-moderation'; +import { PreprintSubmissionItemComponent } from '../preprint-submission-item/preprint-submission-item.component'; @Component({ selector: 'osf-preprint-submissions', diff --git a/src/app/features/moderation/components/preprint-withdrawal-submissions/preprint-withdrawal-submissions.component.ts b/src/app/features/moderation/components/preprint-withdrawal-submissions/preprint-withdrawal-submissions.component.ts index a0b6fcd3e..afa03fefa 100644 --- a/src/app/features/moderation/components/preprint-withdrawal-submissions/preprint-withdrawal-submissions.component.ts +++ b/src/app/features/moderation/components/preprint-withdrawal-submissions/preprint-withdrawal-submissions.component.ts @@ -13,8 +13,6 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { PREPRINT_SORT_OPTIONS, WITHDRAWAL_SUBMISSION_REVIEW_OPTIONS } from '@osf/features/moderation/constants'; -import { PreprintSubmissionsSort, SubmissionReviewStatus } from '@osf/features/moderation/enums'; import { CustomPaginatorComponent, IconComponent, @@ -23,6 +21,8 @@ import { } from '@osf/shared/components'; import { Primitive } from '@osf/shared/helpers'; +import { PREPRINT_SORT_OPTIONS, WITHDRAWAL_SUBMISSION_REVIEW_OPTIONS } from '../../constants'; +import { PreprintSubmissionsSort, SubmissionReviewStatus } from '../../enums'; import { PreprintWithdrawalSubmission } from '../../models'; import { GetPreprintWithdrawalSubmissions, PreprintModerationSelectors } from '../../store/preprint-moderation'; import { PreprintSubmissionItemComponent } from '../preprint-submission-item/preprint-submission-item.component'; diff --git a/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts b/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts index bee863994..af2f21a42 100644 --- a/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts +++ b/src/app/features/moderation/components/registry-pending-submissions/registry-pending-submissions.component.ts @@ -13,12 +13,6 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { PENDING_SUBMISSION_REVIEW_OPTIONS, REGISTRY_SORT_OPTIONS } from '@osf/features/moderation/constants'; -import { RegistrySort, SubmissionReviewStatus } from '@osf/features/moderation/enums'; -import { - GetRegistrySubmissions, - RegistryModerationSelectors, -} from '@osf/features/moderation/store/registry-moderation'; import { CustomPaginatorComponent, IconComponent, @@ -27,7 +21,10 @@ import { } from '@osf/shared/components'; import { Primitive } from '@osf/shared/helpers'; -import { RegistrySubmissionItemComponent } from '..'; +import { PENDING_SUBMISSION_REVIEW_OPTIONS, REGISTRY_SORT_OPTIONS } from '../../constants'; +import { RegistrySort, SubmissionReviewStatus } from '../../enums'; +import { GetRegistrySubmissions, RegistryModerationSelectors } from '../../store/registry-moderation'; +import { RegistrySubmissionItemComponent } from '../registry-submission-item/registry-submission-item.component'; @Component({ selector: 'osf-registry-pending-submissions', diff --git a/src/app/features/moderation/components/registry-submissions/registry-submissions.component.ts b/src/app/features/moderation/components/registry-submissions/registry-submissions.component.ts index e9d4b0b7f..5930a3e91 100644 --- a/src/app/features/moderation/components/registry-submissions/registry-submissions.component.ts +++ b/src/app/features/moderation/components/registry-submissions/registry-submissions.component.ts @@ -24,7 +24,7 @@ import { Primitive } from '@osf/shared/helpers'; import { REGISTRY_SORT_OPTIONS, SUBMITTED_SUBMISSION_REVIEW_OPTIONS } from '../../constants'; import { RegistrySort, SubmissionReviewStatus } from '../../enums'; import { GetRegistrySubmissions, RegistryModerationSelectors } from '../../store/registry-moderation'; -import { RegistrySubmissionItemComponent } from '..'; +import { RegistrySubmissionItemComponent } from '../registry-submission-item/registry-submission-item.component'; @Component({ selector: 'osf-registry-submissions', diff --git a/src/app/features/moderation/pages/preprint-moderation/preprint-moderation.component.ts b/src/app/features/moderation/pages/preprint-moderation/preprint-moderation.component.ts index 2890fe2d4..5a07a1385 100644 --- a/src/app/features/moderation/pages/preprint-moderation/preprint-moderation.component.ts +++ b/src/app/features/moderation/pages/preprint-moderation/preprint-moderation.component.ts @@ -7,12 +7,13 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router, RouterOutlet } from '@angular/router'; -import { PREPRINT_MODERATION_TABS } from '@osf/features/moderation/constants'; -import { PreprintModerationTab } from '@osf/features/moderation/enums'; import { SelectComponent, SubHeaderComponent } from '@osf/shared/components'; import { ResourceType } from '@osf/shared/enums'; import { IS_MEDIUM, Primitive } from '@osf/shared/helpers'; +import { PREPRINT_MODERATION_TABS } from '../../constants'; +import { PreprintModerationTab } from '../../enums'; + @Component({ selector: 'osf-preprint-moderation', imports: [ diff --git a/src/app/features/my-projects/my-projects.component.ts b/src/app/features/my-projects/my-projects.component.ts index 3f392c093..785a0a9d1 100644 --- a/src/app/features/my-projects/my-projects.component.ts +++ b/src/app/features/my-projects/my-projects.component.ts @@ -28,6 +28,7 @@ import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants'; import { ResourceType, SortOrder } from '@osf/shared/enums'; import { IS_MEDIUM, parseQueryFilterParams } from '@osf/shared/helpers'; import { MyResourcesItem, MyResourcesSearchFilters, QueryParams, TableParameters } from '@osf/shared/models'; +import { ProjectRedirectDialogService } from '@osf/shared/services'; import { BookmarksSelectors, ClearMyResources, @@ -38,7 +39,6 @@ import { GetMyRegistrations, MyResourcesSelectors, } from '@osf/shared/stores'; -import { ProjectRedirectDialogService } from '@shared/services'; import { CreateProjectDialogComponent } from './components'; import { MY_PROJECTS_TABS } from './constants'; diff --git a/src/app/features/preprints/components/browse-by-subjects/browse-by-subjects.component.ts b/src/app/features/preprints/components/browse-by-subjects/browse-by-subjects.component.ts index 574aadfb0..050e9426f 100644 --- a/src/app/features/preprints/components/browse-by-subjects/browse-by-subjects.component.ts +++ b/src/app/features/preprints/components/browse-by-subjects/browse-by-subjects.component.ts @@ -6,8 +6,8 @@ import { Skeleton } from 'primeng/skeleton'; import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core'; import { RouterLink } from '@angular/router'; -import { ResourceType } from '@shared/enums'; -import { SubjectModel } from '@shared/models'; +import { ResourceType } from '@osf/shared/enums'; +import { SubjectModel } from '@osf/shared/models'; @Component({ selector: 'osf-browse-by-subjects', 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 38cc0f0a8..4fd5d9246 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 @@ -10,11 +10,12 @@ import { Tag } from 'primeng/tag'; import { DatePipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, effect } from '@angular/core'; -import { CitationSectionComponent } from '@osf/features/preprints/components/preprint-details/citation-section/citation-section.component'; 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 { ResourceType } from '@osf/shared/enums'; +import { InterpolatePipe } from '@osf/shared/pipes'; +import { FetchSelectedSubjects, SubjectsSelectors } from '@osf/shared/stores'; + +import { CitationSectionComponent } from '../citation-section/citation-section.component'; @Component({ selector: 'osf-preprint-additional-info', 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 e1d9d0ce3..9b2aaae97 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 @@ -22,15 +22,15 @@ import { } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { ResourceType } from '@shared/enums'; -import { CitationStyle, CustomOption } from '@shared/models'; +import { ResourceType } from '@osf/shared/enums'; +import { CitationStyle, CustomOption } from '@osf/shared/models'; import { CitationsSelectors, GetCitationStyles, GetDefaultCitations, GetStyledCitation, UpdateCustomCitation, -} from '@shared/stores'; +} from '@osf/shared/stores'; @Component({ selector: 'osf-preprint-citation-section', 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 df6933c9c..70c91a23e 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 @@ -8,14 +8,20 @@ import { Skeleton } from 'primeng/skeleton'; import { ChangeDetectionStrategy, Component, computed, effect, input, OnDestroy, output } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { PreprintDoiSectionComponent } from '@osf/features/preprints/components/preprint-details/preprint-doi-section/preprint-doi-section.component'; import { ApplicabilityStatus, PreregLinkInfo } from '@osf/features/preprints/enums'; import { PreprintProviderDetails } from '@osf/features/preprints/models'; import { FetchPreprintById, PreprintSelectors } from '@osf/features/preprints/store/preprint'; -import { AffiliatedInstitutionsViewComponent, IconComponent, TruncatedTextComponent } from '@shared/components'; -import { ResourceType } from '@shared/enums'; -import { ContributorsSelectors, GetAllContributors, ResetContributorsState } from '@shared/stores'; -import { FetchResourceInstitutions, InstitutionsSelectors } from '@shared/stores/institutions'; +import { AffiliatedInstitutionsViewComponent, IconComponent, TruncatedTextComponent } from '@osf/shared/components'; +import { ResourceType } from '@osf/shared/enums'; +import { + ContributorsSelectors, + FetchResourceInstitutions, + GetAllContributors, + InstitutionsSelectors, + ResetContributorsState, +} from '@osf/shared/stores'; + +import { PreprintDoiSectionComponent } from '../preprint-doi-section/preprint-doi-section.component'; import { environment } from 'src/environments/environment'; diff --git a/src/app/features/preprints/components/preprint-details/make-decision/make-decision.component.ts b/src/app/features/preprints/components/preprint-details/make-decision/make-decision.component.ts index cd6d5b9fb..461b09d56 100644 --- a/src/app/features/preprints/components/preprint-details/make-decision/make-decision.component.ts +++ b/src/app/features/preprints/components/preprint-details/make-decision/make-decision.component.ts @@ -23,7 +23,7 @@ import { SubmitRequestsDecision, SubmitReviewsDecision, } from '@osf/features/preprints/store/preprint'; -import { StringOrNull } from '@shared/helpers'; +import { StringOrNull } from '@osf/shared/helpers'; @Component({ selector: 'osf-make-decision', diff --git a/src/app/features/preprints/components/preprint-details/moderation-status-banner/moderation-status-banner.component.ts b/src/app/features/preprints/components/preprint-details/moderation-status-banner/moderation-status-banner.component.ts index 11a401117..7541b3d0c 100644 --- a/src/app/features/preprints/components/preprint-details/moderation-status-banner/moderation-status-banner.component.ts +++ b/src/app/features/preprints/components/preprint-details/moderation-status-banner/moderation-status-banner.component.ts @@ -19,7 +19,7 @@ import { ProviderReviewsWorkflow, ReviewsState } from '@osf/features/preprints/e import { getPreprintDocumentType } from '@osf/features/preprints/helpers'; import { PreprintProviderDetails, PreprintRequest } from '@osf/features/preprints/models'; import { PreprintSelectors } from '@osf/features/preprints/store/preprint'; -import { IconComponent } from '@shared/components'; +import { IconComponent } from '@osf/shared/components'; import { environment } from 'src/environments/environment'; diff --git a/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.ts b/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.ts index 43bc28fcb..624b69995 100644 --- a/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.ts +++ b/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.ts @@ -13,9 +13,9 @@ import { DomSanitizer } from '@angular/platform-browser'; import { ProviderReviewsWorkflow } from '@osf/features/preprints/enums'; import { PreprintSelectors } from '@osf/features/preprints/store/preprint'; +import { LoadingSpinnerComponent } from '@osf/shared/components'; import { IS_LARGE, IS_MEDIUM } from '@osf/shared/helpers'; -import { LoadingSpinnerComponent } from '@shared/components'; -import { DataciteService } from '@shared/services/datacite/datacite.service'; +import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; @Component({ selector: 'osf-preprint-file-section', 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 a41200bee..5ff936236 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 @@ -10,20 +10,21 @@ import { Tag } from 'primeng/tag'; import { DatePipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, effect, input, OnDestroy, output } from '@angular/core'; -import { PreprintDoiSectionComponent } from '@osf/features/preprints/components/preprint-details/preprint-doi-section/preprint-doi-section.component'; import { ApplicabilityStatus, PreregLinkInfo } from '@osf/features/preprints/enums'; import { PreprintProviderDetails } from '@osf/features/preprints/models'; import { FetchPreprintById, PreprintSelectors } from '@osf/features/preprints/store/preprint'; -import { TruncatedTextComponent } from '@shared/components'; -import { ResourceType } from '@shared/enums'; -import { InterpolatePipe } from '@shared/pipes'; +import { TruncatedTextComponent } from '@osf/shared/components'; +import { ResourceType } from '@osf/shared/enums'; +import { InterpolatePipe } from '@osf/shared/pipes'; import { ContributorsSelectors, FetchSelectedSubjects, GetAllContributors, ResetContributorsState, SubjectsSelectors, -} from '@shared/stores'; +} from '@osf/shared/stores'; + +import { PreprintDoiSectionComponent } from '../preprint-doi-section/preprint-doi-section.component'; @Component({ selector: 'osf-preprint-tombstone', diff --git a/src/app/features/preprints/components/preprint-details/share-and-downlaod/share-and-download.component.ts b/src/app/features/preprints/components/preprint-details/share-and-downlaod/share-and-download.component.ts index c510f0400..641d9ce9f 100644 --- a/src/app/features/preprints/components/preprint-details/share-and-downlaod/share-and-download.component.ts +++ b/src/app/features/preprints/components/preprint-details/share-and-downlaod/share-and-download.component.ts @@ -11,10 +11,10 @@ import { toObservable } from '@angular/core/rxjs-interop'; import { PreprintProviderDetails } from '@osf/features/preprints/models'; import { PreprintSelectors } from '@osf/features/preprints/store/preprint'; -import { IconComponent } from '@shared/components'; -import { ShareableContent } from '@shared/models'; -import { SocialShareService } from '@shared/services'; -import { DataciteService } from '@shared/services/datacite/datacite.service'; +import { IconComponent } from '@osf/shared/components'; +import { ShareableContent } from '@osf/shared/models'; +import { SocialShareService } from '@osf/shared/services'; +import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; @Component({ selector: 'osf-preprint-share-and-download', diff --git a/src/app/features/preprints/components/preprint-details/status-banner/status-banner.component.ts b/src/app/features/preprints/components/preprint-details/status-banner/status-banner.component.ts index cb6ddfde5..770a697a2 100644 --- a/src/app/features/preprints/components/preprint-details/status-banner/status-banner.component.ts +++ b/src/app/features/preprints/components/preprint-details/status-banner/status-banner.component.ts @@ -22,7 +22,7 @@ import { import { ProviderReviewsWorkflow, ReviewsState } from '@osf/features/preprints/enums'; import { PreprintProviderDetails, PreprintRequestAction } from '@osf/features/preprints/models'; import { PreprintSelectors } from '@osf/features/preprints/store/preprint'; -import { IconComponent } from '@shared/components'; +import { IconComponent } from '@osf/shared/components'; @Component({ selector: 'osf-preprint-status-banner', diff --git a/src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.ts b/src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.ts index 2030a6d94..0792e8276 100644 --- a/src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.ts +++ b/src/app/features/preprints/components/preprint-details/withdraw-dialog/withdraw-dialog.component.ts @@ -16,8 +16,8 @@ import { ProviderReviewsWorkflow, ReviewsState } from '@osf/features/preprints/e import { getPreprintDocumentType } from '@osf/features/preprints/helpers'; import { Preprint, PreprintProviderDetails, PreprintWordGrammar } from '@osf/features/preprints/models'; import { WithdrawPreprint } from '@osf/features/preprints/store/preprint'; +import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants'; import { CustomValidators } from '@osf/shared/helpers'; -import { INPUT_VALIDATION_MESSAGES } from '@shared/constants'; import { environment } from 'src/environments/environment'; diff --git a/src/app/features/preprints/components/preprint-provider-hero/preprint-provider-hero.component.ts b/src/app/features/preprints/components/preprint-provider-hero/preprint-provider-hero.component.ts index 37218f65e..1de3486f3 100644 --- a/src/app/features/preprints/components/preprint-provider-hero/preprint-provider-hero.component.ts +++ b/src/app/features/preprints/components/preprint-provider-hero/preprint-provider-hero.component.ts @@ -9,10 +9,10 @@ import { ChangeDetectionStrategy, Component, inject, input, output } from '@angu import { FormControl } from '@angular/forms'; import { RouterLink } from '@angular/router'; -import { PreprintProviderDetails } from '@osf/features/preprints/models'; -import { SearchInputComponent } from '@shared/components'; -import { DecodeHtmlPipe } from '@shared/pipes'; +import { SearchInputComponent } from '@osf/shared/components'; +import { DecodeHtmlPipe } from '@osf/shared/pipes'; +import { PreprintProviderDetails } from '../../models'; import { PreprintsHelpDialogComponent } from '../preprints-help-dialog/preprints-help-dialog.component'; @Component({ diff --git a/src/app/features/preprints/components/stepper/author-assertion-step/array-input/array-input.component.ts b/src/app/features/preprints/components/stepper/author-assertion-step/array-input/array-input.component.ts index 327841ee1..23286ef6d 100644 --- a/src/app/features/preprints/components/stepper/author-assertion-step/array-input/array-input.component.ts +++ b/src/app/features/preprints/components/stepper/author-assertion-step/array-input/array-input.component.ts @@ -5,7 +5,7 @@ import { Button } from 'primeng/button'; import { ChangeDetectionStrategy, Component, input } from '@angular/core'; import { FormArray, FormControl, ReactiveFormsModule, ValidatorFn } from '@angular/forms'; -import { TextInputComponent } from '@shared/components'; +import { TextInputComponent } from '@osf/shared/components'; @Component({ selector: 'osf-array-input', diff --git a/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.ts b/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.ts index caa73630d..8bb9fdd0a 100644 --- a/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.ts +++ b/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.ts @@ -23,16 +23,16 @@ import { Validators, } from '@angular/forms'; -import { ArrayInputComponent } from '@osf/features/preprints/components/stepper/author-assertion-step/array-input/array-input.component'; import { formInputLimits, preregLinksOptions } from '@osf/features/preprints/constants'; import { ApplicabilityStatus, PreregLinkInfo } from '@osf/features/preprints/enums'; import { Preprint } from '@osf/features/preprints/models'; import { PreprintStepperSelectors, UpdatePreprint } from '@osf/features/preprints/store/preprint-stepper'; -import { CustomValidators, findChangedFields } from '@osf/shared/helpers'; -import { FormSelectComponent } from '@shared/components'; -import { INPUT_VALIDATION_MESSAGES } from '@shared/constants'; -import { StringOrNull } from '@shared/helpers'; -import { CustomConfirmationService, ToastService } from '@shared/services'; +import { FormSelectComponent } from '@osf/shared/components'; +import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants'; +import { CustomValidators, findChangedFields, StringOrNull } from '@osf/shared/helpers'; +import { CustomConfirmationService, ToastService } from '@osf/shared/services'; + +import { ArrayInputComponent } from './array-input/array-input.component'; @Component({ selector: 'osf-author-assertions-step', diff --git a/src/app/features/preprints/components/stepper/file-step/file-step.component.ts b/src/app/features/preprints/components/stepper/file-step/file-step.component.ts index 7717beea2..fd472ee53 100644 --- a/src/app/features/preprints/components/stepper/file-step/file-step.component.ts +++ b/src/app/features/preprints/components/stepper/file-step/file-step.component.ts @@ -26,6 +26,7 @@ import { import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormControl, ReactiveFormsModule } from '@angular/forms'; +import { SetCurrentFolder } from '@osf/features/files/store'; import { PreprintFileSource } from '@osf/features/preprints/enums'; import { PreprintProviderDetails } from '@osf/features/preprints/models'; import { @@ -36,14 +37,13 @@ import { FetchProjectFilesByLink, PreprintStepperSelectors, ReuploadFile, - SetCurrentFolder, SetSelectedPreprintFileSource, UploadFile, } from '@osf/features/preprints/store/preprint-stepper'; -import { FilesTreeComponent, IconComponent } from '@shared/components'; -import { StringOrNull } from '@shared/helpers'; -import { FilesTreeActions, OsfFile } from '@shared/models'; -import { CustomConfirmationService, ToastService } from '@shared/services'; +import { FilesTreeComponent, IconComponent } from '@osf/shared/components'; +import { StringOrNull } from '@osf/shared/helpers'; +import { FilesTreeActions, OsfFile } from '@osf/shared/models'; +import { CustomConfirmationService, ToastService } from '@osf/shared/services'; @Component({ selector: 'osf-file-step', diff --git a/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.ts b/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.ts index 72fbd758f..cc99c738d 100644 --- a/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.ts +++ b/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.ts @@ -21,11 +21,11 @@ import { SaveLicense, UpdatePreprint, } from '@osf/features/preprints/store/preprint-stepper'; +import { IconComponent, LicenseComponent, TagsInputComponent, TextInputComponent } from '@osf/shared/components'; +import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants'; import { findChangedFields } from '@osf/shared/helpers'; -import { IconComponent, LicenseComponent, TagsInputComponent, TextInputComponent } from '@shared/components'; -import { INPUT_VALIDATION_MESSAGES } from '@shared/constants'; -import { LicenseModel, LicenseOptions } from '@shared/models'; -import { CustomConfirmationService, ToastService } from '@shared/services'; +import { LicenseModel, LicenseOptions } from '@osf/shared/models'; +import { CustomConfirmationService, ToastService } from '@osf/shared/services'; import { ContributorsComponent } from './contributors/contributors.component'; import { PreprintsAffiliatedInstitutionsComponent } from './preprints-affiliated-institutions/preprints-affiliated-institutions.component'; diff --git a/src/app/features/preprints/components/stepper/metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.ts b/src/app/features/preprints/components/stepper/metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.ts index 5941b7ca4..cf8755914 100644 --- a/src/app/features/preprints/components/stepper/metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.ts +++ b/src/app/features/preprints/components/stepper/metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.ts @@ -7,15 +7,15 @@ import { Card } from 'primeng/card'; import { ChangeDetectionStrategy, Component, effect, input, OnInit, signal } from '@angular/core'; import { PreprintProviderDetails } from '@osf/features/preprints/models'; -import { AffiliatedInstitutionSelectComponent } from '@shared/components'; -import { ResourceType } from '@shared/enums'; -import { Institution } from '@shared/models'; +import { AffiliatedInstitutionSelectComponent } from '@osf/shared/components'; +import { ResourceType } from '@osf/shared/enums'; +import { Institution } from '@osf/shared/models'; import { FetchResourceInstitutions, FetchUserInstitutions, InstitutionsSelectors, UpdateResourceInstitutions, -} from '@shared/stores/institutions'; +} from '@osf/shared/stores'; @Component({ selector: 'osf-preprints-affiliated-institutions', diff --git a/src/app/features/preprints/components/stepper/metadata-step/preprints-subjects/preprints-subjects.component.ts b/src/app/features/preprints/components/stepper/metadata-step/preprints-subjects/preprints-subjects.component.ts index a88ca063c..b7d18cdbe 100644 --- a/src/app/features/preprints/components/stepper/metadata-step/preprints-subjects/preprints-subjects.component.ts +++ b/src/app/features/preprints/components/stepper/metadata-step/preprints-subjects/preprints-subjects.component.ts @@ -10,6 +10,7 @@ import { FormControl } from '@angular/forms'; import { PreprintStepperSelectors } from '@osf/features/preprints/store/preprint-stepper'; import { SubjectsComponent } from '@osf/shared/components'; +import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants'; import { ResourceType } from '@osf/shared/enums'; import { SubjectModel } from '@osf/shared/models'; import { @@ -19,7 +20,6 @@ import { SubjectsSelectors, UpdateResourceSubjects, } from '@osf/shared/stores'; -import { INPUT_VALIDATION_MESSAGES } from '@shared/constants'; @Component({ selector: 'osf-preprints-subjects', 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 bb01c7d70..fc5a83e20 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 @@ -19,12 +19,18 @@ import { PreprintStepperSelectors, SubmitPreprint, } from '@osf/features/preprints/store/preprint-stepper'; -import { AffiliatedInstitutionsViewComponent, TruncatedTextComponent } from '@shared/components'; -import { ResourceType } from '@shared/enums'; -import { InterpolatePipe } from '@shared/pipes'; -import { ToastService } from '@shared/services'; -import { ContributorsSelectors, FetchSelectedSubjects, GetAllContributors, SubjectsSelectors } from '@shared/stores'; -import { FetchResourceInstitutions, InstitutionsSelectors } from '@shared/stores/institutions'; +import { AffiliatedInstitutionsViewComponent, TruncatedTextComponent } from '@osf/shared/components'; +import { ResourceType } from '@osf/shared/enums'; +import { InterpolatePipe } from '@osf/shared/pipes'; +import { ToastService } from '@osf/shared/services'; +import { + ContributorsSelectors, + FetchResourceInstitutions, + FetchSelectedSubjects, + GetAllContributors, + InstitutionsSelectors, + SubjectsSelectors, +} from '@osf/shared/stores'; @Component({ selector: 'osf-review-step', diff --git a/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.ts b/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.ts index 428890a4e..45285848a 100644 --- a/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.ts +++ b/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.ts @@ -34,12 +34,11 @@ import { FetchPreprintProject, PreprintStepperSelectors, } from '@osf/features/preprints/store/preprint-stepper'; -import { CustomValidators } from '@osf/shared/helpers'; -import { AddProjectFormComponent } from '@shared/components'; -import { ProjectFormControls } from '@shared/enums'; -import { StringOrNull } from '@shared/helpers'; -import { ProjectForm } from '@shared/models'; -import { CustomConfirmationService, ToastService } from '@shared/services'; +import { AddProjectFormComponent } from '@osf/shared/components'; +import { ProjectFormControls } from '@osf/shared/enums'; +import { CustomValidators, StringOrNull } from '@osf/shared/helpers'; +import { ProjectForm } from '@osf/shared/models'; +import { CustomConfirmationService, ToastService } from '@osf/shared/services'; @Component({ selector: 'osf-supplements-step', diff --git a/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.ts b/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.ts index 86bd75dc3..d27ef15d2 100644 --- a/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.ts +++ b/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.ts @@ -19,10 +19,10 @@ import { PreprintStepperSelectors, UpdatePreprint, } from '@osf/features/preprints/store/preprint-stepper'; +import { TextInputComponent } from '@osf/shared/components'; +import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants'; import { CustomValidators } from '@osf/shared/helpers'; -import { TextInputComponent } from '@shared/components'; -import { INPUT_VALIDATION_MESSAGES } from '@shared/constants'; -import { ToastService } from '@shared/services'; +import { ToastService } from '@osf/shared/services'; @Component({ selector: 'osf-title-and-abstract-step', diff --git a/src/app/features/preprints/pages/create-new-version/create-new-version.component.ts b/src/app/features/preprints/pages/create-new-version/create-new-version.component.ts index c56f1c596..bfbdc76c0 100644 --- a/src/app/features/preprints/pages/create-new-version/create-new-version.component.ts +++ b/src/app/features/preprints/pages/create-new-version/create-new-version.component.ts @@ -20,20 +20,18 @@ import { import { toSignal } from '@angular/core/rxjs-interop'; import { ActivatedRoute, Router } from '@angular/router'; -import { FileStepComponent, ReviewStepComponent } from '@osf/features/preprints/components'; -import { createNewVersionStepsConst } from '@osf/features/preprints/constants'; -import { PreprintSteps } from '@osf/features/preprints/enums'; -import { GetPreprintProviderById, PreprintProvidersSelectors } from '@osf/features/preprints/store/preprint-providers'; -import { - FetchPreprintById, - PreprintStepperSelectors, - ResetState, - SetSelectedPreprintProviderId, -} from '@osf/features/preprints/store/preprint-stepper'; +import { ResetState } from '@osf/features/files/store'; +import { StepperComponent } from '@osf/shared/components'; import { BrowserTabHelper, HeaderStyleHelper, IS_WEB } from '@osf/shared/helpers'; -import { StepperComponent } from '@shared/components'; -import { CanDeactivateComponent, StepOption } from '@shared/models'; -import { BrandService } from '@shared/services'; +import { CanDeactivateComponent, StepOption } from '@osf/shared/models'; +import { BrandService } from '@osf/shared/services'; + +import { FileStepComponent, ReviewStepComponent } from '../../components'; +import { createNewVersionStepsConst } from '../../constants'; +import { PreprintSteps } from '../../enums'; +import { FetchPreprintById } from '../../store/preprint'; +import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store/preprint-providers'; +import { PreprintStepperSelectors, SetSelectedPreprintProviderId } from '../../store/preprint-stepper'; @Component({ selector: 'osf-create-new-version', diff --git a/src/app/features/preprints/pages/landing/preprints-landing.component.ts b/src/app/features/preprints/pages/landing/preprints-landing.component.ts index 4f446cee7..6b63516f0 100644 --- a/src/app/features/preprints/pages/landing/preprints-landing.component.ts +++ b/src/app/features/preprints/pages/landing/preprints-landing.component.ts @@ -10,20 +10,17 @@ import { ChangeDetectionStrategy, Component, effect, HostBinding, inject, OnDest import { FormControl } from '@angular/forms'; import { Router, RouterLink } from '@angular/router'; -import { - AdvisoryBoardComponent, - BrowseBySubjectsComponent, - PreprintServicesComponent, -} from '@osf/features/preprints/components'; +import { SearchInputComponent } from '@osf/shared/components'; +import { ResourceType } from '@osf/shared/enums'; +import { BrandService } from '@osf/shared/services'; + +import { AdvisoryBoardComponent, BrowseBySubjectsComponent, PreprintServicesComponent } from '../../components'; import { GetHighlightedSubjectsByProviderId, GetPreprintProviderById, GetPreprintProvidersToAdvertise, PreprintProvidersSelectors, -} from '@osf/features/preprints/store/preprint-providers'; -import { SearchInputComponent } from '@shared/components'; -import { ResourceType } from '@shared/enums'; -import { BrandService } from '@shared/services'; +} from '../../store/preprint-providers'; import { environment } from 'src/environments/environment'; 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 c0a186b1e..ca73ff985 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 @@ -23,6 +23,13 @@ import { takeUntilDestroyed, toObservable, toSignal } from '@angular/core/rxjs-i import { ActivatedRoute, Router } from '@angular/router'; import { UserSelectors } from '@core/store/user'; +import { ResetState } from '@osf/features/files/store'; +import { ReviewPermissions, UserPermissions } from '@osf/shared/enums'; +import { IS_MEDIUM, pathJoin } from '@osf/shared/helpers'; +import { MetaTagsService } from '@osf/shared/services'; +import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; +import { ContributorsSelectors } from '@osf/shared/stores'; + import { AdditionalInfoComponent, GeneralInformationComponent, @@ -33,25 +40,18 @@ import { ShareAndDownloadComponent, StatusBannerComponent, WithdrawDialogComponent, -} from '@osf/features/preprints/components'; -import { PreprintRequestMachineState, ProviderReviewsWorkflow, ReviewsState } from '@osf/features/preprints/enums'; +} from '../../components'; +import { PreprintWarningBannerComponent } from '../../components/preprint-details/preprint-warning-banner/preprint-warning-banner.component'; +import { PreprintRequestMachineState, ProviderReviewsWorkflow, ReviewsState } from '../../enums'; import { FetchPreprintById, FetchPreprintRequestActions, FetchPreprintRequests, FetchPreprintReviewActions, PreprintSelectors, - ResetState, -} from '@osf/features/preprints/store/preprint'; -import { GetPreprintProviderById, PreprintProvidersSelectors } from '@osf/features/preprints/store/preprint-providers'; -import { CreateNewVersion, PreprintStepperSelectors } from '@osf/features/preprints/store/preprint-stepper'; -import { IS_MEDIUM, pathJoin } from '@osf/shared/helpers'; -import { ReviewPermissions, UserPermissions } from '@shared/enums'; -import { MetaTagsService } from '@shared/services'; -import { DataciteService } from '@shared/services/datacite/datacite.service'; -import { ContributorsSelectors } from '@shared/stores'; - -import { PreprintWarningBannerComponent } from '../../components/preprint-details/preprint-warning-banner/preprint-warning-banner.component'; +} from '../../store/preprint'; +import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store/preprint-providers'; +import { CreateNewVersion, PreprintStepperSelectors } from '../../store/preprint-stepper'; import { environment } from 'src/environments/environment'; diff --git a/src/app/features/preprints/pages/preprint-provider-discover/preprint-provider-discover.component.ts b/src/app/features/preprints/pages/preprint-provider-discover/preprint-provider-discover.component.ts index 2f156ab31..4f989d781 100644 --- a/src/app/features/preprints/pages/preprint-provider-discover/preprint-provider-discover.component.ts +++ b/src/app/features/preprints/pages/preprint-provider-discover/preprint-provider-discover.component.ts @@ -4,13 +4,13 @@ import { ChangeDetectionStrategy, Component, HostBinding, inject, OnDestroy, OnI import { FormControl } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; -import { PreprintProviderHeroComponent } from '@osf/features/preprints/components'; +import { GlobalSearchComponent } from '@osf/shared/components'; +import { ResourceType } from '@osf/shared/enums'; import { BrowserTabHelper, HeaderStyleHelper } from '@osf/shared/helpers'; import { BrandService } from '@osf/shared/services'; -import { GlobalSearchComponent } from '@shared/components'; -import { ResourceType } from '@shared/enums'; -import { SetDefaultFilterValue, SetResourceType } from '@shared/stores/global-search'; +import { SetDefaultFilterValue, SetResourceType } from '@osf/shared/stores/global-search'; +import { PreprintProviderHeroComponent } from '../../components'; import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store/preprint-providers'; @Component({ diff --git a/src/app/features/preprints/pages/preprint-provider-overview/preprint-provider-overview.component.ts b/src/app/features/preprints/pages/preprint-provider-overview/preprint-provider-overview.component.ts index a1edc0a96..d9bc5171f 100644 --- a/src/app/features/preprints/pages/preprint-provider-overview/preprint-provider-overview.component.ts +++ b/src/app/features/preprints/pages/preprint-provider-overview/preprint-provider-overview.component.ts @@ -6,19 +6,20 @@ import { ChangeDetectionStrategy, Component, effect, inject, OnDestroy, OnInit } import { toSignal } from '@angular/core/rxjs-interop'; import { ActivatedRoute, Router } from '@angular/router'; +import { BrowserTabHelper, HeaderStyleHelper } from '@osf/shared/helpers'; +import { BrandService } from '@osf/shared/services'; + import { AdvisoryBoardComponent, BrowseBySubjectsComponent, PreprintProviderFooterComponent, PreprintProviderHeroComponent, -} from '@osf/features/preprints/components'; +} from '../../components'; import { GetHighlightedSubjectsByProviderId, GetPreprintProviderById, PreprintProvidersSelectors, -} from '@osf/features/preprints/store/preprint-providers'; -import { BrowserTabHelper, HeaderStyleHelper } from '@osf/shared/helpers'; -import { BrandService } from '@shared/services'; +} from '../../store/preprint-providers'; @Component({ selector: 'osf-provider-overview', diff --git a/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.ts b/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.ts index ae3ea0719..55ee0b13a 100644 --- a/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.ts +++ b/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.ts @@ -11,17 +11,12 @@ import { NgClass } from '@angular/common'; import { ChangeDetectionStrategy, Component, HostBinding, OnInit } from '@angular/core'; import { RouterLink } from '@angular/router'; -import { PreprintProviderShortInfo } from '@osf/features/preprints/models'; -import { - GetPreprintProvidersAllowingSubmissions, - PreprintProvidersSelectors, -} from '@osf/features/preprints/store/preprint-providers'; -import { - PreprintStepperSelectors, - SetSelectedPreprintProviderId, -} from '@osf/features/preprints/store/preprint-stepper'; -import { SubHeaderComponent } from '@shared/components'; -import { DecodeHtmlPipe } from '@shared/pipes'; +import { SubHeaderComponent } from '@osf/shared/components'; +import { DecodeHtmlPipe } from '@osf/shared/pipes'; + +import { PreprintProviderShortInfo } from '../../models'; +import { GetPreprintProvidersAllowingSubmissions, PreprintProvidersSelectors } from '../../store/preprint-providers'; +import { PreprintStepperSelectors, SetSelectedPreprintProviderId } from '../../store/preprint-stepper'; @Component({ selector: 'osf-select-preprint-service', diff --git a/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts b/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts index b0fbc834d..18008ef53 100644 --- a/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts +++ b/src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts @@ -21,6 +21,12 @@ import { import { toSignal } from '@angular/core/rxjs-interop'; import { ActivatedRoute } from '@angular/router'; +import { ResetState } from '@osf/features/files/store'; +import { StepperComponent } from '@osf/shared/components'; +import { BrowserTabHelper, HeaderStyleHelper, IS_WEB } from '@osf/shared/helpers'; +import { CanDeactivateComponent, StepOption } from '@osf/shared/models'; +import { BrandService } from '@osf/shared/services'; + import { AuthorAssertionsStepComponent, FileStepComponent, @@ -28,20 +34,11 @@ import { ReviewStepComponent, SupplementsStepComponent, TitleAndAbstractStepComponent, -} from '@osf/features/preprints/components'; -import { submitPreprintSteps } from '@osf/features/preprints/constants'; -import { PreprintSteps } from '@osf/features/preprints/enums'; -import { GetPreprintProviderById, PreprintProvidersSelectors } from '@osf/features/preprints/store/preprint-providers'; -import { - DeletePreprint, - PreprintStepperSelectors, - ResetState, - SetSelectedPreprintProviderId, -} from '@osf/features/preprints/store/preprint-stepper'; -import { BrowserTabHelper, HeaderStyleHelper, IS_WEB } from '@osf/shared/helpers'; -import { CanDeactivateComponent, StepOption } from '@osf/shared/models'; -import { StepperComponent } from '@shared/components'; -import { BrandService } from '@shared/services'; +} from '../../components'; +import { submitPreprintSteps } from '../../constants'; +import { PreprintSteps } from '../../enums'; +import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store/preprint-providers'; +import { DeletePreprint, PreprintStepperSelectors, SetSelectedPreprintProviderId } from '../../store/preprint-stepper'; @Component({ selector: 'osf-submit-preprint-stepper', diff --git a/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts b/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts index 256f77457..86c4d1c07 100644 --- a/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts +++ b/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts @@ -21,26 +21,24 @@ import { import { toSignal } from '@angular/core/rxjs-interop'; import { ActivatedRoute } from '@angular/router'; +import { ResetState } from '@osf/features/files/store'; +import { StepperComponent } from '@osf/shared/components'; +import { BrowserTabHelper, HeaderStyleHelper, IS_WEB } from '@osf/shared/helpers'; +import { CanDeactivateComponent, StepOption } from '@osf/shared/models'; +import { BrandService } from '@osf/shared/services'; + import { AuthorAssertionsStepComponent, MetadataStepComponent, ReviewStepComponent, SupplementsStepComponent, TitleAndAbstractStepComponent, -} from '@osf/features/preprints/components'; -import { updatePreprintSteps } from '@osf/features/preprints/constants'; -import { PreprintSteps } from '@osf/features/preprints/enums'; -import { GetPreprintProviderById, PreprintProvidersSelectors } from '@osf/features/preprints/store/preprint-providers'; -import { - FetchPreprintById, - PreprintStepperSelectors, - ResetState, - SetSelectedPreprintProviderId, -} from '@osf/features/preprints/store/preprint-stepper'; -import { BrowserTabHelper, HeaderStyleHelper, IS_WEB } from '@osf/shared/helpers'; -import { StepperComponent } from '@shared/components'; -import { CanDeactivateComponent, StepOption } from '@shared/models'; -import { BrandService } from '@shared/services'; +} from '../../components'; +import { updatePreprintSteps } from '../../constants'; +import { PreprintSteps } from '../../enums'; +import { FetchPreprintById } from '../../store/preprint'; +import { GetPreprintProviderById, PreprintProvidersSelectors } from '../../store/preprint-providers'; +import { PreprintStepperSelectors, SetSelectedPreprintProviderId } from '../../store/preprint-stepper'; @Component({ selector: 'osf-update-preprint-stepper', diff --git a/src/app/features/project/addons/addons.component.ts b/src/app/features/project/addons/addons.component.ts index 43656c346..cf9ba26b5 100644 --- a/src/app/features/project/addons/addons.component.ts +++ b/src/app/features/project/addons/addons.component.ts @@ -20,11 +20,16 @@ import { FormControl, FormsModule } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { UserSelectors } from '@core/store/user'; +import { + LoadingSpinnerComponent, + SearchInputComponent, + SelectComponent, + SubHeaderComponent, +} from '@osf/shared/components'; +import { AddonCardListComponent } from '@osf/shared/components/addons'; +import { ADDON_CATEGORY_OPTIONS, ADDON_TAB_OPTIONS } from '@osf/shared/constants'; +import { AddonCategory, AddonTabValue } from '@osf/shared/enums'; import { Primitive } from '@osf/shared/helpers'; -import { LoadingSpinnerComponent, SearchInputComponent, SelectComponent, SubHeaderComponent } from '@shared/components'; -import { AddonCardListComponent } from '@shared/components/addons'; -import { ADDON_CATEGORY_OPTIONS, ADDON_TAB_OPTIONS } from '@shared/constants'; -import { AddonCategory, AddonTabValue } from '@shared/enums'; import { AddonsSelectors, ClearConfiguredAddons, @@ -37,7 +42,7 @@ import { GetConfiguredStorageAddons, GetLinkAddons, GetStorageAddons, -} from '@shared/stores/addons'; +} from '@osf/shared/stores'; @Component({ selector: 'osf-addons', diff --git a/src/app/features/project/addons/components/configure-addon/configure-addon.component.ts b/src/app/features/project/addons/components/configure-addon/configure-addon.component.ts index 52b57b7fd..8a7456bf2 100644 --- a/src/app/features/project/addons/components/configure-addon/configure-addon.component.ts +++ b/src/app/features/project/addons/components/configure-addon/configure-addon.component.ts @@ -21,20 +21,26 @@ import { import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; -import { OperationNames } from '@osf/features/project/addons/enums'; +import { SubHeaderComponent } from '@osf/shared/components'; +import { StorageItemSelectorComponent } from '@osf/shared/components/addons'; +import { AddonServiceNames, AddonType } from '@osf/shared/enums'; import { getAddonTypeString } from '@osf/shared/helpers'; -import { SubHeaderComponent } from '@shared/components'; -import { StorageItemSelectorComponent } from '@shared/components/addons'; -import { AddonServiceNames, AddonType } from '@shared/enums'; -import { AddonModel, ConfiguredAddonModel } from '@shared/models'; -import { AddonDialogService, AddonFormService, AddonOperationInvocationService, ToastService } from '@shared/services'; +import { AddonModel, ConfiguredAddonModel } from '@osf/shared/models'; +import { + AddonDialogService, + AddonFormService, + AddonOperationInvocationService, + ToastService, +} from '@osf/shared/services'; import { AddonsSelectors, ClearOperationInvocations, CreateAddonOperationInvocation, GetLinkAddons, UpdateConfiguredAddon, -} from '@shared/stores/addons'; +} from '@osf/shared/stores'; + +import { OperationNames } from '../../enums'; import { environment } from 'src/environments/environment'; diff --git a/src/app/features/project/addons/components/confirm-account-connection-modal/confirm-account-connection-modal.component.ts b/src/app/features/project/addons/components/confirm-account-connection-modal/confirm-account-connection-modal.component.ts index 0075b0c16..51c65ba09 100644 --- a/src/app/features/project/addons/components/confirm-account-connection-modal/confirm-account-connection-modal.component.ts +++ b/src/app/features/project/addons/components/confirm-account-connection-modal/confirm-account-connection-modal.component.ts @@ -8,9 +8,10 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; -import { OperationNames } from '@osf/features/project/addons/enums'; -import { AddonOperationInvocationService } from '@shared/services'; -import { AddonsSelectors, CreateAddonOperationInvocation } from '@shared/stores/addons'; +import { AddonOperationInvocationService } from '@osf/shared/services'; +import { AddonsSelectors, CreateAddonOperationInvocation } from '@osf/shared/stores'; + +import { OperationNames } from '../../enums'; @Component({ selector: 'osf-confirm-account-connection-modal', diff --git a/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts b/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts index 9de274a63..2c0468ce6 100644 --- a/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts +++ b/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts @@ -13,26 +13,22 @@ import { Component, computed, DestroyRef, inject, signal, viewChild } from '@ang import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; -import { OperationNames } from '@osf/features/project/addons/enums'; -import { AddonConfigMap } from '@osf/features/project/addons/utils'; import { SubHeaderComponent } from '@osf/shared/components'; -import { AddonType, ProjectAddonsStepperValue } from '@osf/shared/enums'; -import { getAddonTypeString } from '@osf/shared/helpers'; -import { AuthorizedAccountModel } from '@osf/shared/models/addons/authorized-account.model'; import { AddonSetupAccountFormComponent, AddonTermsComponent, StorageItemSelectorComponent, -} from '@shared/components/addons'; -import { AddonServiceNames } from '@shared/enums'; -import { AddonModel, AddonTerm, AuthorizedAddonRequestJsonApi } from '@shared/models'; +} from '@osf/shared/components/addons'; +import { AddonServiceNames, AddonType, ProjectAddonsStepperValue } from '@osf/shared/enums'; +import { getAddonTypeString } from '@osf/shared/helpers'; +import { AddonModel, AddonTerm, AuthorizedAccountModel, AuthorizedAddonRequestJsonApi } from '@osf/shared/models'; import { AddonDialogService, AddonFormService, AddonOAuthService, AddonOperationInvocationService, ToastService, -} from '@shared/services'; +} from '@osf/shared/services'; import { AddonsSelectors, CreateAddonOperationInvocation, @@ -43,7 +39,10 @@ import { GetAuthorizedStorageAddons, UpdateAuthorizedAddon, UpdateConfiguredAddon, -} from '@shared/stores/addons'; +} from '@osf/shared/stores'; + +import { OperationNames } from '../../enums'; +import { AddonConfigMap } from '../../utils'; import { environment } from 'src/environments/environment'; diff --git a/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts b/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts index ad0cc5ead..0227dc41d 100644 --- a/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts +++ b/src/app/features/project/addons/components/disconnect-addon-modal/disconnect-addon-modal.component.ts @@ -7,9 +7,9 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core'; +import { AddonType } from '@osf/shared/enums'; import { getAddonTypeString } from '@osf/shared/helpers'; -import { AddonType } from '@shared/enums'; -import { AddonsSelectors, DeleteConfiguredAddon } from '@shared/stores/addons'; +import { AddonsSelectors, DeleteConfiguredAddon } from '@osf/shared/stores'; @Component({ selector: 'osf-disconnect-addon-modal', 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 ea280a770..094f59858 100644 --- a/src/app/features/project/linked-services/linked-services.component.ts +++ b/src/app/features/project/linked-services/linked-services.component.ts @@ -8,10 +8,10 @@ import { ChangeDetectionStrategy, Component, computed, effect, inject, OnInit } import { ActivatedRoute, RouterLink } from '@angular/router'; 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 { LoadingSpinnerComponent, SubHeaderComponent } from '@osf/shared/components'; +import { AddonServiceNames } from '@osf/shared/enums'; +import { convertCamelCaseToNormal } from '@osf/shared/helpers'; +import { AddonsSelectors, GetAddonsResourceReference, GetConfiguredLinkAddons } from '@osf/shared/stores'; @Component({ selector: 'osf-linked-services', diff --git a/src/app/features/project/overview/components/files-widget/files-widget.component.ts b/src/app/features/project/overview/components/files-widget/files-widget.component.ts index 5007345db..fea8716e8 100644 --- a/src/app/features/project/overview/components/files-widget/files-widget.component.ts +++ b/src/app/features/project/overview/components/files-widget/files-widget.component.ts @@ -37,9 +37,9 @@ import { FilesTreeActions, NodeShortInfoModel, OsfFile, + Project, SelectOption, } from '@osf/shared/models'; -import { Project } from '@osf/shared/models/projects'; import { environment } from 'src/environments/environment'; 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 5815ee8af..44765680b 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 @@ -18,6 +18,7 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { IconComponent } from '@osf/shared/components'; import { ResourceType } from '@osf/shared/enums'; +import { hasViewOnlyParam } from '@osf/shared/helpers'; import { ShareableContent, ToolbarResource } from '@osf/shared/models'; import { FileSizePipe } from '@osf/shared/pipes'; import { SocialShareService, ToastService } from '@osf/shared/services'; @@ -28,7 +29,6 @@ import { MyResourcesSelectors, RemoveResourceFromBookmarks, } from '@osf/shared/stores'; -import { hasViewOnlyParam } from '@shared/helpers'; import { SocialsShareActionItem } from '../../models'; import { DuplicateDialogComponent } from '../duplicate-dialog/duplicate-dialog.component'; diff --git a/src/app/features/project/overview/project-overview.component.ts b/src/app/features/project/overview/project-overview.component.ts index e26c4dd13..34365ba9f 100644 --- a/src/app/features/project/overview/project-overview.component.ts +++ b/src/app/features/project/overview/project-overview.component.ts @@ -29,10 +29,18 @@ import { CollectionsModerationSelectors, GetSubmissionsReviewActions, } from '@osf/features/moderation/store/collections-moderation'; +import { + LoadingSpinnerComponent, + MakeDecisionDialogComponent, + ResourceMetadataComponent, + SubHeaderComponent, + ViewOnlyLinkMessageComponent, +} from '@osf/shared/components'; import { Mode, ResourceType, UserPermissions } from '@osf/shared/enums'; import { hasViewOnlyParam, IS_XSMALL } from '@osf/shared/helpers'; import { MapProjectOverview } from '@osf/shared/mappers'; import { MetaTagsService, ToastService } from '@osf/shared/services'; +import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; import { ClearCollections, ClearWiki, @@ -48,14 +56,6 @@ import { SubjectsSelectors, } from '@osf/shared/stores'; import { GetActivityLogs } from '@osf/shared/stores/activity-logs'; -import { - LoadingSpinnerComponent, - MakeDecisionDialogComponent, - ResourceMetadataComponent, - SubHeaderComponent, - ViewOnlyLinkMessageComponent, -} from '@shared/components'; -import { DataciteService } from '@shared/services/datacite/datacite.service'; import { FilesWidgetComponent, diff --git a/src/app/features/project/wiki/wiki.component.ts b/src/app/features/project/wiki/wiki.component.ts index 35e590ff2..3d900481e 100644 --- a/src/app/features/project/wiki/wiki.component.ts +++ b/src/app/features/project/wiki/wiki.component.ts @@ -11,7 +11,7 @@ import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/c import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; import { ActivatedRoute, Router } from '@angular/router'; -import { SubHeaderComponent } from '@osf/shared/components'; +import { SubHeaderComponent, ViewOnlyLinkMessageComponent } from '@osf/shared/components'; import { CompareSectionComponent, EditSectionComponent, @@ -38,7 +38,6 @@ import { UpdateWikiPreviewContent, WikiSelectors, } from '@osf/shared/stores'; -import { ViewOnlyLinkMessageComponent } from '@shared/components/view-only-link-message/view-only-link-message.component'; @Component({ selector: 'osf-wiki', diff --git a/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.ts b/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.ts index beefe4e03..67c9c3999 100644 --- a/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.ts +++ b/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.ts @@ -10,11 +10,12 @@ import { FormControl } from '@angular/forms'; import { Router } from '@angular/router'; import { PreprintsHelpDialogComponent } from '@osf/features/preprints/components'; -import { RegistryProviderDetails } from '@osf/features/registries/models/registry-provider.model'; +import { SearchInputComponent } from '@osf/shared/components'; import { HeaderStyleHelper } from '@osf/shared/helpers'; -import { SearchInputComponent } from '@shared/components'; -import { DecodeHtmlPipe } from '@shared/pipes'; -import { BrandService } from '@shared/services'; +import { DecodeHtmlPipe } from '@osf/shared/pipes'; +import { BrandService } from '@osf/shared/services'; + +import { RegistryProviderDetails } from '../../models'; @Component({ selector: 'osf-registry-provider-hero', diff --git a/src/app/features/registries/components/registry-services/registry-services.component.ts b/src/app/features/registries/components/registry-services/registry-services.component.ts index c7c66a518..be545d21f 100644 --- a/src/app/features/registries/components/registry-services/registry-services.component.ts +++ b/src/app/features/registries/components/registry-services/registry-services.component.ts @@ -5,7 +5,7 @@ import { Button } from 'primeng/button'; import { ChangeDetectionStrategy, Component } from '@angular/core'; import { RouterLink } from '@angular/router'; -import { RegistryServiceIcons } from '@shared/constants'; +import { RegistryServiceIcons } from '@osf/shared/constants'; @Component({ selector: 'osf-registry-services', diff --git a/src/app/features/registry/components/registry-revisions/registry-revisions.component.ts b/src/app/features/registry/components/registry-revisions/registry-revisions.component.ts index a028e61f3..57ea4677c 100644 --- a/src/app/features/registry/components/registry-revisions/registry-revisions.component.ts +++ b/src/app/features/registry/components/registry-revisions/registry-revisions.component.ts @@ -6,9 +6,9 @@ import { Button } from 'primeng/button'; import { ChangeDetectionStrategy, Component, computed, HostBinding, input, output } from '@angular/core'; import { RouterLink } from '@angular/router'; -import { RegistryOverview } from '@osf/features/registry/models'; -import { RegistrationReviewStates } from '@osf/shared/enums'; -import { RevisionReviewStates } from '@shared/enums'; +import { RegistrationReviewStates, RevisionReviewStates } from '@osf/shared/enums'; + +import { RegistryOverview } from '../../models'; @Component({ selector: 'osf-registry-revisions', diff --git a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.ts b/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.ts index fb97c3fc4..48706bfb8 100644 --- a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.ts +++ b/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.ts @@ -10,9 +10,10 @@ import { finalize, take } from 'rxjs'; import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { WithdrawRegistration } from '@osf/features/registry/store/registry-overview'; +import { TextInputComponent } from '@osf/shared/components'; import { InputLimits } from '@osf/shared/constants'; -import { TextInputComponent } from '@shared/components'; + +import { WithdrawRegistration } from '../../store/registry-overview'; @Component({ selector: 'osf-withdraw-dialog', diff --git a/src/app/features/registry/pages/registration-recent-activity/registration-recent-activity.component.ts b/src/app/features/registry/pages/registration-recent-activity/registration-recent-activity.component.ts index d657f8fdd..44a1e28e0 100644 --- a/src/app/features/registry/pages/registration-recent-activity/registration-recent-activity.component.ts +++ b/src/app/features/registry/pages/registration-recent-activity/registration-recent-activity.component.ts @@ -10,13 +10,13 @@ import { ChangeDetectionStrategy, Component, computed, inject, OnDestroy, signal import { ActivatedRoute } from '@angular/router'; import { ENVIRONMENT } from '@core/constants/environment.token'; -import { CustomPaginatorComponent } from '@shared/components'; -import { ACTIVITY_LOGS_DEFAULT_PAGE_SIZE } from '@shared/constants/activity-logs'; +import { CustomPaginatorComponent } from '@osf/shared/components'; +import { ACTIVITY_LOGS_DEFAULT_PAGE_SIZE } from '@osf/shared/constants/activity-logs'; import { ActivityLogsSelectors, ClearActivityLogsStore, GetRegistrationActivityLogs, -} from '@shared/stores/activity-logs'; +} from '@osf/shared/stores/activity-logs'; @Component({ selector: 'osf-registration-recent-activity', 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 9c67b8a16..225315080 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 @@ -20,6 +20,7 @@ import { RegistrationBlocksDataComponent, ResourceMetadataComponent, SubHeaderComponent, + ViewOnlyLinkMessageComponent, } from '@osf/shared/components'; import { RegistrationReviewStates, ResourceType, RevisionReviewStates, UserPermissions } from '@osf/shared/enums'; import { hasViewOnlyParam, toCamelCase } from '@osf/shared/helpers'; @@ -27,7 +28,6 @@ import { MapRegistryOverview } from '@osf/shared/mappers'; import { SchemaResponse, ToolbarResource } from '@osf/shared/models'; import { ToastService } from '@osf/shared/services'; import { FetchSelectedSubjects, GetBookmarksCollectionId, SubjectsSelectors } from '@osf/shared/stores'; -import { ViewOnlyLinkMessageComponent } from '@shared/components/view-only-link-message/view-only-link-message.component'; import { ArchivingMessageComponent, RegistryRevisionsComponent, RegistryStatusesComponent } from '../../components'; import { RegistryMakeDecisionComponent } from '../../components/registry-make-decision/registry-make-decision.component'; diff --git a/src/app/features/registry/registry.component.ts b/src/app/features/registry/registry.component.ts index cfb39b7da..816eebdec 100644 --- a/src/app/features/registry/registry.component.ts +++ b/src/app/features/registry/registry.component.ts @@ -7,7 +7,7 @@ import { RouterOutlet } from '@angular/router'; import { pathJoin } from '@osf/shared/helpers'; import { MetaTagsService } from '@osf/shared/services'; -import { DataciteService } from '@shared/services/datacite/datacite.service'; +import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; import { RegistryOverviewSelectors } from './store/registry-overview'; diff --git a/src/app/features/search/search.component.ts b/src/app/features/search/search.component.ts index cce94e232..6e214e65d 100644 --- a/src/app/features/search/search.component.ts +++ b/src/app/features/search/search.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { GlobalSearchComponent } from '@shared/components'; -import { SEARCH_TAB_OPTIONS } from '@shared/constants'; +import { GlobalSearchComponent } from '@osf/shared/components'; +import { SEARCH_TAB_OPTIONS } from '@osf/shared/constants'; @Component({ selector: 'osf-search-page', 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 a905f49e8..6c87b1453 100644 --- a/src/app/features/settings/account-settings/account-settings.component.ts +++ b/src/app/features/settings/account-settings/account-settings.component.ts @@ -7,8 +7,8 @@ import { DialogService } from 'primeng/dynamicdialog'; import { ChangeDetectionStrategy, Component, effect } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; +import { UserSelectors } from '@core/store/user'; 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'; diff --git a/src/app/features/settings/account-settings/components/affiliated-institutions/affiliated-institutions.component.ts b/src/app/features/settings/account-settings/components/affiliated-institutions/affiliated-institutions.component.ts index b9412784a..0950d9416 100644 --- a/src/app/features/settings/account-settings/components/affiliated-institutions/affiliated-institutions.component.ts +++ b/src/app/features/settings/account-settings/components/affiliated-institutions/affiliated-institutions.component.ts @@ -8,7 +8,7 @@ import { finalize } from 'rxjs'; import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { UserSelectors } from '@osf/core/store/user'; +import { UserSelectors } from '@core/store/user'; import { ReadonlyInputComponent } from '@osf/shared/components'; import { Institution } from '@osf/shared/models'; import { CustomConfirmationService, LoaderService, ToastService } from '@osf/shared/services'; diff --git a/src/app/features/settings/account-settings/components/connected-emails/connected-emails.component.ts b/src/app/features/settings/account-settings/components/connected-emails/connected-emails.component.ts index 7f6b93474..bd79ae823 100644 --- a/src/app/features/settings/account-settings/components/connected-emails/connected-emails.component.ts +++ b/src/app/features/settings/account-settings/components/connected-emails/connected-emails.component.ts @@ -12,15 +12,15 @@ import { filter, finalize, throttleTime } from 'rxjs'; import { ChangeDetectionStrategy, Component, computed, DestroyRef, inject } from '@angular/core'; import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; +import { UserSelectors } from '@core/store/user'; import { DeleteEmail, GetEmails, MakePrimary, ResendConfirmation, UserEmailsSelectors } from '@core/store/user-emails'; -import { UserSelectors } from '@osf/core/store/user'; import { ReadonlyInputComponent } from '@osf/shared/components'; import { IS_SMALL } from '@osf/shared/helpers'; import { CustomConfirmationService, LoaderService, ToastService } from '@osf/shared/services'; import { AccountEmail } from '../../models'; +import { AddEmailComponent } from '../add-email/add-email.component'; import { ConfirmationSentDialogComponent } from '../confirmation-sent-dialog/confirmation-sent-dialog.component'; -import { AddEmailComponent } from '../'; @Component({ selector: 'osf-connected-emails', diff --git a/src/app/features/settings/account-settings/components/default-storage-location/default-storage-location.component.ts b/src/app/features/settings/account-settings/components/default-storage-location/default-storage-location.component.ts index c3cfff597..5483c02af 100644 --- a/src/app/features/settings/account-settings/components/default-storage-location/default-storage-location.component.ts +++ b/src/app/features/settings/account-settings/components/default-storage-location/default-storage-location.component.ts @@ -11,10 +11,10 @@ import { finalize } from 'rxjs'; import { ChangeDetectionStrategy, Component, effect, inject, signal } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { UserSelectors } from '@osf/core/store/user'; +import { UserSelectors } from '@core/store/user'; import { IdName } from '@osf/shared/models'; import { LoaderService, ToastService } from '@osf/shared/services'; -import { RegionsSelectors } from '@osf/shared/stores/regions'; +import { RegionsSelectors } from '@osf/shared/stores'; import { UpdateRegion } from '../../store'; diff --git a/src/app/features/settings/account-settings/components/share-indexing/share-indexing.component.ts b/src/app/features/settings/account-settings/components/share-indexing/share-indexing.component.ts index dd5383740..db0d51eaf 100644 --- a/src/app/features/settings/account-settings/components/share-indexing/share-indexing.component.ts +++ b/src/app/features/settings/account-settings/components/share-indexing/share-indexing.component.ts @@ -11,7 +11,7 @@ import { finalize } from 'rxjs'; import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { UserSelectors } from '@osf/core/store/user'; +import { UserSelectors } from '@core/store/user'; import { LoaderService, ToastService } from '@osf/shared/services'; import { UpdateIndexing } from '../../store'; diff --git a/src/app/features/settings/account-settings/components/two-factor-auth/two-factor-auth.component.ts b/src/app/features/settings/account-settings/components/two-factor-auth/two-factor-auth.component.ts index 3168d0961..46fe5805b 100644 --- a/src/app/features/settings/account-settings/components/two-factor-auth/two-factor-auth.component.ts +++ b/src/app/features/settings/account-settings/components/two-factor-auth/two-factor-auth.component.ts @@ -10,7 +10,7 @@ import { InputMask } from 'primeng/inputmask'; import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core'; import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms'; -import { UserSelectors } from '@osf/core/store/user'; +import { UserSelectors } from '@core/store/user'; import { InputLimits } from '@osf/shared/constants'; import { CustomConfirmationService, LoaderService, ToastService } from '@osf/shared/services'; diff --git a/src/app/features/settings/addons/addons.component.ts b/src/app/features/settings/addons/addons.component.ts index 7c07173f8..10519a6d2 100644 --- a/src/app/features/settings/addons/addons.component.ts +++ b/src/app/features/settings/addons/addons.component.ts @@ -9,17 +9,17 @@ import { debounceTime, distinctUntilChanged } from 'rxjs'; import { ChangeDetectionStrategy, Component, computed, effect, signal } from '@angular/core'; import { FormControl, FormsModule } from '@angular/forms'; -import { UserSelectors } from '@osf/core/store/user'; +import { UserSelectors } from '@core/store/user'; import { LoadingSpinnerComponent, SearchInputComponent, SelectComponent, SubHeaderComponent, } from '@osf/shared/components'; +import { AddonCardListComponent } from '@osf/shared/components/addons'; +import { ADDON_CATEGORY_OPTIONS, ADDON_TAB_OPTIONS } from '@osf/shared/constants'; +import { AddonCategory, AddonTabValue } from '@osf/shared/enums'; import { Primitive } from '@osf/shared/helpers'; -import { AddonCardListComponent } from '@shared/components/addons'; -import { ADDON_CATEGORY_OPTIONS, ADDON_TAB_OPTIONS } from '@shared/constants'; -import { AddonCategory, AddonTabValue } from '@shared/enums'; import { AddonsSelectors, CreateAuthorizedAddon, @@ -32,7 +32,7 @@ import { GetLinkAddons, GetStorageAddons, UpdateAuthorizedAddon, -} from '@shared/stores/addons'; +} from '@osf/shared/stores'; @Component({ selector: 'osf-addons', diff --git a/src/app/features/settings/addons/components/connect-addon/connect-addon.component.ts b/src/app/features/settings/addons/components/connect-addon/connect-addon.component.ts index d30efac78..af94e9570 100644 --- a/src/app/features/settings/addons/components/connect-addon/connect-addon.component.ts +++ b/src/app/features/settings/addons/components/connect-addon/connect-addon.component.ts @@ -11,12 +11,12 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { Router, RouterLink } from '@angular/router'; import { SubHeaderComponent } from '@osf/shared/components'; +import { AddonSetupAccountFormComponent, AddonTermsComponent } from '@osf/shared/components/addons'; import { AddonServiceNames, AddonType, ProjectAddonsStepperValue } from '@osf/shared/enums'; import { getAddonTypeString, isAuthorizedAddon } from '@osf/shared/helpers'; -import { AddonSetupAccountFormComponent, AddonTermsComponent } from '@shared/components/addons'; -import { AddonModel, AddonTerm, AuthorizedAccountModel, AuthorizedAddonRequestJsonApi } from '@shared/models'; -import { AddonOAuthService, ToastService } from '@shared/services'; -import { AddonsSelectors, CreateAuthorizedAddon, UpdateAuthorizedAddon } from '@shared/stores/addons'; +import { AddonModel, AddonTerm, AuthorizedAccountModel, AuthorizedAddonRequestJsonApi } from '@osf/shared/models'; +import { AddonOAuthService, ToastService } from '@osf/shared/services'; +import { AddonsSelectors, CreateAuthorizedAddon, UpdateAuthorizedAddon } from '@osf/shared/stores'; @Component({ selector: 'osf-connect-addon', diff --git a/src/app/features/settings/profile-settings/components/education/education.component.ts b/src/app/features/settings/profile-settings/components/education/education.component.ts index 4ffe3bae2..1114b90b5 100644 --- a/src/app/features/settings/profile-settings/components/education/education.component.ts +++ b/src/app/features/settings/profile-settings/components/education/education.component.ts @@ -16,7 +16,7 @@ import { import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormArray, FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; -import { UpdateProfileSettingsEducation, UserSelectors } from '@osf/core/store/user'; +import { UpdateProfileSettingsEducation, UserSelectors } from '@core/store/user'; import { CustomValidators } from '@osf/shared/helpers'; import { CustomConfirmationService, LoaderService, ToastService } from '@osf/shared/services'; diff --git a/src/app/features/settings/tokens/components/token-created-dialog/token-created-dialog.component.ts b/src/app/features/settings/tokens/components/token-created-dialog/token-created-dialog.component.ts index e377692b3..3d0fd1980 100644 --- a/src/app/features/settings/tokens/components/token-created-dialog/token-created-dialog.component.ts +++ b/src/app/features/settings/tokens/components/token-created-dialog/token-created-dialog.component.ts @@ -16,7 +16,7 @@ import { viewChild, } from '@angular/core'; -import { CopyButtonComponent } from '@shared/components'; +import { CopyButtonComponent } from '@osf/shared/components'; @Component({ selector: 'osf-token-created-dialog', 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 13e361a37..e3ce6d9df 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 @@ -15,10 +15,8 @@ import { FormGroup, ReactiveFormsModule } from '@angular/forms'; import { UserSelectors } from '@core/store/user'; import { ProjectFormControls } from '@osf/shared/enums'; -import { Institution, ProjectForm } from '@osf/shared/models'; -import { Project } from '@osf/shared/models/projects'; -import { FetchRegions, RegionsSelectors } from '@osf/shared/stores'; -import { FetchUserInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions'; +import { Institution, Project, ProjectForm } from '@osf/shared/models'; +import { FetchRegions, FetchUserInstitutions, InstitutionsSelectors, RegionsSelectors } from '@osf/shared/stores'; 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/addon-card-list/addon-card-list.component.ts b/src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts index cc1d8d41c..34e68cc3a 100644 --- a/src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts +++ b/src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts @@ -2,7 +2,7 @@ import { TranslatePipe } from '@ngx-translate/core'; import { Component, input } from '@angular/core'; -import { AddonModel, AuthorizedAccountModel, ConfiguredAddonModel } from '@shared/models'; +import { AddonModel, AuthorizedAccountModel, ConfiguredAddonModel } from '@osf/shared/models'; import { AddonCardComponent } from '../addon-card/addon-card.component'; diff --git a/src/app/shared/components/addons/addon-card/addon-card.component.ts b/src/app/shared/components/addons/addon-card/addon-card.component.ts index 941f0d666..cfb91ec3c 100644 --- a/src/app/shared/components/addons/addon-card/addon-card.component.ts +++ b/src/app/shared/components/addons/addon-card/addon-card.component.ts @@ -8,9 +8,9 @@ import { Component, computed, inject, input } from '@angular/core'; import { Router } from '@angular/router'; import { getAddonTypeString, isConfiguredAddon } from '@osf/shared/helpers'; +import { AddonModel, AuthorizedAccountModel, ConfiguredAddonModel } from '@osf/shared/models'; import { CustomConfirmationService, LoaderService } from '@osf/shared/services'; -import { AddonModel, AuthorizedAccountModel, ConfiguredAddonModel } from '@shared/models'; -import { DeleteAuthorizedAddon } from '@shared/stores/addons'; +import { DeleteAuthorizedAddon } from '@osf/shared/stores'; @Component({ selector: 'osf-addon-card', diff --git a/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts b/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts index cbcb857eb..2f2207899 100644 --- a/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts +++ b/src/app/shared/components/addons/addon-setup-account-form/addon-setup-account-form.component.ts @@ -9,9 +9,9 @@ import { Component, computed, inject, input, output } from '@angular/core'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterLink } from '@angular/router'; -import { AddonFormControls, CredentialsFormat } from '@shared/enums'; -import { AddonForm, AddonModel, AuthorizedAccountModel, AuthorizedAddonRequestJsonApi } from '@shared/models'; -import { AddonFormService } from '@shared/services/addons/addon-form.service'; +import { AddonFormControls, CredentialsFormat } from '@osf/shared/enums'; +import { AddonForm, AddonModel, AuthorizedAccountModel, AuthorizedAddonRequestJsonApi } from '@osf/shared/models'; +import { AddonFormService } from '@osf/shared/services'; @Component({ selector: 'osf-addon-setup-account-form', diff --git a/src/app/shared/components/addons/addon-terms/addon-terms.component.ts b/src/app/shared/components/addons/addon-terms/addon-terms.component.ts index c1888d4e6..2ab9b7881 100644 --- a/src/app/shared/components/addons/addon-terms/addon-terms.component.ts +++ b/src/app/shared/components/addons/addon-terms/addon-terms.component.ts @@ -5,9 +5,9 @@ import { TableModule } from 'primeng/table'; import { NgClass } from '@angular/common'; import { Component, computed, input } from '@angular/core'; +import { ADDON_TERMS as addonTerms } from '@osf/shared/constants'; import { isCitationAddon } from '@osf/shared/helpers'; -import { ADDON_TERMS as addonTerms } from '@shared/constants'; -import { AddonModel, AddonTerm, AuthorizedAccountModel } from '@shared/models'; +import { AddonModel, AddonTerm, AuthorizedAccountModel } from '@osf/shared/models'; @Component({ selector: 'osf-addon-terms', diff --git a/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.ts b/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.ts index 9825b30ec..50212d369 100644 --- a/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.ts +++ b/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.ts @@ -83,6 +83,7 @@ export class GoogleFilePickerComponent implements OnInit { public createPicker(): void { if (!this.isPickerConfigured) return; + // eslint-disable-next-line @typescript-eslint/no-explicit-any const google = (window as any).google; const googlePickerView = new google.picker.DocsView(google.picker.ViewId.DOCS); @@ -132,6 +133,7 @@ export class GoogleFilePickerComponent implements OnInit { } pickerCallback(data: GoogleFilePickerModel) { + // eslint-disable-next-line @typescript-eslint/no-explicit-any if (data.action === (window as any).google.picker.Action.PICKED) { this.#filePickerCallback(data.docs[0]); } diff --git a/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.ts b/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.ts index 1c6323c32..5f2cf07d0 100644 --- a/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.ts +++ b/src/app/shared/components/affiliated-institution-select/affiliated-institution-select.component.ts @@ -8,7 +8,7 @@ import { NgOptimizedImage } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, input, model } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { Institution } from '@shared/models'; +import { Institution } from '@osf/shared/models'; @Component({ selector: 'osf-affiliated-institution-select', diff --git a/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts b/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts index d8aaead15..77b8ea272 100644 --- a/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts +++ b/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts @@ -3,7 +3,7 @@ import { TranslatePipe } from '@ngx-translate/core'; import { ChangeDetectionStrategy, Component, input } from '@angular/core'; import { RouterLink } from '@angular/router'; -import { Institution } from '@shared/models'; +import { Institution } from '@osf/shared/models'; @Component({ selector: 'osf-affiliated-institutions-view', diff --git a/src/app/shared/components/copy-button/copy-button.component.ts b/src/app/shared/components/copy-button/copy-button.component.ts index da15a6240..b8264175b 100644 --- a/src/app/shared/components/copy-button/copy-button.component.ts +++ b/src/app/shared/components/copy-button/copy-button.component.ts @@ -6,8 +6,8 @@ import { Tooltip } from 'primeng/tooltip'; import { Clipboard } from '@angular/cdk/clipboard'; import { ChangeDetectionStrategy, Component, inject, input } from '@angular/core'; +import { SeverityType } from '@osf/shared/models'; import { ToastService } from '@osf/shared/services'; -import { SeverityType } from '@shared/models'; @Component({ selector: 'osf-copy-button', diff --git a/src/app/shared/components/file-menu/file-menu.component.ts b/src/app/shared/components/file-menu/file-menu.component.ts index c49ef1b2c..74da026bd 100644 --- a/src/app/shared/components/file-menu/file-menu.component.ts +++ b/src/app/shared/components/file-menu/file-menu.component.ts @@ -8,8 +8,8 @@ import { Component, computed, inject, input, output } from '@angular/core'; import { Router } from '@angular/router'; import { FileMenuType } from '@osf/shared/enums'; +import { hasViewOnlyParam } from '@osf/shared/helpers'; import { FileMenuAction, FileMenuData } from '@osf/shared/models'; -import { hasViewOnlyParam } from '@shared/helpers'; @Component({ selector: 'osf-file-menu', 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 fa143df9b..98a2ee568 100644 --- a/src/app/shared/components/files-tree/files-tree.component.ts +++ b/src/app/shared/components/files-tree/files-tree.component.ts @@ -25,15 +25,16 @@ import { } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { MoveFileDialogComponent, RenameFileDialogComponent } from '@osf/features/files/components'; +import { MoveFileDialogComponent } from '@osf/features/files/components/move-file-dialog/move-file-dialog.component'; +import { RenameFileDialogComponent } from '@osf/features/files/components/rename-file-dialog/rename-file-dialog.component'; import { embedDynamicJs, embedStaticHtml } from '@osf/features/files/constants'; +import { StopPropagationDirective } from '@osf/shared/directives'; import { FileMenuType } from '@osf/shared/enums'; -import { StopPropagationDirective } from '@shared/directives'; -import { hasViewOnlyParam } from '@shared/helpers'; -import { FileLabelModel, FileMenuAction, FilesTreeActions, OsfFile } from '@shared/models'; -import { FileSizePipe } from '@shared/pipes'; -import { CustomConfirmationService, FilesService, ToastService } from '@shared/services'; -import { DataciteService } from '@shared/services/datacite/datacite.service'; +import { hasViewOnlyParam } from '@osf/shared/helpers'; +import { FileLabelModel, FileMenuAction, FilesTreeActions, OsfFile } from '@osf/shared/models'; +import { FileSizePipe } from '@osf/shared/pipes'; +import { CustomConfirmationService, FilesService, ToastService } from '@osf/shared/services'; +import { DataciteService } from '@osf/shared/services/datacite/datacite.service'; import { CustomPaginatorComponent } from '../custom-paginator/custom-paginator.component'; import { FileMenuComponent } from '../file-menu/file-menu.component'; diff --git a/src/app/shared/components/filter-chips/filter-chips.component.ts b/src/app/shared/components/filter-chips/filter-chips.component.ts index 5d356efb4..f9e02b09c 100644 --- a/src/app/shared/components/filter-chips/filter-chips.component.ts +++ b/src/app/shared/components/filter-chips/filter-chips.component.ts @@ -3,8 +3,8 @@ import { Chip } from 'primeng/chip'; import { CommonModule } from '@angular/common'; import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core'; -import { StringOrNull } from '@shared/helpers'; -import { DiscoverableFilter, SelectOption } from '@shared/models'; +import { StringOrNull } from '@osf/shared/helpers'; +import { DiscoverableFilter, SelectOption } from '@osf/shared/models'; @Component({ selector: 'osf-filter-chips', diff --git a/src/app/shared/components/generic-filter/generic-filter.component.ts b/src/app/shared/components/generic-filter/generic-filter.component.ts index 694802fcb..41ef9d808 100644 --- a/src/app/shared/components/generic-filter/generic-filter.component.ts +++ b/src/app/shared/components/generic-filter/generic-filter.component.ts @@ -16,7 +16,7 @@ import { import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; -import { FilterOption } from '@shared/models'; +import { FilterOption } from '@osf/shared/models'; import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component'; diff --git a/src/app/shared/components/global-search/global-search.component.ts b/src/app/shared/components/global-search/global-search.component.ts index 34921bfc2..18ba1df24 100644 --- a/src/app/shared/components/global-search/global-search.component.ts +++ b/src/app/shared/components/global-search/global-search.component.ts @@ -19,9 +19,10 @@ import { FormControl } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { PreprintProviderDetails } from '@osf/features/preprints/models'; -import { ResourceType } from '@shared/enums'; -import { StringOrNull } from '@shared/helpers'; -import { DiscoverableFilter, TabOption } from '@shared/models'; +import { ResourceType } from '@osf/shared/enums'; +import { StringOrNull } from '@osf/shared/helpers'; +import { DiscoverableFilter, TabOption } from '@osf/shared/models'; +import { SetSortBy } from '@osf/shared/stores'; import { ClearFilterSearchResults, FetchResources, @@ -34,9 +35,8 @@ import { ResetSearchState, SetResourceType, SetSearchText, - SetSortBy, UpdateFilterValue, -} from '@shared/stores/global-search'; +} from '@osf/shared/stores/global-search'; import { FilterChipsComponent } from '../filter-chips/filter-chips.component'; import { ReusableFilterComponent } from '../reusable-filter/reusable-filter.component'; diff --git a/src/app/shared/components/license/license.component.ts b/src/app/shared/components/license/license.component.ts index 730a105c6..75d9ca616 100644 --- a/src/app/shared/components/license/license.component.ts +++ b/src/app/shared/components/license/license.component.ts @@ -9,10 +9,10 @@ import { ChangeDetectionStrategy, Component, effect, input, model, output, signa import { toSignal } from '@angular/core/rxjs-interop'; import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { InputLimits } from '@osf/shared/constants'; import { CustomValidators, StringOrNullOrUndefined } from '@osf/shared/helpers'; -import { InputLimits } from '@shared/constants'; -import { LicenseForm, LicenseModel, LicenseOptions } from '@shared/models'; -import { InterpolatePipe } from '@shared/pipes'; +import { LicenseForm, LicenseModel, LicenseOptions } from '@osf/shared/models'; +import { InterpolatePipe } from '@osf/shared/pipes'; import { TextInputComponent } from '../text-input/text-input.component'; import { TruncatedTextComponent } from '../truncated-text/truncated-text.component'; diff --git a/src/app/shared/components/list-info-shortener/list-info-shortener.component.ts b/src/app/shared/components/list-info-shortener/list-info-shortener.component.ts index 002b0e8a4..193772875 100644 --- a/src/app/shared/components/list-info-shortener/list-info-shortener.component.ts +++ b/src/app/shared/components/list-info-shortener/list-info-shortener.component.ts @@ -4,7 +4,7 @@ import { Tooltip } from 'primeng/tooltip'; import { ChangeDetectionStrategy, Component, input } from '@angular/core'; -import { IdName } from '@shared/models'; +import { IdName } from '@osf/shared/models'; @Component({ selector: 'osf-list-info-shortener', 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 fdf5ab030..e8aafeb4c 100644 --- a/src/app/shared/components/project-selector/project-selector.component.ts +++ b/src/app/shared/components/project-selector/project-selector.component.ts @@ -22,10 +22,8 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; import { UserSelectors } from '@core/store/user'; -import { CustomOption } from '@shared/models'; -import { Project } from '@shared/models/projects'; -import { GetProjects } from '@shared/stores'; -import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors'; +import { CustomOption, Project } from '@osf/shared/models'; +import { GetProjects, ProjectsSelectors } from '@osf/shared/stores'; @Component({ selector: 'osf-project-selector', diff --git a/src/app/shared/components/resource-card/components/file-secondary-metadata/file-secondary-metadata.component.ts b/src/app/shared/components/resource-card/components/file-secondary-metadata/file-secondary-metadata.component.ts index f015564bf..89c4cb756 100644 --- a/src/app/shared/components/resource-card/components/file-secondary-metadata/file-secondary-metadata.component.ts +++ b/src/app/shared/components/resource-card/components/file-secondary-metadata/file-secondary-metadata.component.ts @@ -2,7 +2,7 @@ import { TranslatePipe } from '@ngx-translate/core'; import { ChangeDetectionStrategy, Component, input } from '@angular/core'; -import { ResourceModel } from '@shared/models'; +import { ResourceModel } from '@osf/shared/models'; @Component({ selector: 'osf-file-secondary-metadata', diff --git a/src/app/shared/components/resource-card/components/preprint-secondary-metadata/preprint-secondary-metadata.component.ts b/src/app/shared/components/resource-card/components/preprint-secondary-metadata/preprint-secondary-metadata.component.ts index aaac6b0f7..bbff9d84b 100644 --- a/src/app/shared/components/resource-card/components/preprint-secondary-metadata/preprint-secondary-metadata.component.ts +++ b/src/app/shared/components/resource-card/components/preprint-secondary-metadata/preprint-secondary-metadata.component.ts @@ -2,7 +2,7 @@ import { TranslatePipe } from '@ngx-translate/core'; import { ChangeDetectionStrategy, Component, input } from '@angular/core'; -import { ResourceModel } from '@shared/models'; +import { ResourceModel } from '@osf/shared/models'; @Component({ selector: 'osf-preprint-secondary-metadata', diff --git a/src/app/shared/components/resource-card/components/project-secondary-metadata/project-secondary-metadata.component.ts b/src/app/shared/components/resource-card/components/project-secondary-metadata/project-secondary-metadata.component.ts index 49eebe9f3..ae6f69e81 100644 --- a/src/app/shared/components/resource-card/components/project-secondary-metadata/project-secondary-metadata.component.ts +++ b/src/app/shared/components/resource-card/components/project-secondary-metadata/project-secondary-metadata.component.ts @@ -2,8 +2,8 @@ import { TranslatePipe } from '@ngx-translate/core'; import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core'; -import { languageCodes } from '@shared/constants'; -import { ResourceModel } from '@shared/models'; +import { languageCodes } from '@osf/shared/constants'; +import { ResourceModel } from '@osf/shared/models'; @Component({ selector: 'osf-project-secondary-metadata', diff --git a/src/app/shared/components/resource-card/components/registration-secondary-metadata/registration-secondary-metadata.component.ts b/src/app/shared/components/resource-card/components/registration-secondary-metadata/registration-secondary-metadata.component.ts index b5a610a09..be8e535d1 100644 --- a/src/app/shared/components/resource-card/components/registration-secondary-metadata/registration-secondary-metadata.component.ts +++ b/src/app/shared/components/resource-card/components/registration-secondary-metadata/registration-secondary-metadata.component.ts @@ -2,7 +2,7 @@ import { TranslatePipe } from '@ngx-translate/core'; import { ChangeDetectionStrategy, Component, input } from '@angular/core'; -import { ResourceModel } from '@shared/models'; +import { ResourceModel } from '@osf/shared/models'; @Component({ selector: 'osf-registration-secondary-metadata', diff --git a/src/app/shared/components/resource-card/components/user-secondary-metadata/user-secondary-metadata.component.ts b/src/app/shared/components/resource-card/components/user-secondary-metadata/user-secondary-metadata.component.ts index 93f131d1d..0105c66f9 100644 --- a/src/app/shared/components/resource-card/components/user-secondary-metadata/user-secondary-metadata.component.ts +++ b/src/app/shared/components/resource-card/components/user-secondary-metadata/user-secondary-metadata.component.ts @@ -4,7 +4,7 @@ import { Skeleton } from 'primeng/skeleton'; import { ChangeDetectionStrategy, Component, input } from '@angular/core'; -import { ResourceModel, UserRelatedCounts } from '@shared/models'; +import { ResourceModel, UserRelatedCounts } from '@osf/shared/models'; @Component({ selector: 'osf-user-secondary-metadata', 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 83c37a89c..37d3021b5 100644 --- a/src/app/shared/components/resource-citations/resource-citations.component.ts +++ b/src/app/shared/components/resource-citations/resource-citations.component.ts @@ -26,9 +26,9 @@ import { import { FormControl, ReactiveFormsModule } from '@angular/forms'; import { Router } from '@angular/router'; -import { hasViewOnlyParam } from '@shared/helpers'; -import { CitationStyle, CustomOption, ResourceOverview } from '@shared/models'; -import { ToastService } from '@shared/services'; +import { hasViewOnlyParam } from '@osf/shared/helpers'; +import { CitationStyle, CustomOption, ResourceOverview } from '@osf/shared/models'; +import { ToastService } from '@osf/shared/services'; import { CitationsSelectors, ClearStyledCitation, @@ -36,7 +36,7 @@ import { GetDefaultCitations, GetStyledCitation, UpdateCustomCitation, -} from '@shared/stores'; +} from '@osf/shared/stores'; @Component({ selector: 'osf-resource-citations', diff --git a/src/app/shared/components/resource-metadata/resource-metadata.component.ts b/src/app/shared/components/resource-metadata/resource-metadata.component.ts index 519f42d73..93f0a4201 100644 --- a/src/app/shared/components/resource-metadata/resource-metadata.component.ts +++ b/src/app/shared/components/resource-metadata/resource-metadata.component.ts @@ -9,7 +9,7 @@ import { RouterLink } from '@angular/router'; import { OverviewCollectionsComponent } from '@osf/features/project/overview/components/overview-collections/overview-collections.component'; import { CurrentResourceType } from '@osf/shared/enums'; -import { ResourceOverview } from '@shared/models'; +import { ResourceOverview } from '@osf/shared/models'; import { AffiliatedInstitutionsViewComponent } from '../affiliated-institutions-view/affiliated-institutions-view.component'; import { ResourceCitationsComponent } from '../resource-citations/resource-citations.component'; diff --git a/src/app/shared/components/stepper/stepper.component.ts b/src/app/shared/components/stepper/stepper.component.ts index a8b0fe146..25d1a75c8 100644 --- a/src/app/shared/components/stepper/stepper.component.ts +++ b/src/app/shared/components/stepper/stepper.component.ts @@ -2,8 +2,7 @@ import { TranslatePipe } from '@ngx-translate/core'; import { ChangeDetectionStrategy, Component, input, model } from '@angular/core'; -import { StepOption } from '@shared/models'; - +import { StepOption } from '../../models/step-option.model'; import { IconComponent } from '../icon/icon.component'; @Component({ From bc73a63b0ff90b72fe1dc9ec49c77c48408135c0 Mon Sep 17 00:00:00 2001 From: NazarMykhalkevych Date: Fri, 12 Sep 2025 23:15:37 +0300 Subject: [PATCH 2/2] fix(bugs): refactoring imports --- .husky/pre-push | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.husky/pre-push b/.husky/pre-push index 0ca23b22c..5a281490a 100644 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -1,19 +1,19 @@ -# # npm run build +# npm run build -# npm run test:coverage || { -# printf "\n\nERROR: Testing errors or coverage issues are found." -# printf "\n\nIn the future this will block your ability to push to github until it is resolved." -# printf "\n\nThe same pipeline runs via GitHub actions." -# printf "\n\nYou are seeing this error because code was added without test coverage." -# # printf "\n\n Please address them before proceeding.\n\n\n\n" -# # exit 1 -# } +npm run test:coverage || { + printf "\n\nERROR: Testing errors or coverage issues are found." + printf "\n\nIn the future this will block your ability to push to github until it is resolved." + printf "\n\nThe same pipeline runs via GitHub actions." + printf "\n\nYou are seeing this error because code was added without test coverage." + # printf "\n\n Please address them before proceeding.\n\n\n\n" + # exit 1 +} -# npm run test:check-coverage-thresholds || { -# printf "\n\nERROR: Coverage thresholds are not met." -# printf "\n\nIn the future this will block your ability to push to github until it is resolved." -# printf "\n\nThe same pipeline runs via GitHub actions." -# printf "\n\nYou are seeing this error because test coverage increased without updating the jest.config.js thresholds." -# #printf "\n\nPlease address them before proceeding.\n\n\n\n" -# # exit 1 -# } +npm run test:check-coverage-thresholds || { + printf "\n\nERROR: Coverage thresholds are not met." + printf "\n\nIn the future this will block your ability to push to github until it is resolved." + printf "\n\nThe same pipeline runs via GitHub actions." + printf "\n\nYou are seeing this error because test coverage increased without updating the jest.config.js thresholds." + #printf "\n\nPlease address them before proceeding.\n\n\n\n" + # exit 1 +}