From bc1e2666fd77163b4e435ef31d57b6f7795c80a4 Mon Sep 17 00:00:00 2001 From: FrancescoMolinaro Date: Tue, 22 Jul 2025 15:10:42 +0200 Subject: [PATCH 01/52] [DURACOM-327] isolate core dependencies, add relative path, refactor imports --- server.ts | 2 +- .../access-control/access-control-routes.ts | 6 +- .../access-control-routing-paths.ts | 3 +- .../bulk-access-browse.component.spec.ts | 4 +- .../browse/bulk-access-browse.component.ts | 14 ++-- .../epeople-registry.actions.ts | 2 +- .../epeople-registry.component.spec.ts | 24 +++---- .../epeople-registry.component.ts | 38 +++++----- .../epeople-registry.reducers.ts | 3 +- .../eperson-form.component.spec.ts | 30 ++++---- .../eperson-form/eperson-form.component.ts | 42 +++++------ .../validators/email-taken.validator.ts | 5 +- .../eperson-resolver.service.ts | 10 +-- .../group-form/group-form.component.spec.ts | 40 +++++------ .../group-form/group-form.component.ts | 38 +++++----- .../members-list.component.spec.ts | 26 +++---- .../members-list/members-list.component.ts | 34 ++++----- .../subgroups-list.component.spec.ts | 22 +++--- .../subgroup-list/subgroups-list.component.ts | 24 +++---- .../validators/group-exists.validator.ts | 7 +- .../group-registry/group-page.guard.spec.ts | 8 +-- .../group-registry/group-page.guard.ts | 13 ++-- .../group-registry/group-registry.actions.ts | 2 +- .../group-registry/group-registry.reducers.ts | 3 +- .../groups-registry.component.spec.ts | 40 +++++------ .../groups-registry.component.ts | 52 +++++++------- .../accessibility-settings.service.spec.ts | 8 +-- .../accessibility-settings.service.ts | 10 +-- .../batch-import-page.component.spec.ts | 6 +- .../batch-import-page.component.ts | 16 ++--- .../metadata-import-page.component.spec.ts | 6 +- .../metadata-import-page.component.ts | 12 ++-- .../admin-notifications-routes.ts | 6 +- .../admin-notify-dashboard-routes.ts | 6 +- .../admin-notify-dashboard.component.spec.ts | 4 +- .../admin-notify-dashboard.component.ts | 8 +-- .../admin-notify-incoming.component.ts | 2 +- .../admin-notify-logs-result.component.ts | 6 +- .../admin-notify-outgoing.component.ts | 2 +- .../admin-notify-metrics.component.spec.ts | 2 +- .../admin-notify-metrics.component.ts | 2 +- ...min-notify-search-result.component.spec.ts | 2 +- .../admin-notify-search-result.component.ts | 4 +- .../models/admin-notify-message.model.ts | 8 +-- .../admin-notify-message.resource-type.ts | 2 +- .../admin-notify-messages.service.spec.ts | 20 +++--- .../services/admin-notify-messages.service.ts | 26 +++---- .../admin-registries-routes.ts | 2 +- .../admin-registries-routing-paths.ts | 3 +- .../add-bitstream-format.component.spec.ts | 6 +- .../add-bitstream-format.component.ts | 8 +-- .../bitstream-format.actions.ts | 2 +- .../bitstream-format.reducers.spec.ts | 2 +- .../bitstream-format.reducers.ts | 3 +- .../bitstream-formats-routes.ts | 2 +- .../bitstream-formats.component.spec.ts | 8 +-- .../bitstream-formats.component.ts | 16 ++--- .../bitstream-formats.resolver.ts | 9 ++- .../edit-bitstream-format.component.spec.ts | 8 +-- .../edit-bitstream-format.component.ts | 8 +-- .../format-form/format-form.component.spec.ts | 4 +- .../format-form/format-form.component.ts | 4 +- .../metadata-registry.actions.ts | 4 +- .../metadata-registry.component.spec.ts | 14 ++-- .../metadata-registry.component.ts | 14 ++-- .../metadata-registry.reducers.spec.ts | 5 +- .../metadata-registry.reducers.ts | 5 +- .../metadata-schema-form.component.spec.ts | 4 +- .../metadata-schema-form.component.ts | 4 +- .../metadata-field-form.component.spec.ts | 6 +- .../metadata-field-form.component.ts | 6 +- .../metadata-schema.component.spec.ts | 18 ++--- .../metadata-schema.component.ts | 22 +++--- .../admin-reports/admin-reports-routes.ts | 2 +- ...iltered-items-export-csv.component.spec.ts | 4 +- .../filtered-items-export-csv.component.ts | 10 +-- .../filtered-items/filtered-items-model.ts | 3 +- src/app/admin/admin-routes.ts | 4 +- src/app/admin/admin-routing-paths.ts | 3 +- .../admin-search-page.component.ts | 2 +- ...arch-result-grid-element.component.spec.ts | 14 ++-- ...in-search-result-grid-element.component.ts | 6 +- ...arch-result-grid-element.component.spec.ts | 14 ++-- ...in-search-result-grid-element.component.ts | 6 +- ...arch-result-grid-element.component.spec.ts | 18 ++--- ...in-search-result-grid-element.component.ts | 12 ++-- ...arch-result-list-element.component.spec.ts | 6 +- ...in-search-result-list-element.component.ts | 6 +- ...arch-result-list-element.component.spec.ts | 6 +- ...in-search-result-list-element.component.ts | 6 +- ...arch-result-list-element.component.spec.ts | 6 +- ...in-search-result-list-element.component.ts | 6 +- ...in-search-result-actions.component.spec.ts | 4 +- ...m-admin-search-result-actions.component.ts | 4 +- .../admin-sidebar.component.spec.ts | 8 +-- .../admin-sidebar/admin-sidebar.component.ts | 4 +- .../admin-workflow-page.component.ts | 2 +- ...m-admin-workflow-actions.component.spec.ts | 10 +-- ...w-item-admin-workflow-actions.component.ts | 2 +- ...ion-order-group-selector.component.spec.ts | 6 +- ...ervision-order-group-selector.component.ts | 12 ++-- .../supervision-order-status.component.ts | 10 +-- ...m-admin-workflow-actions.component.spec.ts | 14 ++-- ...e-item-admin-workflow-actions.component.ts | 14 ++-- ...in-workflow-grid-element.component.spec.ts | 16 ++--- ...t-admin-workflow-grid-element.component.ts | 26 +++---- ...in-workflow-grid-element.component.spec.ts | 20 +++--- ...t-admin-workflow-grid-element.component.ts | 36 +++++----- ...in-workflow-list-element.component.spec.ts | 16 ++--- ...t-admin-workflow-list-element.component.ts | 22 +++--- ...in-workflow-list-element.component.spec.ts | 18 ++--- ...t-admin-workflow-list-element.component.ts | 30 ++++---- src/app/app-routes.ts | 18 ++--- src/app/app-routing-paths.ts | 11 +-- src/app/app.component.spec.ts | 18 ++--- src/app/app.component.ts | 14 ++-- src/app/app.config.ts | 22 +++--- ...bitstream-authorizations.component.spec.ts | 4 +- .../bitstream-authorizations.component.ts | 4 +- .../bitstream-download-page.component.spec.ts | 18 ++--- .../bitstream-download-page.component.ts | 28 ++++---- ...itstream-page-authorizations.guard.spec.ts | 4 +- .../bitstream-page-authorizations.guard.ts | 4 +- .../bitstream-page/bitstream-page-routes.ts | 6 +- .../bitstream-page/bitstream-page.resolver.ts | 8 +-- .../edit-bitstream-page.component.spec.ts | 18 ++--- .../edit-bitstream-page.component.ts | 38 +++++----- ...egacy-bitstream-url-redirect.guard.spec.ts | 12 ++-- .../legacy-bitstream-url-redirect.guard.ts | 10 +-- .../breadcrumb/breadcrumb-config.model.ts | 2 +- .../breadcrumbs/breadcrumbs.service.spec.ts | 2 +- .../browse-by-date.component.spec.ts | 16 ++--- .../browse-by-date.component.ts | 20 +++--- .../browse-by-dso-breadcrumb.resolver.ts | 16 ++--- ...rowse-by-geospatial-data.component.spec.ts | 8 +-- .../browse-by-geospatial-data.component.ts | 12 ++-- src/app/browse-by/browse-by-guard.spec.ts | 2 +- src/app/browse-by/browse-by-guard.ts | 8 +-- .../browse-by-i18n-breadcrumb.resolver.ts | 2 +- .../browse-by-metadata.component.spec.ts | 28 ++++---- .../browse-by-metadata.component.ts | 30 ++++---- src/app/browse-by/browse-by-page-routes.ts | 2 +- .../browse-by-page.component.spec.ts | 4 +- .../browse-by-page.component.ts | 2 +- .../browse-by-switcher/browse-by-decorator.ts | 4 +- .../browse-by-switcher.component.spec.ts | 6 +- .../browse-by-switcher.component.ts | 4 +- .../browse-by-taxonomy.component.spec.ts | 4 +- .../browse-by-taxonomy.component.ts | 10 +-- .../browse-by-title.component.spec.ts | 14 ++-- .../browse-by-title.component.ts | 8 +-- .../collection-form.component.ts | 20 +++--- .../collection-item-mapper.component.spec.ts | 30 ++++---- .../collection-item-mapper.component.ts | 44 ++++++------ .../collection-page-administrator.guard.ts | 4 +- .../collection-page/collection-page-routes.ts | 8 +-- .../collection-page-routing-paths.ts | 2 +- .../collection-page.component.ts | 20 +++--- .../collection-page.resolver.ts | 10 +-- .../create-collection-page.component.spec.ts | 12 ++-- .../create-collection-page.component.ts | 12 ++-- .../create-collection-page.guard.spec.ts | 2 +- .../create-collection-page.guard.ts | 8 +-- .../delete-collection-page.component.spec.ts | 6 +- .../delete-collection-page.component.ts | 6 +- ...ollection-access-control.component.spec.ts | 2 +- .../collection-access-control.component.ts | 6 +- ...ollection-authorizations.component.spec.ts | 4 +- .../collection-authorizations.component.ts | 4 +- .../collection-curate.component.spec.ts | 4 +- .../collection-curate.component.ts | 6 +- .../collection-metadata.component.spec.ts | 16 ++--- .../collection-metadata.component.ts | 22 +++--- .../collection-roles.component.spec.ts | 8 +-- .../collection-roles.component.ts | 14 ++-- ...llection-source-controls.component.spec.ts | 18 ++--- .../collection-source-controls.component.ts | 26 +++---- .../collection-source.component.spec.ts | 18 ++--- .../collection-source.component.ts | 32 ++++----- .../edit-collection-page-routes.ts | 4 +- .../edit-collection-page.component.spec.ts | 2 +- .../edit-collection-page.component.ts | 2 +- .../edit-item-template-page.component.spec.ts | 4 +- .../edit-item-template-page.component.ts | 12 ++-- .../item-template-page.resolver.ts | 8 +-- .../community-list-datasource.ts | 2 +- .../community-list-page-routes.ts | 2 +- .../community-list-service.spec.ts | 22 +++--- .../community-list-service.ts | 30 ++++---- .../community-list.reducer.spec.ts | 6 +- .../community-list.component.spec.ts | 8 +-- .../community-list.component.ts | 12 ++-- .../community-list-page/flat-node.model.ts | 4 +- .../community-form.component.ts | 10 +-- .../community-page-administrator.guard.ts | 4 +- .../community-page/community-page-routes.ts | 6 +- .../community-page-routing-paths.ts | 3 +- .../community-page.component.ts | 18 ++--- .../community-page/community-page.resolver.ts | 10 +-- .../create-community-page.component.spec.ts | 8 +-- .../create-community-page.component.ts | 10 +-- .../create-community-page.guard.spec.ts | 2 +- .../create-community-page.guard.ts | 8 +-- .../delete-community-page.component.spec.ts | 6 +- .../delete-community-page.component.ts | 6 +- ...community-access-control.component.spec.ts | 2 +- .../community-access-control.component.ts | 6 +- ...community-authorizations.component.spec.ts | 4 +- .../community-authorizations.component.ts | 4 +- .../community-curate.component.spec.ts | 4 +- .../community-curate.component.ts | 6 +- .../community-metadata.component.spec.ts | 2 +- .../community-metadata.component.ts | 4 +- .../community-roles.component.spec.ts | 8 +-- .../community-roles.component.ts | 14 ++-- .../edit-community-page-routes.ts | 4 +- .../edit-community-page.component.spec.ts | 2 +- .../edit-community-page.component.ts | 2 +- ...page-sub-collection-list.component.spec.ts | 22 +++--- ...nity-page-sub-collection-list.component.ts | 20 +++--- ...nity-page-sub-collection-list.component.ts | 2 +- .../sub-com-col-section.component.ts | 4 +- ...-page-sub-community-list.component.spec.ts | 22 +++--- ...unity-page-sub-community-list.component.ts | 18 ++--- ...unity-page-sub-community-list.component.ts | 2 +- .../models/submission-coar-notify.model.ts} | 12 ++-- src/app/core/data-services-map.ts | 16 ++--- .../admin-ldn-services-routes.ts | 4 +- .../ldn-service-form.component.html | 0 .../ldn-service-form.component.scss | 4 +- .../ldn-service-form.component.spec.ts | 16 ++--- .../ldn-service-form.component.ts | 16 ++--- .../ldnServicesRD$-mock.ts | 6 +- .../ldn-services-directory.component.html | 0 .../ldn-services-directory.component.scss | 0 .../ldn-services-directory.component.spec.ts | 26 +++---- .../ldn-services-directory.component.ts | 22 +++--- .../ldn-service-itemfilters.ts | 8 +-- .../ldn-service-patterns.model.ts | 0 .../ldn-service-status.model.ts | 0 .../ldn-service.constrain.model.ts | 0 .../ldn-service.resource-type.ts | 2 +- .../ldn-services-model/ldn-services.model.ts | 8 +-- .../service-constrain-type.model.ts | 0 .../ldn-service-coar-patterns.ts | 0 .../coar-notify-config-data.service.spec.ts | 36 +++++----- .../data}/coar-notify-config-data.service.ts | 70 +++++++++---------- .../dso-page-single-feature.guard.spec.ts | 4 +- .../dso-page-single-feature.guard.ts | 2 +- .../dso-page-some-feature.guard.spec.ts | 4 +- .../dso-page-some-feature.guard.ts | 4 +- ...single-feature-authorization.guard.spec.ts | 2 +- .../some-feature-authorization.guard.spec.ts | 2 +- .../some-feature-authorization.guard.ts | 4 +- .../data}/ldn-itemfilter-data.service.spec.ts | 24 +++---- .../data}/ldn-itemfilters-data.service.ts | 24 +++---- .../data}/ldn-services-data.service.spec.ts | 48 ++++++------- .../data}/ldn-services-data.service.ts | 48 ++++++------- .../metadata-patch-operation.service.spec.ts | 2 +- .../metadata-patch-operation.service.ts | 2 +- ...ality-assurance-event-data.service.spec.ts | 20 +++--- .../quality-assurance-event-data.service.ts | 58 +++++++-------- ...ty-assurance-event-object.resource-type.ts | 2 +- .../models/quality-assurance-event.model.ts | 22 +++--- ...y-assurance-source-object.resource-type.ts | 2 +- .../models/quality-assurance-source.model.ts | 10 +-- ...ty-assurance-topic-object.resource-type.ts | 2 +- .../models/quality-assurance-topic.model.ts | 10 +-- ...lity-assurance-source-data.service.spec.ts | 16 ++--- .../quality-assurance-source-data.service.ts | 28 ++++---- ...ality-assurance-topic-data.service.spec.ts | 16 ++--- .../quality-assurance-topic-data.service.ts | 28 ++++---- .../suggestion-objects.resource-type.ts | 2 +- .../suggestion-source-object.resource-type.ts | 2 +- .../models/suggestion-source.model.ts | 10 +-- .../suggestion-target-object.resource-type.ts | 2 +- .../models/suggestion-target.model.ts | 10 +-- .../suggestions/models/suggestion.model.ts | 18 ++--- .../suggestion-source-data.service.spec.ts | 26 +++---- .../source/suggestion-source-data.service.ts | 28 ++++---- .../suggestion-target-data.service.spec.ts | 32 ++++----- .../target/suggestion-target-data.service.ts | 36 +++++----- src/app/core/provide-core.ts | 8 +-- .../search-filters/search-config.model.ts | 4 +- ...ction-coar-notify-service.resource-type.ts | 2 +- .../models/vocabularies.resource-type.ts | 2 +- .../models/vocabulary-entry-detail.model.ts | 4 +- .../models/vocabulary-entry.model.ts | 8 +-- .../models/vocabulary-find-options.model.ts | 7 +- .../vocabularies/models/vocabulary.model.ts | 18 ++--- .../correlation-id.service.spec.ts | 2 +- .../correlation-id/correlation-id.service.ts | 12 ++-- .../curation-form.component.spec.ts | 8 +-- .../curation-form/curation-form.component.ts | 16 ++--- ...it-metadata-field-values.component.spec.ts | 4 +- ...so-edit-metadata-field-values.component.ts | 4 +- .../dso-edit-metadata-form.spec.ts | 5 +- .../dso-edit-metadata-form.ts | 18 ++--- ...dso-edit-metadata-value-field.component.ts | 4 +- ...metadata-authority-field.component.spec.ts | 22 +++--- ...edit-metadata-authority-field.component.ts | 18 ++--- ...it-metadata-entity-field.component.spec.ts | 2 +- ...so-edit-metadata-entity-field.component.ts | 6 +- .../dso-edit-metadata-field.service.spec.ts | 4 +- .../dso-edit-metadata-field.service.ts | 14 ++-- ...t-metadata-value-field-loader.component.ts | 6 +- ...dso-edit-metadata-value-field.decorator.ts | 3 +- .../dso-edit-metadata-value.component.spec.ts | 14 ++-- .../dso-edit-metadata-value.component.ts | 24 +++---- .../dso-edit-metadata.component.spec.ts | 10 +-- .../dso-edit-metadata.component.ts | 16 ++--- .../metadata-field-selector.component.spec.ts | 12 ++-- .../metadata-field-selector.component.ts | 22 +++--- .../themed-dso-edit-metadata.component.ts | 4 +- ...urnal-issue-grid-element.component.spec.ts | 8 +-- .../journal-issue-grid-element.component.ts | 4 +- ...rnal-volume-grid-element.component.spec.ts | 14 ++-- .../journal-volume-grid-element.component.ts | 4 +- .../journal-grid-element.component.spec.ts | 8 +-- .../journal/journal-grid-element.component.ts | 4 +- ...arch-result-grid-element.component.spec.ts | 7 +- ...ue-search-result-grid-element.component.ts | 2 +- ...arch-result-grid-element.component.spec.ts | 7 +- ...me-search-result-grid-element.component.ts | 2 +- ...arch-result-grid-element.component.spec.ts | 7 +- ...al-search-result-grid-element.component.ts | 2 +- ...urnal-issue-list-element.component.spec.ts | 8 +-- .../journal-issue-list-element.component.ts | 4 +- ...rnal-volume-list-element.component.spec.ts | 4 +- .../journal-volume-list-element.component.ts | 4 +- .../journal-list-element.component.spec.ts | 8 +-- .../journal/journal-list-element.component.ts | 4 +- ...arch-result-list-element.component.spec.ts | 4 +- ...ue-search-result-list-element.component.ts | 2 +- ...arch-result-list-element.component.spec.ts | 4 +- ...me-search-result-list-element.component.ts | 2 +- ...arch-result-list-element.component.spec.ts | 4 +- ...al-search-result-list-element.component.ts | 2 +- ...ebar-search-list-element.component.spec.ts | 5 +- ...e-sidebar-search-list-element.component.ts | 6 +- ...ebar-search-list-element.component.spec.ts | 5 +- ...e-sidebar-search-list-element.component.ts | 6 +- ...ebar-search-list-element.component.spec.ts | 5 +- ...l-sidebar-search-list-element.component.ts | 6 +- .../journal-issue.component.spec.ts | 7 +- .../journal-issue/journal-issue.component.ts | 2 +- .../journal-volume.component.spec.ts | 7 +- .../journal-volume.component.ts | 2 +- .../journal/journal.component.spec.ts | 42 +++++------ .../item-pages/journal/journal.component.ts | 2 +- .../org-unit-grid-element.component.spec.ts | 14 ++-- .../org-unit-grid-element.component.ts | 4 +- .../person-grid-element.component.spec.ts | 8 +-- .../person/person-grid-element.component.ts | 4 +- .../project-grid-element.component.spec.ts | 14 ++-- .../project/project-grid-element.component.ts | 4 +- ...arch-result-grid-element.component.spec.ts | 7 +- ...it-search-result-grid-element.component.ts | 2 +- ...arch-result-grid-element.component.spec.ts | 7 +- ...on-search-result-grid-element.component.ts | 2 +- ...arch-result-grid-element.component.spec.ts | 7 +- ...ct-search-result-grid-element.component.ts | 2 +- .../org-unit-list-element.component.spec.ts | 8 +-- .../org-unit-list-element.component.ts | 4 +- .../person-list-element.component.spec.ts | 8 +-- .../person/person-list-element.component.ts | 4 +- .../project-list-element.component.spec.ts | 8 +-- .../project/project-list-element.component.ts | 4 +- ...arch-result-list-element.component.spec.ts | 8 +-- ...it-search-result-list-element.component.ts | 2 +- ...arch-result-list-element.component.spec.ts | 8 +-- ...on-search-result-list-element.component.ts | 4 +- ...arch-result-list-element.component.spec.ts | 4 +- ...ct-search-result-list-element.component.ts | 2 +- ...ebar-search-list-element.component.spec.ts | 5 +- ...t-sidebar-search-list-element.component.ts | 6 +- ...ebar-search-list-element.component.spec.ts | 5 +- ...n-sidebar-search-list-element.component.ts | 10 +-- ...ebar-search-list-element.component.spec.ts | 5 +- ...t-sidebar-search-list-element.component.ts | 6 +- .../org-unit/org-unit.component.spec.ts | 7 +- .../item-pages/org-unit/org-unit.component.ts | 2 +- .../person/person.component.spec.ts | 7 +- .../item-pages/person/person.component.ts | 2 +- .../project/project.component.spec.ts | 7 +- .../item-pages/project/project.component.ts | 2 +- ...em-metadata-list-element.component.spec.ts | 6 +- ...em-metadata-list-element.component.spec.ts | 6 +- ...em-metadata-list-element.component.spec.ts | 8 +-- ...ct-item-metadata-list-element.component.ts | 2 +- ...-list-submission-element.component.spec.ts | 2 +- ...entry-list-submission-element.component.ts | 10 +-- ...-list-submission-element.component.spec.ts | 30 ++++---- ...esult-list-submission-element.component.ts | 16 ++--- ...-list-submission-element.component.spec.ts | 30 ++++---- ...esult-list-submission-element.component.ts | 14 ++-- .../external-login-method-entry.component.ts | 3 +- .../confirm-email.component.spec.ts | 14 ++-- .../confirm-email/confirm-email.component.ts | 26 +++---- .../external-log-in.component.spec.ts | 16 ++--- .../external-log-in.component.ts | 10 +-- .../guards/registration-token-guard.ts | 8 +-- .../guards/registration-token.guard.spec.ts | 8 +-- .../models/registration-data.mock.model.ts | 6 +- .../orcid-confirmation.component.ts | 2 +- .../registration-data.resolver.spec.ts | 4 +- .../resolvers/registration-data.resolver.ts | 8 +-- .../services/external-login.service.spec.ts | 8 +-- .../services/external-login.service.ts | 8 +-- .../external-login-page.component.spec.ts | 2 +- .../external-login-page.component.ts | 6 +- ...ogin-review-account-info-page.component.ts | 4 +- .../helpers/review-account.guard.spec.ts | 8 +-- .../helpers/review-account.guard.ts | 12 ++-- .../review-account-info.component.spec.ts | 14 ++-- .../review-account-info.component.ts | 22 +++--- src/app/footer/footer.component.spec.ts | 4 +- src/app/footer/footer.component.ts | 6 +- src/app/forbidden/forbidden.component.ts | 5 +- .../forgot-password-form.component.spec.ts | 8 +-- .../forgot-password-form.component.ts | 20 +++--- src/app/header/header.component.spec.ts | 2 +- src/app/health-page/health-page-routes.ts | 4 +- .../health-page/health-page.component.spec.ts | 2 +- src/app/health-page/health.service.ts | 7 +- .../home-coar/home-coar.component.ts | 12 ++-- src/app/home-page/home-page.component.ts | 2 +- src/app/home-page/home-page.resolver.ts | 5 +- .../recent-item-list.component.spec.ts | 14 ++-- .../recent-item-list.component.ts | 26 +++---- ...top-level-community-list.component.spec.ts | 22 +++--- .../top-level-community-list.component.ts | 18 ++--- .../import-external-page-routes.ts | 2 +- .../import-external-page.component.spec.ts | 2 +- .../accessibility-settings.component.spec.ts | 2 +- .../accessibility-settings.component.ts | 2 +- .../end-user-agreement.component.spec.ts | 6 +- .../end-user-agreement.component.ts | 6 +- .../feedback-form.component.spec.ts | 10 +-- .../feedback-form/feedback-form.component.ts | 24 +++---- src/app/info/info-routes.ts | 6 +- .../notify-info/notify-info.component.spec.ts | 2 +- .../info/notify-info/notify-info.component.ts | 3 +- src/app/init.service.spec.ts | 10 +-- src/app/init.service.ts | 10 +-- .../alerts/item-alerts.component.spec.ts | 8 +-- .../item-page/alerts/item-alerts.component.ts | 14 ++-- .../alerts/themed-item-alerts.component.ts | 2 +- ...ream-request-a-copy-page.component.spec.ts | 26 +++---- ...bitstream-request-a-copy-page.component.ts | 30 ++++---- .../upload/upload-bitstream.component.spec.ts | 18 ++--- .../upload/upload-bitstream.component.ts | 26 +++---- .../abstract-item-update.component.ts | 14 ++-- .../edit-item-operators.spec.ts | 4 +- .../edit-item-page/edit-item-operators.ts | 5 +- .../edit-item-page/edit-item-page-routes.ts | 2 +- .../edit-item-page.component.spec.ts | 2 +- .../edit-item-page.component.ts | 4 +- .../item-access-control.component.ts | 6 +- .../item-authorizations.component.spec.ts | 8 +-- .../item-authorizations.component.ts | 26 +++---- .../item-bitstreams.component.spec.ts | 22 +++--- .../item-bitstreams.component.ts | 28 ++++---- .../item-bitstreams.service.spec.ts | 18 ++--- .../item-bitstreams.service.ts | 34 ++++----- ...em-edit-bitstream-bundle.component.spec.ts | 16 ++--- .../item-edit-bitstream-bundle.component.ts | 28 ++++---- .../item-collection-mapper.component.spec.ts | 24 +++---- .../item-collection-mapper.component.ts | 38 +++++----- .../item-curate/item-curate.component.spec.ts | 4 +- .../item-curate/item-curate.component.ts | 6 +- .../item-delete/item-delete.component.spec.ts | 20 +++--- .../item-delete/item-delete.component.ts | 34 ++++----- .../item-move/item-move.component.spec.ts | 10 +-- .../item-move/item-move.component.ts | 28 ++++---- .../item-operation/itemOperation.model.ts | 2 +- .../item-page-access-control.guard.ts | 4 +- .../item-page-bitstreams.guard.ts | 4 +- .../item-page-collection-mapper.guard.ts | 4 +- .../edit-item-page/item-page-curate.guard.ts | 4 +- .../item-page-delete.guard.spec.ts | 4 +- .../edit-item-page/item-page-delete.guard.ts | 4 +- ...tem-page-edit-authorizations.guard.spec.ts | 4 +- .../item-page-edit-authorizations.guard.ts | 4 +- .../item-page-metadata.guard.ts | 4 +- .../item-page-move.guard.spec.ts | 4 +- .../edit-item-page/item-page-move.guard.ts | 4 +- .../item-page-private.guard.spec.ts | 4 +- .../edit-item-page/item-page-private.guard.ts | 4 +- .../item-page-register-doi.guard.ts | 4 +- .../item-page-reinstate.guard.ts | 4 +- .../item-page-relationships.guard.ts | 4 +- .../edit-item-page/item-page-status.guard.ts | 4 +- .../item-page-version-history.guard.ts | 4 +- .../item-page-withdraw.guard.ts | 4 +- .../item-private.component.spec.ts | 6 +- .../item-private/item-private.component.ts | 8 +-- .../item-public/item-public.component.spec.ts | 4 +- .../item-public/item-public.component.ts | 8 +-- .../item-register-doi.component.spec.ts | 6 +- .../item-register-doi.component.ts | 10 +-- .../item-reinstate.component.spec.ts | 4 +- .../item-reinstate.component.ts | 8 +-- .../edit-item-relationships.service.spec.ts | 30 ++++---- .../edit-item-relationships.service.ts | 42 +++++------ ...elationship-list-wrapper.component.spec.ts | 6 +- ...dit-relationship-list-wrapper.component.ts | 6 +- .../edit-relationship-list.component.spec.ts | 38 +++++----- .../edit-relationship-list.component.ts | 46 ++++++------ .../edit-relationship.component.spec.ts | 10 +-- .../edit-relationship.component.ts | 26 +++---- .../item-relationships.component.spec.ts | 26 +++---- .../item-relationships.component.ts | 28 ++++---- .../item-status/item-status.component.spec.ts | 12 ++-- .../item-status/item-status.component.ts | 24 +++---- .../item-version-history.component.spec.ts | 2 +- .../item-version-history.component.ts | 6 +- .../item-withdraw.component.spec.ts | 4 +- .../item-withdraw/item-withdraw.component.ts | 8 +-- .../modify-item-overview.component.spec.ts | 2 +- .../modify-item-overview.component.ts | 5 +- ...tract-simple-item-action.component.spec.ts | 6 +- .../abstract-simple-item-action.component.ts | 8 +-- .../virtual-metadata.component.spec.ts | 4 +- .../virtual-metadata.component.ts | 6 +- .../collections/collections.component.spec.ts | 20 +++--- .../collections/collections.component.ts | 24 +++---- .../metadata-uri-values.component.spec.ts | 2 +- .../metadata-uri-values.component.ts | 2 +- .../metadata-values.component.spec.ts | 2 +- .../metadata-values.component.ts | 6 +- .../full-file-section.component.spec.ts | 8 +-- .../full-file-section.component.ts | 14 ++-- .../themed-full-file-section.component.ts | 2 +- .../full/full-item-page.component.spec.ts | 18 ++--- .../full/full-item-page.component.ts | 18 ++--- .../item-page-administrator.guard.ts | 4 +- src/app/item-page/item-page-routes.ts | 6 +- src/app/item-page/item-page-routing-paths.ts | 5 +- src/app/item-page/item-page.resolver.spec.ts | 4 +- src/app/item-page/item-page.resolver.ts | 14 ++-- src/app/item-page/item.resolver.ts | 10 +-- .../media-viewer-image.component.spec.ts | 6 +- .../media-viewer-image.component.ts | 4 +- .../themed-media-viewer-image.component.ts | 2 +- .../media-viewer-video.component.spec.ts | 4 +- .../media-viewer-video.component.ts | 4 +- .../themed-media-viewer-video.component.ts | 4 +- .../media-viewer.component.spec.ts | 12 ++-- .../media-viewer/media-viewer.component.ts | 18 ++--- .../themed-media-viewer.component.ts | 2 +- .../mirador-viewer.component.spec.ts | 8 +-- .../mirador-viewer.component.ts | 6 +- .../mirador-viewer/mirador-viewer.service.ts | 18 ++--- .../orcid-auth/orcid-auth.component.spec.ts | 8 +-- .../orcid-auth/orcid-auth.component.ts | 18 ++--- .../orcid-page/orcid-page.component.spec.ts | 18 ++--- .../orcid-page/orcid-page.component.ts | 22 +++--- .../item-page/orcid-page/orcid-page.guard.ts | 4 +- .../orcid-queue/orcid-queue.component.spec.ts | 14 ++-- .../orcid-queue/orcid-queue.component.ts | 20 +++--- .../orcid-sync-settings.component.spec.ts | 6 +- .../orcid-sync-settings.component.ts | 16 ++--- ...ss-by-token-notification.component.spec.ts | 10 +-- .../access-by-token-notification.component.ts | 2 +- .../file-section.component.spec.ts | 8 +-- .../file-section/file-section.component.ts | 14 ++-- .../themed-file-section.component.ts | 2 +- ...item-page-abstract-field.component.spec.ts | 4 +- .../item-page-abstract-field.component.ts | 2 +- .../item-page-author-field.component.spec.ts | 4 +- .../item-page-author-field.component.ts | 2 +- .../item-page-date-field.component.spec.ts | 4 +- .../date/item-page-date-field.component.ts | 2 +- .../generic-item-page-field.component.spec.ts | 4 +- .../generic-item-page-field.component.ts | 2 +- ...ospatial-item-page-field.component.spec.ts | 4 +- .../geospatial-item-page-field.component.ts | 2 +- .../img/item-page-img-field.component.spec.ts | 4 +- .../img/item-page-img-field.component.ts | 2 +- .../item-page-field.component.spec.ts | 16 ++--- .../item-page-field.component.ts | 18 ++--- .../title/item-page-title-field.component.ts | 5 +- .../title/themed-item-page-field.component.ts | 2 +- .../uri/item-page-uri-field.component.spec.ts | 4 +- .../uri/item-page-uri-field.component.ts | 2 +- .../simple/item-page.component.spec.ts | 22 +++--- .../item-page/simple/item-page.component.ts | 30 ++++---- .../publication/publication.component.spec.ts | 40 +++++------ .../publication/publication.component.ts | 2 +- .../item-types/shared/item-iiif-utils.ts | 5 +- .../shared/item-relationships-utils.ts | 10 +-- .../item-types/shared/item.component.spec.ts | 54 +++++++------- .../item-types/shared/item.component.ts | 6 +- .../untyped-item.component.spec.ts | 40 +++++------ .../untyped-item/untyped-item.component.ts | 4 +- ...data-representation-list.component.spec.ts | 14 ++-- .../metadata-representation-list.component.ts | 18 ++--- ...-metadata-representation-list.component.ts | 2 +- .../notify-requests-status.component.ts | 10 +-- .../notify-requests-status.model.ts | 10 +-- .../notify-requests-status.resource-type.ts | 2 +- .../qa-event-notification.component.spec.ts | 12 ++-- .../qa-event-notification.component.ts | 16 ++--- .../related-entities-search.component.spec.ts | 2 +- .../related-entities-search.component.ts | 2 +- ...-related-entities-search.component.spec.ts | 2 +- ...abbed-related-entities-search.component.ts | 2 +- .../related-items/related-items-component.ts | 12 ++-- .../related-items.component.spec.ts | 4 +- .../version-page.component.spec.ts | 8 +-- .../version-page/version-page.component.ts | 20 +++--- .../version-page/version.resolver.ts | 10 +-- ...ions-row-element-version.component.spec.ts | 18 ++--- ...-versions-row-element-version.component.ts | 32 ++++----- .../item-versions-shared.service.spec.ts | 12 ++-- .../versions/item-versions-shared.service.ts | 4 +- .../versions/item-versions.component.spec.ts | 26 +++---- .../versions/item-versions.component.ts | 36 +++++----- .../item-versions-notice.component.spec.ts | 8 +-- .../notice/item-versions-notice.component.ts | 20 +++--- src/app/login-page/login-page-routes.ts | 2 +- .../login-page/login-page.component.spec.ts | 4 +- src/app/login-page/login-page.component.ts | 16 ++--- src/app/logout-page/logout-page-routes.ts | 2 +- src/app/lookup-by-id/lookup-guard.spec.ts | 2 +- src/app/lookup-by-id/lookup-guard.ts | 9 ++- .../collection-selector.component.spec.ts | 12 ++-- .../my-dspace-configuration.service.spec.ts | 10 +-- .../my-dspace-configuration.service.ts | 26 +++---- ...ce-new-external-dropdown.component.spec.ts | 8 +-- ...-dspace-new-external-dropdown.component.ts | 10 +-- ...-new-submission-dropdown.component.spec.ts | 8 +-- ...space-new-submission-dropdown.component.ts | 10 +-- ...my-dspace-new-submission.component.spec.ts | 10 +-- .../my-dspace-new-submission.component.ts | 6 +- .../my-dspace-page/my-dspace-page-routes.ts | 2 +- .../my-dspace-page.component.spec.ts | 6 +- .../my-dspace-page.component.ts | 12 ++-- ...-qa-events-notifications.component.spec.ts | 2 +- ...space-qa-events-notifications.component.ts | 12 ++-- src/app/navbar/navbar.component.spec.ts | 18 ++--- src/app/navbar/navbar.component.ts | 6 +- .../notifications-state.service.ts | 4 +- .../ePerson-data.component.spec.ts | 2 +- .../ePerson-data/ePerson-data.component.ts | 9 ++- ...quality-assurance-events.component.spec.ts | 20 +++--- .../quality-assurance-events.component.ts | 46 ++++++------ ...oject-entry-import-modal.component.spec.ts | 8 +-- .../project-entry-import-modal.component.ts | 20 +++--- .../quality-assurance-source.actions.ts | 2 +- ...quality-assurance-source.component.spec.ts | 2 +- .../quality-assurance-source.component.ts | 6 +- .../quality-assurance-source.effects.ts | 6 +- .../quality-assurance-source.reducer.ts | 3 +- .../quality-assurance-source.service.spec.ts | 16 ++--- .../quality-assurance-source.service.ts | 19 +++-- .../quality-assurance-topics.actions.ts | 2 +- ...quality-assurance-topics.component.spec.ts | 2 +- .../quality-assurance-topics.component.ts | 18 ++--- .../quality-assurance-topics.effects.ts | 6 +- .../quality-assurance-topics.reducer.ts | 3 +- .../quality-assurance-topics.service.spec.ts | 18 ++--- .../quality-assurance-topics.service.ts | 22 +++--- src/app/notifications/selectors.ts | 4 +- .../actions/suggestion-actions.component.ts | 6 +- .../suggestion-approve-and-import.ts | 2 +- .../suggestion-evidences.component.ts | 2 +- .../suggestion-list-element.component.spec.ts | 2 +- .../suggestion-list-element.component.ts | 2 +- .../suggestions-notification.component.ts | 2 +- .../popup/suggestions-popup.component.ts | 2 +- .../suggestion-sources.component.spec.ts | 18 ++--- .../sources/suggestion-sources.component.ts | 12 ++-- .../suggestions/suggestions.service.spec.ts | 24 +++---- .../suggestions/suggestions.service.ts | 44 ++++++------ .../publication-claim.component.ts | 4 +- .../suggestions/targets/selectors.ts | 2 +- .../targets/suggestion-targets.actions.ts | 2 +- .../targets/suggestion-targets.effects.ts | 12 ++-- .../targets/suggestion-targets.reducer.ts | 3 +- .../suggestion-targets.state.service.ts | 2 +- .../page-internal-server-error.component.ts | 3 +- .../pagenotfound/pagenotfound.component.ts | 5 +- .../detail/process-detail.component.spec.ts | 12 ++-- .../detail/process-detail.component.ts | 32 ++++----- .../form/process-form.component.spec.ts | 4 +- .../form/process-form.component.ts | 6 +- .../scripts-select.component.spec.ts | 4 +- .../scripts-select.component.ts | 14 ++-- .../new/new-process.component.spec.ts | 8 +-- .../process-page/new/new-process.component.ts | 6 +- .../overview/process-bulk-delete.service.ts | 6 +- .../process-overview.component.spec.ts | 2 +- .../overview/process-overview.service.ts | 16 ++--- .../process-overview-table.component.spec.ts | 12 ++-- .../table/process-overview-table.component.ts | 26 +++---- .../process-breadcrumb.resolver.spec.ts | 3 +- .../process-breadcrumb.resolver.ts | 6 +- .../process-breadcrumbs.service.ts | 2 +- src/app/process-page/process-page-routes.ts | 4 +- .../process-page-routing.paths.ts | 2 +- src/app/process-page/process-page.resolver.ts | 6 +- .../process-page/processes/filetypes.model.ts | 6 +- .../processes/filetypes.resource-type.ts | 2 +- .../process-page/processes/process.model.ts | 26 +++---- .../processes/process.resource-type.ts | 2 +- src/app/process-page/scripts/script.model.ts | 10 +-- .../scripts/script.resource-type.ts | 2 +- ...profile-claim-item-modal.component.spec.ts | 2 +- .../profile-claim-item-modal.component.ts | 14 ++-- .../profile-claim.service.spec.ts | 6 +- .../profile-claim/profile-claim.service.ts | 10 +-- ...ofile-page-metadata-form.component.spec.ts | 6 +- .../profile-page-metadata-form.component.ts | 12 ++-- ...ed-profile-page-metadata-form.component.ts | 2 +- ...ile-page-researcher-form.component.spec.ts | 8 +-- .../profile-page-researcher-form.component.ts | 20 +++--- src/app/profile-page/profile-page-routes.ts | 2 +- ...ofile-page-security-form.component.spec.ts | 4 +- .../profile-page-security-form.component.ts | 2 +- .../profile-page.component.spec.ts | 18 ++--- .../profile-page/profile-page.component.ts | 36 +++++----- .../notifications-pages-routes.ts | 6 +- .../quality-assurance-source-data.resolver.ts | 4 +- .../register-email-form.component.spec.ts | 12 ++-- .../register-email-form.component.ts | 28 ++++---- .../register-email-form.module.ts | 9 --- .../registration.resolver.spec.ts | 4 +- .../registration.resolver.ts | 9 ++- .../create-profile.component.spec.ts | 18 ++--- .../create-profile.component.ts | 28 ++++---- src/app/register-page/register-page-routes.ts | 2 +- .../register-page/registration.guard.spec.ts | 8 +-- src/app/register-page/registration.guard.ts | 9 ++- .../deny-request-copy.component.spec.ts | 14 ++-- .../deny-request-copy.component.ts | 26 +++---- .../grant-deny-request-copy.component.spec.ts | 10 +-- .../grant-deny-request-copy.component.ts | 22 +++--- .../grant-request-copy.component.spec.ts | 16 ++--- .../grant-request-copy.component.ts | 22 +++--- .../request-copy-routing-paths.ts | 3 +- src/app/request-copy/request-copy.resolver.ts | 9 ++- src/app/root/root.component.ts | 8 +-- .../search-navbar.component.spec.ts | 2 +- .../search-navbar/search-navbar.component.ts | 2 +- ...onfiguration-search-page.component.spec.ts | 4 +- .../configuration-search-page.component.ts | 6 +- src/app/search-page/search-page-routes.ts | 2 +- src/app/search-page/search-page.component.ts | 2 +- ...med-configuration-search-page.component.ts | 4 +- .../abstract-component-loader.component.ts | 2 +- .../access-control-array-form.component.ts | 2 +- ...s-control-form-container.component.spec.ts | 4 +- ...access-control-form-container.component.ts | 12 ++-- .../bulk-access-control.service.spec.ts | 2 +- .../bulk-access-control.service.ts | 6 +- ...-select-bitstreams-modal.component.spec.ts | 14 ++-- ...ntrol-select-bitstreams-modal.component.ts | 6 +- .../auth-nav-menu.component.spec.ts | 14 ++-- .../auth-nav-menu/auth-nav-menu.component.ts | 20 +++--- .../user-menu/user-menu.component.spec.ts | 14 ++-- .../user-menu/user-menu.component.ts | 8 +-- .../browse-by/browse-by.component.spec.ts | 32 ++++----- .../shared/browse-by/browse-by.component.ts | 18 ++--- .../browse-by/themed-browse-by.component.ts | 10 +-- .../collection-dropdown.component.spec.ts | 10 +-- .../collection-dropdown.component.ts | 22 +++--- .../comcol-form/comcol-form.component.spec.ts | 10 +-- .../comcol-form/comcol-form.component.ts | 30 ++++---- .../create-comcol-page.component.spec.ts | 10 +-- .../create-comcol-page.component.ts | 22 +++--- .../delete-comcol-page.component.spec.ts | 6 +- .../delete-comcol-page.component.ts | 14 ++-- .../comcol-metadata.component.spec.ts | 4 +- .../comcol-metadata.component.ts | 20 +++--- .../comcol-role/comcol-role.component.spec.ts | 6 +- .../comcol-role/comcol-role.component.ts | 26 +++---- .../edit-comcol-page.component.spec.ts | 4 +- .../edit-comcol-page.component.ts | 4 +- .../comcol-page-browse-by.component.ts | 10 +-- .../comcol-page-logo.component.ts | 3 +- .../comcol-browse-by.component.spec.ts | 4 +- .../comcol-browse-by.component.ts | 2 +- .../comcol-search-section.component.ts | 8 +-- .../cookies/browser-orejime.service.spec.ts | 16 ++--- .../shared/cookies/browser-orejime.service.ts | 22 +++--- .../shared/cookies/orejime-configuration.ts | 13 ++-- ...tem-withdrawn-reinstate-modal.component.ts | 2 +- .../dso-edit-menu.component.spec.ts | 4 +- .../dso-versioning-modal.service.spec.ts | 10 +-- .../dso-versioning-modal.service.ts | 24 +++---- .../dso-withdrawn-reinstate-modal.service.ts | 14 ++-- ...ized-collection-selector.component.spec.ts | 8 +-- ...uthorized-collection-selector.component.ts | 24 +++---- .../dso-selector.component.spec.ts | 12 ++-- .../dso-selector/dso-selector.component.ts | 32 ++++----- ...llection-parent-selector.component.spec.ts | 4 +- ...te-collection-parent-selector.component.ts | 12 ++-- ...ommunity-parent-selector.component.spec.ts | 6 +- ...ate-community-parent-selector.component.ts | 16 ++--- ...ate-item-parent-selector.component.spec.ts | 4 +- .../create-item-parent-selector.component.ts | 12 ++-- ...d-create-item-parent-selector.component.ts | 4 +- ...o-selector-modal-wrapper.component.spec.ts | 8 +-- .../dso-selector-modal-wrapper.component.ts | 8 +-- ...edit-collection-selector.component.spec.ts | 4 +- .../edit-collection-selector.component.ts | 12 ++-- .../edit-community-selector.component.spec.ts | 4 +- .../edit-community-selector.component.ts | 12 ++-- .../edit-item-selector.component.spec.ts | 4 +- .../edit-item-selector.component.ts | 6 +- .../export-batch-selector.component.spec.ts | 18 ++--- .../export-batch-selector.component.ts | 24 +++---- ...export-metadata-selector.component.spec.ts | 16 ++--- .../export-metadata-selector.component.ts | 26 +++---- .../import-batch-selector.component.spec.ts | 16 ++--- .../import-batch-selector.component.ts | 6 +- .../entity-dropdown.component.spec.ts | 4 +- .../entity-dropdown.component.ts | 12 ++-- .../eperson-group-list.component.spec.ts | 18 ++--- .../eperson-group-list.component.ts | 34 ++++----- .../file-download-link.component.spec.ts | 12 ++-- .../file-download-link.component.ts | 12 ++-- .../themed-file-download-link.component.ts | 4 +- ...c-form-control-container.component.spec.ts | 10 +-- ...ynamic-form-control-container.component.ts | 44 ++++++------ ...ng-metadata-list-element.component.spec.ts | 4 +- ...xisting-metadata-list-element.component.ts | 18 ++--- ...ng-relation-list-element.component.spec.ts | 4 +- ...xisting-relation-list-element.component.ts | 12 ++-- .../dynamic-form-array.component.ts | 2 +- .../models/date-picker/date-picker.model.ts | 2 +- .../models/ds-dynamic-concat.model.ts | 2 +- .../models/ds-dynamic-input.model.ts | 2 +- .../models/dynamic-vocabulary.component.ts | 6 +- .../list/dynamic-list-checkbox-group.model.ts | 4 +- .../list/dynamic-list-radio-group.model.ts | 4 +- .../list/dynamic-list.component.spec.ts | 10 +-- .../models/list/dynamic-list.component.ts | 10 +-- .../lookup/dynamic-lookup.component.spec.ts | 6 +- .../models/lookup/dynamic-lookup.component.ts | 18 ++--- .../onebox/dynamic-onebox.component.spec.ts | 6 +- .../models/onebox/dynamic-onebox.component.ts | 22 +++--- .../dynamic-relation-group.component.spec.ts | 10 +-- .../dynamic-relation-group.components.ts | 8 +-- .../dynamic-relation-group.model.ts | 2 +- ...amic-scrollable-dropdown.component.spec.ts | 6 +- .../dynamic-scrollable-dropdown.component.ts | 22 +++--- .../dynamic-scrollable-dropdown.model.ts | 4 +- .../models/tag/dynamic-tag.component.spec.ts | 6 +- .../models/tag/dynamic-tag.component.ts | 16 ++--- ...ic-lookup-relation-modal.component.spec.ts | 20 +++--- ...dynamic-lookup-relation-modal.component.ts | 34 ++++----- ...tion-external-source-tab.component.spec.ts | 16 ++--- ...-relation-external-source-tab.component.ts | 24 +++---- ...ource-entry-import-modal.component.spec.ts | 10 +-- ...nal-source-entry-import-modal.component.ts | 28 ++++---- ...-relation-external-source-tab.component.ts | 8 +-- .../relationship.actions.ts | 4 +- .../relationship.effects.spec.ts | 26 +++---- .../relationship.effects.ts | 34 ++++----- ...okup-relation-search-tab.component.spec.ts | 16 ++--- ...ic-lookup-relation-search-tab.component.ts | 30 ++++---- ...ic-lookup-relation-search-tab.component.ts | 8 +-- ...p-relation-selection-tab.component.spec.ts | 20 +++--- ...lookup-relation-selection-tab.component.ts | 20 +++--- .../form/builder/form-builder.service.spec.ts | 10 +-- .../form/builder/form-builder.service.ts | 8 +-- .../models/form-field-metadata-value.model.ts | 5 +- .../form/builder/models/form-field.model.ts | 4 +- .../form/builder/parsers/field-parser.ts | 8 +-- .../parsers/relation-group-field-parser.ts | 3 +- .../form/builder/parsers/row-parser.spec.ts | 2 +- .../shared/form/builder/parsers/row-parser.ts | 6 +- .../shared/form/chips/chips.component.spec.ts | 2 +- .../form/chips/models/chips-item.model.ts | 2 +- .../shared/form/chips/models/chips.model.ts | 2 +- .../authority-confidence-state.directive.ts | 8 +-- src/app/shared/form/form.component.spec.ts | 2 +- ...ocabulary-treeview-modal.component.spec.ts | 2 +- .../vocabulary-treeview-modal.component.ts | 4 +- .../vocabulary-treeview-node.model.ts | 5 +- .../vocabulary-treeview.component.spec.ts | 10 +-- .../vocabulary-treeview.component.ts | 14 ++-- .../vocabulary-treeview.service.spec.ts | 12 ++-- .../vocabulary-treeview.service.ts | 20 +++--- .../google-recaptcha.component.spec.ts | 4 +- .../google-recaptcha.component.ts | 4 +- src/app/shared/handle.service.spec.ts | 4 +- src/app/shared/handle.service.ts | 8 +-- .../idle-modal/idle-modal.component.spec.ts | 4 +- .../shared/idle-modal/idle-modal.component.ts | 4 +- .../impersonate-navbar.component.spec.ts | 6 +- .../impersonate-navbar.component.ts | 4 +- .../dso-input-suggestions.component.spec.ts | 2 +- .../dso-input-suggestions.component.ts | 6 +- .../validation-suggestions.component.spec.ts | 4 +- .../validation-suggestions.component.ts | 4 +- .../lang-switch/lang-switch.component.spec.ts | 2 +- .../lang-switch/lang-switch.component.ts | 2 +- .../live-region/live-region.service.spec.ts | 2 +- .../shared/live-region/live-region.service.ts | 2 +- .../log-in-container.component.spec.ts | 12 ++-- .../container/log-in-container.component.ts | 2 +- .../shared/log-in/log-in.component.spec.ts | 10 +-- src/app/shared/log-in/log-in.component.ts | 20 +++--- ...log-in-external-provider.component.spec.ts | 12 ++-- .../log-in-external-provider.component.ts | 24 +++---- .../methods/log-in.methods-decorator.ts | 3 +- .../methods/log-in.methods-decorator.utils.ts | 3 +- .../log-in-password.component.spec.ts | 12 ++-- .../password/log-in-password.component.ts | 28 ++++---- .../shared/log-in/themed-log-in.component.ts | 2 +- .../shared/log-out/log-out.component.spec.ts | 4 +- src/app/shared/log-out/log-out.component.ts | 4 +- .../abstract-menu-section.component.ts | 2 +- src/app/shared/menu/menu.component.spec.ts | 6 +- src/app/shared/menu/menu.component.ts | 4 +- .../providers/access-control.menu.spec.ts | 6 +- .../menu/providers/access-control.menu.ts | 6 +- .../menu/providers/admin-search.menu.spec.ts | 2 +- .../menu/providers/admin-search.menu.ts | 4 +- .../shared/menu/providers/browse.menu.spec.ts | 6 +- src/app/shared/menu/providers/browse.menu.ts | 10 +-- .../menu/providers/coar-notify.menu.spec.ts | 2 +- .../shared/menu/providers/coar-notify.menu.ts | 4 +- .../providers/comcol-subscribe.menu.spec.ts | 4 +- .../menu/providers/comcol-subscribe.menu.ts | 6 +- .../menu/providers/create-report.menu.spec.ts | 8 +-- .../menu/providers/create-report.menu.ts | 12 ++-- .../menu/providers/curation.menu.spec.ts | 2 +- .../shared/menu/providers/curation.menu.ts | 4 +- .../menu/providers/dso-edit.menu.spec.ts | 8 +-- .../shared/menu/providers/dso-edit.menu.ts | 8 +-- .../menu/providers/dso-option.menu.spec.ts | 4 +- .../shared/menu/providers/edit.menu.spec.ts | 4 +- src/app/shared/menu/providers/edit.menu.ts | 4 +- .../shared/menu/providers/export.menu.spec.ts | 4 +- src/app/shared/menu/providers/export.menu.ts | 12 ++-- .../shared/menu/providers/health.menu.spec.ts | 2 +- src/app/shared/menu/providers/health.menu.ts | 4 +- .../helper-providers/dso.menu.spec.ts | 8 +-- .../providers/helper-providers/dso.menu.ts | 4 +- .../route-context.menu.spec.ts | 2 +- .../shared/menu/providers/import.menu.spec.ts | 4 +- src/app/shared/menu/providers/import.menu.ts | 12 ++-- .../menu/providers/item-claim.menu.spec.ts | 8 +-- .../shared/menu/providers/item-claim.menu.ts | 10 +-- .../menu/providers/item-orcid.menu.spec.ts | 8 +-- .../shared/menu/providers/item-orcid.menu.ts | 8 +-- .../providers/item-versioning.menu.spec.ts | 6 +- .../menu/providers/item-versioning.menu.ts | 6 +- .../shared/menu/providers/new.menu.spec.ts | 4 +- src/app/shared/menu/providers/new.menu.ts | 4 +- .../menu/providers/notifications.menu.spec.ts | 4 +- .../menu/providers/notifications.menu.ts | 4 +- .../menu/providers/processes.menu.spec.ts | 2 +- .../shared/menu/providers/processes.menu.ts | 4 +- .../menu/providers/registries.menu.spec.ts | 4 +- .../shared/menu/providers/registries.menu.ts | 6 +- .../menu/providers/statistics.menu.spec.ts | 6 +- .../shared/menu/providers/statistics.menu.ts | 6 +- .../providers/system-wide-alert.menu.spec.ts | 2 +- .../menu/providers/system-wide-alert.menu.ts | 4 +- .../withdrawn-reinstate-item.menu.spec.ts | 8 +-- .../withdrawn-reinstate-item.menu.ts | 12 ++-- .../menu/providers/workflow.menu.spec.ts | 2 +- .../shared/menu/providers/workflow.menu.ts | 4 +- ...ta-representation-loader.component.spec.ts | 6 +- ...etadata-representation-loader.component.ts | 8 +-- .../metadata-representation.decorator.spec.ts | 4 +- .../metadata-representation.decorator.ts | 6 +- src/app/shared/mocks/dso-name.service.mock.ts | 2 +- .../endpoint-mocking-rest.service.spec.ts | 2 +- .../endpoint-mocking-rest.service.ts | 12 ++-- .../mocks/external-source.service.mock.ts | 6 +- .../mocks/find-id-config-data.service.mock.ts | 3 +- src/app/shared/mocks/form-models.mock.ts | 8 +-- .../mocks/href-only-data.service.mock.ts | 4 +- src/app/shared/mocks/item.mock.ts | 8 +-- src/app/shared/mocks/link-service.mock.ts | 2 +- .../mocks/mock-resource-policy-service.ts | 2 +- src/app/shared/mocks/notifications.mock.ts | 16 ++--- .../shared/mocks/object-cache.service.mock.ts | 2 +- .../mocks/publication-claim-targets.mock.ts | 4 +- .../shared/mocks/publication-claim.mock.ts | 4 +- .../mocks/remote-data-build.service.mock.ts | 16 ++--- src/app/shared/mocks/request.service.mock.ts | 5 +- src/app/shared/mocks/role-service.mock.ts | 3 +- src/app/shared/mocks/search-service.mock.ts | 3 +- .../section-accesses-config.service.mock.ts | 5 +- .../mocks/section-accesses.service.mock.ts | 3 +- .../section-sherpa-policies.service.mock.ts | 2 +- .../mocks/section-upload.service.mock.ts | 2 +- src/app/shared/mocks/submission.mock.ts | 9 +-- src/app/shared/mocks/suggestion.mock.ts | 4 +- src/app/shared/mocks/uuid.service.mock.ts | 2 +- ...claimed-task-actions-abstract.component.ts | 8 +-- ...claimed-task-actions-abstract.component.ts | 18 ++--- ...med-task-actions-approve.component.spec.ts | 14 ++-- .../claimed-task-actions-approve.component.ts | 10 +-- .../claimed-task-actions.component.spec.ts | 16 ++--- .../claimed-task-actions.component.ts | 18 ++--- ...ask-actions-decline-task.component.spec.ts | 10 +-- ...med-task-actions-decline-task.component.ts | 6 +- ...sk-actions-edit-metadata.component.spec.ts | 10 +-- ...ed-task-actions-edit-metadata.component.ts | 4 +- ...aimed-task-action-rating.component.spec.ts | 10 +-- ...ed-claimed-task-action-rating.component.ts | 4 +- ...imed-task-actions-reject.component.spec.ts | 12 ++-- .../claimed-task-actions-reject.component.ts | 8 +-- ...k-actions-return-to-pool.component.spec.ts | 12 ++-- ...d-task-actions-return-to-pool.component.ts | 10 +-- ...k-action-select-reviewer.component.spec.ts | 10 +-- ...d-task-action-select-reviewer.component.ts | 4 +- ...imed-task-actions-loader.component.spec.ts | 16 ++--- .../claimed-task-actions-loader.component.ts | 8 +-- .../item/item-actions.component.spec.ts | 8 +-- .../item/item-actions.component.ts | 8 +-- .../mydspace-actions-service.factory.ts | 26 +++---- .../mydspace-actions/mydspace-actions.ts | 14 ++-- .../mydspace-reloadable-actions.spec.ts | 16 ++--- .../mydspace-reloadable-actions.ts | 16 ++--- .../pool-task-actions.component.spec.ts | 16 ++--- .../pool-task/pool-task-actions.component.ts | 20 +++--- .../workflowitem-actions.component.spec.ts | 10 +-- .../workflowitem-actions.component.ts | 8 +-- .../workspaceitem-actions.component.spec.ts | 16 ++--- .../workspaceitem-actions.component.ts | 26 +++---- .../shared/ng-for-track-by-id.directive.ts | 3 +- .../notification-box.component.ts | 2 +- .../object-collection.component.spec.ts | 2 +- .../object-collection.component.ts | 18 ++--- .../access-status-badge.component.spec.ts | 4 +- .../access-status-badge.component.ts | 2 +- .../themed-access-status-badge.component.ts | 2 +- .../shared/badges/badges.component.ts | 2 +- .../my-dspace-status-badge.component.spec.ts | 6 +- .../status-badge.component.spec.ts | 2 +- .../status-badge/status-badge.component.ts | 2 +- .../themed-status-badge.component.ts | 2 +- .../shared/badges/themed-badges.component.ts | 2 +- .../type-badge/themed-type-badge.component.ts | 2 +- .../type-badge/type-badge.component.spec.ts | 2 +- .../badges/type-badge/type-badge.component.ts | 4 +- ...aimed-approved-task-search-result.model.ts | 3 +- ...aimed-declined-task-search-result.model.ts | 3 +- ...-declined-task-task-search-result.model.ts | 3 +- .../claimed-task-search-result.model.ts | 3 +- .../shared/collection-search-result.model.ts | 3 +- .../shared/community-search-result.model.ts | 3 +- .../shared/item-search-result.model.ts | 7 +- .../shared/listable-object.model.ts | 4 +- ...-object-component-loader.component.spec.ts | 18 ++--- ...table-object-component-loader.component.ts | 8 +-- .../listable-object.decorator.spec.ts | 5 +- .../listable-object.decorator.ts | 6 +- .../item-collection.component.ts | 12 ++-- .../item-submitter.component.spec.ts | 6 +- .../item-submitter.component.ts | 12 ++-- .../abstract-listable-element.component.ts | 8 +-- ...bjects-collection-tabulatable.component.ts | 8 +-- .../shared/pool-task-search-result.model.ts | 3 +- ...ctable-list-item-control.component.spec.ts | 2 +- ...bulatable-objects-loader.component.spec.ts | 6 +- .../tabulatable-objects-loader.component.ts | 8 +-- .../tabulatable-objects.decorator.spec.ts | 5 +- .../tabulatable-objects.decorator.ts | 7 +- .../workflow-item-search-result.model.ts | 3 +- .../workspace-item-search-result.model.ts | 3 +- ...ch-result-detail-element.component.spec.ts | 14 ++-- ...-search-result-detail-element.component.ts | 18 ++--- ...tem-detail-preview-field.component.spec.ts | 2 +- .../item-detail-preview-field.component.ts | 4 +- ...med-item-detail-preview-field.component.ts | 2 +- .../item-detail-preview.component.spec.ts | 42 +++++------ .../item-detail-preview.component.ts | 16 ++--- ...ch-result-detail-element.component.spec.ts | 6 +- ...-search-result-detail-element.component.ts | 6 +- ...ch-result-detail-element.component.spec.ts | 12 ++-- ...-search-result-detail-element.component.ts | 18 ++--- .../search-result-detail-element.component.ts | 4 +- ...ch-result-detail-element.component.spec.ts | 10 +-- ...-search-result-detail-element.component.ts | 12 ++-- ...ch-result-detail-element.component.spec.ts | 8 +-- ...-search-result-detail-element.component.ts | 14 ++-- .../object-detail.component.spec.ts | 6 +- .../object-detail/object-detail.component.ts | 14 ++-- .../object-geospatial-map.component.spec.ts | 6 +- .../object-geospatial-map.component.ts | 6 +- .../collection-grid-element.component.spec.ts | 8 +-- .../collection-grid-element.component.ts | 8 +-- .../community-grid-element.component.spec.ts | 4 +- .../community-grid-element.component.ts | 8 +-- .../item/item-grid-element.component.spec.ts | 8 +-- .../item/item-grid-element.component.ts | 4 +- .../object-grid/object-grid.component.ts | 16 ++--- ...arch-result-grid-element.component.spec.ts | 26 +++---- ...on-search-result-grid-element.component.ts | 10 +-- ...arch-result-grid-element.component.spec.ts | 34 ++++----- ...ty-search-result-grid-element.component.ts | 10 +-- ...arch-result-grid-element.component.spec.ts | 26 +++---- ...em-search-result-grid-element.component.ts | 8 +-- .../search-result-grid-element.component.ts | 8 +-- .../bitstream-list-item.component.spec.ts | 2 +- .../bitstream-list-item.component.ts | 6 +- ...rowse-entry-list-element.component.spec.ts | 8 +-- .../browse-entry-list-element.component.ts | 8 +-- .../bundle-list-element.component.ts | 4 +- .../collection-list-element.component.spec.ts | 4 +- .../collection-list-element.component.ts | 4 +- .../community-list-element.component.spec.ts | 4 +- .../community-list-element.component.ts | 6 +- .../duplicate-data/duplicate.model.ts | 8 +-- .../identifier-data.component.ts | 2 +- .../item/item-list-element.component.spec.ts | 10 +-- .../item/item-list-element.component.ts | 4 +- .../listable-notification-object.component.ts | 2 +- .../listable-notification-object.model.ts | 9 +-- ...table-notification-object.resource-type.ts | 2 +- ...nk-metadata-list-element.component.spec.ts | 6 +- ...se-link-metadata-list-element.component.ts | 2 +- ...em-metadata-list-element.component.spec.ts | 4 +- .../item-metadata-list-element.component.ts | 2 +- ...a-representation-list-element.component.ts | 2 +- ...resentation-list-element.component.spec.ts | 2 +- ...a-representation-list-element.component.ts | 5 +- ...xt-metadata-list-element.component.spec.ts | 2 +- ...in-text-metadata-list-element.component.ts | 2 +- ...arch-result-list-element.component.spec.ts | 12 ++-- ...ed-search-result-list-element.component.ts | 12 ++-- ...arch-result-list-element.component.spec.ts | 12 ++-- ...ed-search-result-list-element.component.ts | 14 ++-- ...arch-result-list-element.component.spec.ts | 10 +-- ...sk-search-result-list-element.component.ts | 14 ++-- ...arch-result-list-element.component.spec.ts | 22 +++--- ...ed-search-result-list-element.component.ts | 28 ++++---- .../item-list-preview.component.spec.ts | 2 +- .../item-list-preview.component.ts | 4 +- .../themed-item-list-preview.component.ts | 2 +- ...-list-element-submission.component.spec.ts | 6 +- ...esult-list-element-submission.component.ts | 6 +- ...arch-result-list-element.component.spec.ts | 20 +++--- ...ol-search-result-list-element.component.ts | 28 ++++---- ...arch-result-list-element.component.spec.ts | 12 ++-- ...em-search-result-list-element.component.ts | 14 ++-- ...arch-result-list-element.component.spec.ts | 12 ++-- ...em-search-result-list-element.component.ts | 14 ++-- .../object-list/object-list.component.ts | 12 ++-- ...arch-result-list-element.component.spec.ts | 8 +-- ...on-search-result-list-element.component.ts | 4 +- ...arch-result-list-element.component.spec.ts | 8 +-- ...ty-search-result-list-element.component.ts | 4 +- ...arch-result-list-element.component.spec.ts | 8 +-- ...em-search-result-list-element.component.ts | 4 +- .../search-result-list-element.component.ts | 6 +- ...ulatable-result-list-elements.component.ts | 2 +- ...ebar-search-list-element.component.spec.ts | 5 +- ...n-sidebar-search-list-element.component.ts | 6 +- ...ebar-search-list-element.component.spec.ts | 3 +- ...y-sidebar-search-list-element.component.ts | 6 +- ...ebar-search-list-element.component.spec.ts | 5 +- ...n-sidebar-search-list-element.component.ts | 6 +- ...ebar-search-list-element.component.spec.ts | 10 +-- .../sidebar-search-list-element.component.ts | 12 ++-- .../themed-object-list.component.ts | 10 +-- .../collection-select.component.spec.ts | 16 ++--- .../collection-select.component.ts | 6 +- .../item-select/item-select.component.spec.ts | 18 ++--- .../item-select/item-select.component.ts | 6 +- .../object-select/object-select.model.ts | 3 +- .../object-select/object-select.component.ts | 14 ++-- .../object-table/object-table.component.ts | 16 ++--- .../orcid-badge-and-tooltip.component.spec.ts | 2 +- .../orcid-badge-and-tooltip.component.ts | 3 +- .../page-size-selector.component.spec.ts | 10 +-- .../page-size-selector.component.ts | 4 +- .../pagination/pagination.component.spec.ts | 12 ++-- .../shared/pagination/pagination.component.ts | 18 ++--- src/app/shared/pagination/pagination.utils.ts | 3 +- .../paginationChangeEvent.interface.ts | 3 +- src/app/shared/remote-data.utils.ts | 4 +- .../resource-policy-create.component.spec.ts | 10 +-- .../resource-policy-create.component.ts | 12 ++-- .../resource-policy-edit.component.spec.ts | 10 +-- .../edit/resource-policy-edit.component.ts | 10 +-- .../resource-policy-entry.component.spec.ts | 10 +-- .../entry/resource-policy-entry.component.ts | 20 +++--- .../resource-policy-form.component.spec.ts | 20 +++--- .../form/resource-policy-form.component.ts | 18 ++--- .../form/resource-policy-form.model.ts | 4 +- .../resource-policy-target.resolver.ts | 12 ++-- .../resolvers/resource-policy.resolver.ts | 8 +-- .../resource-policies.component.spec.ts | 26 +++---- .../resource-policies.component.ts | 14 ++-- src/app/shared/roles/role.directive.ts | 4 +- src/app/shared/rss-feed/rss.component.spec.ts | 24 +++---- src/app/shared/rss-feed/rss.component.ts | 16 ++--- .../sass-helper/css-variable.service.spec.ts | 4 +- .../sass-helper/css-variable.service.ts | 10 +-- .../scope-selector-modal.component.spec.ts | 4 +- .../scope-selector-modal.component.ts | 14 ++-- .../search-form/search-form.component.spec.ts | 14 ++-- .../search-form/search-form.component.ts | 16 ++--- .../advanced-search.component.spec.ts | 6 +- .../advanced-search.component.ts | 8 +-- .../models/facet-config-response.model.ts | 8 +-- .../shared/search/models/facet-value.model.ts | 5 +- .../search/models/facet-values.model.ts | 6 +- .../paginated-search-options.model.spec.ts | 5 +- .../models/paginated-search-options.model.ts | 7 +- .../models/search-filter-config.model.ts | 8 +-- .../search/models/search-objects.model.ts | 8 +-- .../models/search-options.model.spec.ts | 3 +- .../search/models/search-options.model.ts | 7 +- .../models/search-query-response.model.ts | 4 +- .../search/models/search-result.model.ts | 20 +++--- .../facet-config-response.resouce-type.ts | 2 +- .../types/facet-values.resource-type.ts | 2 +- .../search-filter-config.resource-type.ts | 2 +- .../types/search-objects.resource-type.ts | 2 +- .../types/search-result.resource-type.ts | 2 +- .../search-export-csv.component.spec.ts | 6 +- .../search-export-csv.component.ts | 14 ++-- .../search-facet-option.component.spec.ts | 10 +-- .../search-facet-option.component.ts | 10 +-- ...earch-facet-range-option.component.spec.ts | 8 +-- .../search-facet-range-option.component.ts | 8 +-- ...ch-facet-selected-option.component.spec.ts | 8 +-- .../search-facet-selected-option.component.ts | 8 +-- .../search-facet-filter-wrapper.component.ts | 2 +- .../search-facet-filter.component.spec.ts | 8 +-- .../search-facet-filter.component.ts | 10 +-- .../search-filter.component.spec.ts | 4 +- .../search-filter/search-filter.component.ts | 10 +-- .../search-hierarchy-filter.component.spec.ts | 18 ++--- .../search-hierarchy-filter.component.ts | 14 ++-- .../search-range-filter.component.ts | 10 +-- .../search-filters.component.spec.ts | 4 +- .../search-filters.component.ts | 8 +-- .../themed-search-filters.component.ts | 2 +- .../search-label-range.component.spec.ts | 8 +-- .../search-label-range.component.ts | 8 +-- .../search-label.component.spec.ts | 8 +-- .../search-label/search-label.component.ts | 8 +-- .../search-labels.component.spec.ts | 2 +- .../search-labels/search-labels.component.ts | 2 +- .../search/search-result-element-decorator.ts | 17 ++--- .../search-results-skeleton.component.spec.ts | 2 +- .../search-results-skeleton.component.ts | 4 +- .../search-results.component.spec.ts | 6 +- .../search-results.component.ts | 16 ++--- .../themed-search-results.component.ts | 12 ++-- .../search-settings.component.spec.ts | 14 ++-- .../search-settings.component.ts | 10 +-- .../themed-search-settings.component.ts | 2 +- .../search-sidebar.component.spec.ts | 2 +- .../search-sidebar.component.ts | 10 +-- .../themed-search-sidebar.component.ts | 6 +- .../search-configuration-option.model.ts | 2 +- ...rch-switch-configuration.component.spec.ts | 4 +- .../search-switch-configuration.component.ts | 4 +- .../shared/search/search.component.spec.ts | 34 ++++----- src/app/shared/search/search.component.ts | 28 ++++---- .../shared/search/themed-search.component.ts | 6 +- .../shared/sidebar/sidebar-effects.service.ts | 2 +- .../date/starts-with-date.component.spec.ts | 2 +- .../starts-with-abstract.component.ts | 2 +- .../starts-with-loader.component.spec.ts | 2 +- .../starts-with-loader.component.ts | 2 +- .../text/starts-with-text.component.spec.ts | 2 +- .../models/subscription.model.ts | 20 +++--- .../models/subscription.resource-type.ts | 2 +- .../subscription-modal.component.spec.ts | 10 +-- .../subscription-modal.component.ts | 18 ++--- .../subscription-view.component.spec.ts | 4 +- .../subscription-view.component.ts | 4 +- .../subscriptions-data.service.spec.ts | 12 ++-- .../subscriptions-data.service.ts | 42 +++++------ .../testing/auth-request-service.stub.ts | 8 +-- src/app/shared/testing/auth-service.stub.ts | 12 ++-- .../testing/authorization-service.stub.ts | 3 +- .../shared/testing/base-data-service.stub.ts | 4 +- .../testing/bitstream-data-service.stub.ts | 9 ++- .../browse-definition-data-service.stub.ts | 20 +++--- src/app/shared/testing/browse-service.stub.ts | 20 +++--- .../testing/claimed-task-data-service.stub.ts | 7 +- .../configuration-data.service.stub.ts | 4 +- .../dso-edit-metadata-field.service.stub.ts | 5 +- .../edit-item-relationships.service.stub.ts | 16 ++--- .../testing/entity-type-data.service.stub.ts | 8 +-- src/app/shared/testing/eperson.mock.ts | 2 +- src/app/shared/testing/group-mock.ts | 3 +- .../testing/identifiable-data-service.stub.ts | 4 +- .../shared/testing/item-data.service.stub.ts | 3 +- .../testing/object-cache-service.stub.ts | 5 +- .../testing/object-updates.service.stub.ts | 9 ++- .../shared/testing/pagination-service.stub.ts | 8 +-- .../shared/testing/registry.service.stub.ts | 12 ++-- .../testing/relationship-data.service.stub.ts | 18 ++--- .../search-configuration-service.stub.ts | 8 +-- .../testing/search-filter-service.stub.ts | 8 +-- src/app/shared/testing/search-service.stub.ts | 2 +- src/app/shared/testing/special-group.mock.ts | 12 ++-- ...sion-json-patch-operations-service.stub.ts | 2 +- .../testing/submission-rest-service.stub.ts | 7 +- .../shared/testing/subscriptions-data.mock.ts | 7 +- .../shared/testing/supervision-order.mock.ts | 9 +-- .../shared/testing/test-data-service.mock.ts | 6 +- src/app/shared/testing/utils.test.ts | 17 +++-- .../shared/testing/vocabulary-service.stub.ts | 18 ++--- .../workflow-action-data-service.stub.ts | 8 +-- .../workflow-item-data-service.stub.ts | 3 +- src/app/shared/theme-support/theme.model.ts | 4 +- .../theme-support/theme.service.spec.ts | 20 +++--- src/app/shared/theme-support/theme.service.ts | 20 +++--- .../shared/theme-support/themed.component.ts | 2 +- .../abstract-trackable.component.spec.ts | 2 +- .../trackable/abstract-trackable.component.ts | 2 +- .../truncatable-part.component.spec.ts | 8 +-- .../upload/uploader/uploader-options.model.ts | 2 +- .../uploader/uploader-properties.model.ts | 2 +- .../uploader/uploader.component.spec.ts | 4 +- .../upload/uploader/uploader.component.ts | 14 ++-- .../shared/utils/follow-link-config.model.ts | 5 +- .../shared/utils/markdown.directive.spec.ts | 4 +- src/app/shared/utils/markdown.directive.ts | 2 +- .../metadatafield-validator.directive.ts | 11 ++- src/app/shared/utils/relation-query.utils.ts | 5 +- src/app/shared/utils/route.utils.ts | 2 +- .../view-mode-switch.component.spec.ts | 4 +- .../view-mode-switch.component.ts | 4 +- ...llection-statistics-page.component.spec.ts | 12 ++-- .../collection-statistics-page.component.ts | 2 +- ...ommunity-statistics-page.component.spec.ts | 12 ++-- .../community-statistics-page.component.ts | 2 +- .../item-statistics-page.component.spec.ts | 12 ++-- .../item-statistics-page.component.ts | 2 +- .../site-statistics-page.component.spec.ts | 14 ++-- .../site-statistics-page.component.ts | 4 +- .../statistics-page/statistics-page-routes.ts | 4 +- .../statistics-page.directive.ts | 23 +++--- .../statistics-table.component.spec.ts | 6 +- .../statistics-table.component.ts | 7 +- .../dspace/view-tracker-resolver.service.ts | 3 +- .../google-analytics.service.spec.ts | 4 +- .../statistics/google-analytics.service.ts | 4 +- src/app/statistics/matomo.service.spec.ts | 12 ++-- src/app/statistics/matomo.service.ts | 10 +-- .../statistics/statistics-endpoint.model.ts | 10 +-- .../statistics-endpoint.resource-type.ts | 2 +- src/app/statistics/statistics.service.spec.ts | 6 +- src/app/statistics/statistics.service.ts | 8 +-- src/app/statistics/track-request.model.ts | 8 +-- .../edit/submission-edit.component.spec.ts | 10 +-- .../edit/submission-edit.component.ts | 18 ++--- ...bmission-form-collection.component.spec.ts | 14 ++-- .../submission-form-collection.component.ts | 18 ++--- .../submission-form-footer.component.spec.ts | 2 +- .../submission-form-footer.component.ts | 4 +- .../form/submission-form.component.spec.ts | 6 +- .../form/submission-form.component.ts | 16 ++--- .../submission-upload-files.component.spec.ts | 2 +- .../submission-upload-files.component.ts | 6 +- .../form/themed-submission-form.component.ts | 6 +- ...-import-external-preview.component.spec.ts | 4 +- ...ssion-import-external-preview.component.ts | 8 +-- ...mport-external-searchbar.component.spec.ts | 18 ++--- ...ion-import-external-searchbar.component.ts | 28 ++++---- ...bmission-import-external.component.spec.ts | 8 +-- .../submission-import-external.component.ts | 26 +++---- .../objects/submission-objects.actions.ts | 14 ++-- .../submission-objects.effects.spec.ts | 14 ++-- .../objects/submission-objects.effects.ts | 24 +++---- .../submission-objects.reducer.spec.ts | 3 +- .../objects/submission-objects.reducer.ts | 2 +- .../submission-section-object.model.ts | 3 +- .../section-accesses.component.spec.ts | 10 +-- .../accesses/section-accesses.component.ts | 14 ++-- .../accesses/section-accesses.service.ts | 2 +- ...sion-section-cc-licenses.component.spec.ts | 14 ++-- ...ubmission-section-cc-licenses.component.ts | 34 ++++----- .../section-duplicates.component.spec.ts | 18 ++--- .../section-duplicates.component.ts | 6 +- .../section-form-operations.service.spec.ts | 6 +- .../form/section-form-operations.service.ts | 8 +-- .../form/section-form.component.spec.ts | 16 ++--- .../sections/form/section-form.component.ts | 36 +++++----- .../section-identifiers.component.spec.ts | 24 +++---- .../section-identifiers.component.ts | 2 +- .../license/section-license.component.spec.ts | 16 ++--- .../license/section-license.component.ts | 14 ++-- .../sections/models/section-data.model.ts | 3 +- .../section-coar-notify.component.spec.ts | 22 +++--- .../section-coar-notify.component.ts | 28 ++++---- ...mission-coar-notify-workspaceitem.model.ts | 9 ++- .../sections/sections.service.spec.ts | 2 +- .../submission/sections/sections.service.ts | 10 +-- .../content-accordion.component.ts | 3 +- .../metadata-information.component.ts | 3 +- .../publication-information.component.ts | 3 +- .../publisher-policy.component.ts | 2 +- .../section-sherpa-policies.component.spec.ts | 2 +- .../section-sherpa-policies.component.ts | 6 +- ...tion-upload-access-conditions.component.ts | 12 ++-- ...section-upload-file-edit.component.spec.ts | 8 +-- .../section-upload-file-edit.component.ts | 12 ++-- .../section-upload-file.component.spec.ts | 8 +-- .../file/section-upload-file.component.ts | 12 ++-- ...section-upload-file-view.component.spec.ts | 2 +- .../section-upload-file-view.component.ts | 10 +-- .../upload/section-upload.component.spec.ts | 22 +++--- .../upload/section-upload.component.ts | 24 +++---- .../sections/upload/section-upload.service.ts | 2 +- .../submission/server-submission.service.ts | 4 +- src/app/submission/submission.service.spec.ts | 20 +++--- src/app/submission/submission.service.ts | 26 +++---- .../submission-submit.component.spec.ts | 2 +- .../submit/submission-submit.component.ts | 14 ++-- .../submission/utils/parseSectionErrors.ts | 3 +- src/app/submit-page/submit-page-routes.ts | 4 +- .../subscriptions-page.component.spec.ts | 8 +-- .../subscriptions-page.component.ts | 20 +++--- .../suggestions-page-routes.ts | 4 +- .../suggestions-page-routing-paths.ts | 2 +- .../suggestions-page.component.spec.ts | 6 +- .../suggestions-page.component.ts | 36 +++++----- .../suggestions-page.resolver.ts | 9 ++- ...system-wide-alert-banner.component.spec.ts | 2 +- .../system-wide-alert-banner.component.ts | 6 +- .../system-wide-alert-form.component.spec.ts | 4 +- .../system-wide-alert-form.component.ts | 10 +-- .../system-wide-alert-routes.ts | 2 +- .../system-wide-alert.model.ts | 10 +-- .../system-wide-alert.resource-type.ts | 2 +- .../thumbnail/themed-thumbnail.component.ts | 4 +- src/app/thumbnail/thumbnail.component.spec.ts | 10 +-- src/app/thumbnail/thumbnail.component.ts | 12 ++-- ...d-workflow-action-rating.component.spec.ts | 18 ++--- ...vanced-workflow-action-rating.component.ts | 4 +- ...w-action-select-reviewer.component.spec.ts | 16 ++--- ...rkflow-action-select-reviewer.component.ts | 16 ++--- .../reviewers-list.component.spec.ts | 24 +++---- .../reviewers-list.component.ts | 18 ++--- ...advanced-workflow-action.component.spec.ts | 12 ++-- .../advanced-workflow-action.component.ts | 16 ++--- ...anced-workflow-actions-loader.component.ts | 2 +- .../item-from-workflow-breadcrumb.resolver.ts | 8 +-- .../item-from-workflow.resolver.spec.ts | 2 +- .../item-from-workflow.resolver.ts | 9 ++- ...orkflow-item-action-page.component.spec.ts | 8 +-- .../workflow-item-action-page.component.ts | 20 +++--- .../workflow-item-delete.component.spec.ts | 8 +-- .../workflow-item-delete.component.ts | 12 ++-- .../workflow-item-page.resolver.spec.ts | 2 +- .../workflow-item-page.resolver.ts | 11 ++- .../workflow-item-send-back.component.spec.ts | 8 +-- .../workflow-item-send-back.component.ts | 6 +- .../workflowitems-edit-page-routes.ts | 4 +- .../workflowitems-edit-page-routing-paths.ts | 3 +- ...item-from-workspace-breadcrumb.resolver.ts | 8 +-- .../item-from-workspace.resolver.spec.ts | 2 +- .../item-from-workspace.resolver.ts | 9 ++- .../workspace-item-page.resolver.spec.ts | 2 +- .../workspace-item-page.resolver.ts | 11 ++- ...rkspaceitems-delete-page.component.spec.ts | 8 +-- .../workspaceitems-delete-page.component.ts | 20 +++--- .../workspaceitems-edit-page-routes.ts | 4 +- .../workspaceitems-edit-page-routing-paths.ts | 3 +- src/config/app-config.interface.ts | 2 +- src/config/auto-sync-config.interface.ts | 2 +- src/config/default-app-config.ts | 3 +- src/config/theme.model.spec.ts | 14 ++-- src/environments/environment.test.ts | 2 +- src/modules/app/browser-app.config.ts | 42 +++++------ src/modules/app/browser-init.service.ts | 14 ++-- src/modules/app/server-app.config.ts | 42 +++++------ src/modules/app/server-init.service.ts | 4 +- .../journal-issue/journal-issue.component.ts | 4 +- .../journal-volume.component.ts | 4 +- .../item-pages/journal/journal.component.ts | 4 +- .../item-pages/person/person.component.ts | 4 +- .../publication/publication.component.ts | 4 +- .../untyped-item/untyped-item.component.ts | 6 +- .../configuration-search-page.component.ts | 2 +- .../app/search-page/search-page.component.ts | 2 +- ...-relation-external-source-tab.component.ts | 2 +- ...ic-lookup-relation-search-tab.component.ts | 2 +- .../browse-entry-list-element.component.ts | 6 +- .../collection-list-element.component.ts | 6 +- .../community-list-element.component.ts | 6 +- ...em-search-result-list-element.component.ts | 4 +- ...n-sidebar-search-list-element.component.ts | 4 +- .../search-filters.component.ts | 2 +- .../search-settings.component.ts | 2 +- .../search-sidebar.component.ts | 2 +- tsconfig.json | 7 +- 1498 files changed, 7192 insertions(+), 7170 deletions(-) rename src/app/{submission/sections/section-coar-notify/submission-coar-notify.config.ts => core/coar-notify/models/submission-coar-notify.model.ts} (58%) rename src/app/{admin => core/data}/admin-ldn-services/admin-ldn-services-routes.ts (86%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-service-form/ldn-service-form.component.html (100%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss (91%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts (92%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts (96%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts (91%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html (100%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.scss (100%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts (85%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts (87%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts (66%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-model/ldn-service-patterns.model.ts (100%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts (100%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-model/ldn-service.constrain.model.ts (100%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts (83%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-model/ldn-services.model.ts (80%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-model/service-constrain-type.model.ts (100%) rename src/app/{admin => core/data}/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts (100%) rename src/app/{submission/sections/section-coar-notify => core/data}/coar-notify-config-data.service.spec.ts (66%) rename src/app/{submission/sections/section-coar-notify => core/data}/coar-notify-config-data.service.ts (54%) rename src/app/{admin/admin-ldn-services/ldn-services-data => core/data}/ldn-itemfilter-data.service.spec.ts (71%) rename src/app/{admin/admin-ldn-services/ldn-services-data => core/data}/ldn-itemfilters-data.service.ts (69%) rename src/app/{admin/admin-ldn-services/ldn-services-data => core/data}/ldn-services-data.service.spec.ts (69%) rename src/app/{admin/admin-ldn-services/ldn-services-data => core/data}/ldn-services-data.service.ts (85%) rename src/app/{submission/sections/section-coar-notify => core/shared}/section-coar-notify-service.resource-type.ts (81%) delete mode 100644 src/app/register-email-form/register-email-form.module.ts diff --git a/server.ts b/server.ts index cf21eda6af9..393c659aebd 100644 --- a/server.ts +++ b/server.ts @@ -51,7 +51,7 @@ import { } from './src/config/app-config.interface'; import { extendEnvironmentWithAppConfig } from './src/config/config.util'; import { logStartupMessage } from './startup-message'; -import { TOKENITEM } from './src/app/core/auth/models/auth-token-info.model'; +import { TOKENITEM } from '@core/auth/models/auth-token-info.model'; import { CommonEngine } from '@angular/ssr'; import { APP_BASE_HREF } from '@angular/common'; import { diff --git a/src/app/access-control/access-control-routes.ts b/src/app/access-control/access-control-routes.ts index 07b6f6c4ff4..d9379888d81 100644 --- a/src/app/access-control/access-control-routes.ts +++ b/src/app/access-control/access-control-routes.ts @@ -1,13 +1,13 @@ import { AbstractControl } from '@angular/forms'; import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; +import { groupAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/group-administrator.guard'; +import { siteAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; import { DYNAMIC_ERROR_MESSAGES_MATCHER, DynamicErrorMessagesMatcher, } from '@ng-dynamic-forms/core'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { groupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard'; -import { siteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; import { EPERSON_PATH, GROUP_PATH, diff --git a/src/app/access-control/access-control-routing-paths.ts b/src/app/access-control/access-control-routing-paths.ts index 06ae0321945..d8788aaa596 100644 --- a/src/app/access-control/access-control-routing-paths.ts +++ b/src/app/access-control/access-control-routing-paths.ts @@ -1,5 +1,6 @@ +import { URLCombiner } from '@core/url-combiner/url-combiner'; + import { getAccessControlModuleRoute } from '../app-routing-paths'; -import { URLCombiner } from '../core/url-combiner/url-combiner'; export const EPERSON_PATH = 'epeople'; diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts index f9eb487d73a..81f09e6e8ea 100644 --- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts +++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts @@ -4,6 +4,8 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbAccordionModule, NgbNavModule, @@ -11,8 +13,6 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; import { getMockThemeService } from '../../../shared/mocks/theme-service.mock'; import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; import { SelectableListItemControlComponent } from '../../../shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component'; diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts index 8b7b92717a7..780b58d9c74 100644 --- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts +++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts @@ -5,6 +5,13 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbAccordionModule, NgbNavModule, @@ -20,13 +27,6 @@ import { map, } from 'rxjs/operators'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { hasValue } from '../../../shared/empty.util'; import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model'; diff --git a/src/app/access-control/epeople-registry/epeople-registry.actions.ts b/src/app/access-control/epeople-registry/epeople-registry.actions.ts index e6e7608ba3f..64e611d8f20 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.actions.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.actions.ts @@ -1,7 +1,7 @@ /* eslint-disable max-classes-per-file */ +import { EPerson } from '@core/eperson/models/eperson.model'; import { Action } from '@ngrx/store'; -import { EPerson } from '../../core/eperson/models/eperson.model'; import { type } from '../../shared/ngrx/type'; /** diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts index 20a066dbf7e..99e2cde4414 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts @@ -20,6 +20,18 @@ import { } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbModal, NgbModule, @@ -30,18 +42,6 @@ import { of, } from 'rxjs'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { RequestService } from '../../core/data/request.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { PageInfo } from '../../core/shared/page-info.model'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { FormBuilderService } from '../../shared/form/builder/form-builder.service'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts index d4a96fa826d..3eb7a148c3f 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts @@ -15,6 +15,25 @@ import { Router, RouterModule, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { EpersonDtoModel } from '@core/eperson/models/eperson-dto.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getAllSucceededRemoteData, + getFirstCompletedRemoteData, +} from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -32,25 +51,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { RequestService } from '../../core/data/request.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { EpersonDtoModel } from '../../core/eperson/models/eperson-dto.model'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { - getAllSucceededRemoteData, - getFirstCompletedRemoteData, -} from '../../core/shared/operators'; -import { PageInfo } from '../../core/shared/page-info.model'; import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component'; import { hasValue } from '../../shared/empty.util'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; diff --git a/src/app/access-control/epeople-registry/epeople-registry.reducers.ts b/src/app/access-control/epeople-registry/epeople-registry.reducers.ts index 3bab6769e12..0924234bcad 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.reducers.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.reducers.ts @@ -1,4 +1,5 @@ -import { EPerson } from '../../core/eperson/models/eperson.model'; +import { EPerson } from '@core/eperson/models/eperson.model'; + import { EPeopleRegistryAction, EPeopleRegistryActionTypes, diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts index 6969b44f832..08d1f459a13 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts @@ -21,6 +21,21 @@ import { Router, RouterModule, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -28,21 +43,6 @@ import { of, } from 'rxjs'; -import { AuthService } from '../../../core/auth/auth.service'; -import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { PageInfo } from '../../../core/shared/page-info.model'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; import { FormComponent } from '../../../shared/form/form.component'; diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts index 701684009e8..1d52cbf9688 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts @@ -13,6 +13,27 @@ import { Router, RouterLink, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Group } from '@core/eperson/models/group.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; +import { Registration } from '@core/shared/registration.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { DynamicCheckboxModel, @@ -38,27 +59,6 @@ import { take, } from 'rxjs/operators'; -import { AuthService } from '../../../core/auth/auth.service'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { Group } from '../../../core/eperson/models/group.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { Registration } from '../../../core/shared/registration.model'; import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component'; diff --git a/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts b/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts index 2a689c0d729..57f5174b668 100644 --- a/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts +++ b/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts @@ -2,12 +2,11 @@ import { AbstractControl, ValidationErrors, } from '@angular/forms'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { getFirstSucceededRemoteData } from '../../../../core/shared/operators'; - export class ValidateEmailNotTaken { /** diff --git a/src/app/access-control/epeople-registry/eperson-resolver.service.ts b/src/app/access-control/epeople-registry/eperson-resolver.service.ts index 6c9d7347f73..329ff87650e 100644 --- a/src/app/access-control/epeople-registry/eperson-resolver.service.ts +++ b/src/app/access-control/epeople-registry/eperson-resolver.service.ts @@ -3,14 +3,14 @@ import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { ResolvedAction } from '@core/resolving/resolver.actions'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; -import { RemoteData } from '../../core/data/remote-data'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { ResolvedAction } from '../../core/resolving/resolver.actions'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { followLink, FollowLinkConfig, diff --git a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts index 86ee5e725e3..1c89830d10e 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts @@ -21,6 +21,26 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Group } from '@core/eperson/models/group.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { UUIDService } from '@core/shared/uuid.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; @@ -30,26 +50,6 @@ import { of, } from 'rxjs'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { DSOChangeAnalyzer } from '../../../core/data/dso-change-analyzer.service'; -import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { Group } from '../../../core/eperson/models/group.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { UUIDService } from '../../../core/shared/uuid.service'; -import { XSRFService } from '../../../core/xsrf/xsrf.service'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { ContextHelpDirective } from '../../../shared/context-help.directive'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts index 5c01f2e977c..ece9db38dbe 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.ts +++ b/src/app/access-control/group-registry/group-form/group-form.component.ts @@ -16,6 +16,25 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Group } from '@core/eperson/models/group.model'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getAllCompletedRemoteData, + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormControlModel, @@ -43,25 +62,6 @@ import { import { environment } from '../../../../environments/environment'; import { getCollectionEditRolesRoute } from '../../../collection-page/collection-page-routing-paths'; import { getCommunityEditRolesRoute } from '../../../community-page/community-page-routing-paths'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { Group } from '../../../core/eperson/models/group.model'; -import { Collection } from '../../../core/shared/collection.model'; -import { Community } from '../../../core/shared/community.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { - getAllCompletedRemoteData, - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { AlertType } from '../../../shared/alert/alert-type'; import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component'; diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts index 0271dd4aad4..0c490bcf612 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts @@ -24,6 +24,19 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RestResponse } from '@core/cache/response.models'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Group } from '@core/eperson/models/group.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -35,19 +48,6 @@ import { of, } from 'rxjs'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { RestResponse } from '../../../../core/cache/response.models'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { PageInfo } from '../../../../core/shared/page-info.model'; import { ContextHelpDirective } from '../../../../shared/context-help.directive'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts index e8d90c1a0be..4601592b5bb 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts @@ -16,6 +16,23 @@ import { Router, RouterLink, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { EpersonDtoModel } from '@core/eperson/models/eperson-dto.model'; +import { Group } from '@core/eperson/models/group.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { + getAllCompletedRemoteData, + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -35,23 +52,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; -import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { - getAllCompletedRemoteData, - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../../core/shared/operators'; import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive'; import { ContextHelpDirective } from '../../../../shared/context-help.directive'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts index 819db3d1c0d..2b247c5b9e5 100644 --- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts @@ -23,6 +23,17 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RestResponse } from '@core/cache/response.models'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Group } from '@core/eperson/models/group.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -35,17 +46,6 @@ import { } from 'rxjs'; import { EPersonMock2 } from 'src/app/shared/testing/eperson.mock'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { RestResponse } from '../../../../core/cache/response.models'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { PageInfo } from '../../../../core/shared/page-info.model'; import { ContextHelpDirective } from '../../../../shared/context-help.directive'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts index 82f944fe7b3..dbfe4cbc7fd 100644 --- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts +++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts @@ -13,6 +13,18 @@ import { Router, RouterLink, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Group } from '@core/eperson/models/group.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getAllCompletedRemoteData, + getFirstCompletedRemoteData, +} from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateModule, TranslateService, @@ -28,18 +40,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { NoContent } from '../../../../core/shared/NoContent.model'; -import { - getAllCompletedRemoteData, - getFirstCompletedRemoteData, -} from '../../../../core/shared/operators'; -import { PageInfo } from '../../../../core/shared/page-info.model'; import { ContextHelpDirective } from '../../../../shared/context-help.directive'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../../../shared/pagination/pagination.component'; diff --git a/src/app/access-control/group-registry/group-form/validators/group-exists.validator.ts b/src/app/access-control/group-registry/group-form/validators/group-exists.validator.ts index 056c54bf6a8..dc182e75ac7 100644 --- a/src/app/access-control/group-registry/group-form/validators/group-exists.validator.ts +++ b/src/app/access-control/group-registry/group-form/validators/group-exists.validator.ts @@ -2,13 +2,12 @@ import { AbstractControl, ValidationErrors, } from '@angular/forms'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Group } from '@core/eperson/models/group.model'; +import { getFirstSucceededRemoteListPayload } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators'; - export class ValidateGroupExists { /** diff --git a/src/app/access-control/group-registry/group-page.guard.spec.ts b/src/app/access-control/group-registry/group-page.guard.spec.ts index 96b8092117e..a44a116d2df 100644 --- a/src/app/access-control/group-registry/group-page.guard.spec.ts +++ b/src/app/access-control/group-registry/group-page.guard.spec.ts @@ -7,15 +7,15 @@ import { Router, UrlTree, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { Observable, of, } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; import { groupPageGuard } from './group-page.guard'; jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; // Increase timeout to 10 seconds diff --git a/src/app/access-control/group-registry/group-page.guard.ts b/src/app/access-control/group-registry/group-page.guard.ts index 34c52debba8..d9f02ea8242 100644 --- a/src/app/access-control/group-registry/group-page.guard.ts +++ b/src/app/access-control/group-registry/group-page.guard.ts @@ -4,19 +4,18 @@ import { CanActivateFn, RouterStateSnapshot, } from '@angular/router'; +import { + someFeatureAuthorizationGuard, + StringGuardParamFn, +} from '@core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { Observable, of, } from 'rxjs'; import { map } from 'rxjs/operators'; -import { - someFeatureAuthorizationGuard, - StringGuardParamFn, -} from '../../core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; - const defaultGroupPageGetObjectUrl: StringGuardParamFn = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, diff --git a/src/app/access-control/group-registry/group-registry.actions.ts b/src/app/access-control/group-registry/group-registry.actions.ts index d1bc62a95cc..f5282f5ddee 100644 --- a/src/app/access-control/group-registry/group-registry.actions.ts +++ b/src/app/access-control/group-registry/group-registry.actions.ts @@ -1,7 +1,7 @@ /* eslint-disable max-classes-per-file */ +import { Group } from '@core/eperson/models/group.model'; import { Action } from '@ngrx/store'; -import { Group } from '../../core/eperson/models/group.model'; import { type } from '../../shared/ngrx/type'; /** diff --git a/src/app/access-control/group-registry/group-registry.reducers.ts b/src/app/access-control/group-registry/group-registry.reducers.ts index 0bb3ad4b5c2..d295d83d815 100644 --- a/src/app/access-control/group-registry/group-registry.reducers.ts +++ b/src/app/access-control/group-registry/group-registry.reducers.ts @@ -1,4 +1,5 @@ -import { Group } from '../../core/eperson/models/group.model'; +import { Group } from '@core/eperson/models/group.model'; + import { GroupRegistryAction, GroupRegistryActionTypes, diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts index 673d6507238..e5194adb4d3 100644 --- a/src/app/access-control/group-registry/groups-registry.component.spec.ts +++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts @@ -20,6 +20,26 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Group } from '@core/eperson/models/group.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { RouteService } from '@core/services/route.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; @@ -29,26 +49,6 @@ import { } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { RequestService } from '../../core/data/request.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../core/eperson/group-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { Group } from '../../core/eperson/models/group.model'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { RouteService } from '../../core/services/route.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { PageInfo } from '../../core/shared/page-info.model'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { DSONameServiceMock, diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts index e846c5bbb98..bd71cd3a4f9 100644 --- a/src/app/access-control/group-registry/groups-registry.component.ts +++ b/src/app/access-control/group-registry/groups-registry.component.ts @@ -9,6 +9,32 @@ import { UntypedFormBuilder, } from '@angular/forms'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Group } from '@core/eperson/models/group.model'; +import { GroupDtoModel } from '@core/eperson/models/group-dto.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { RouteService } from '@core/services/route.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getAllSucceededRemoteData, + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbModal, NgbTooltipModule, @@ -34,32 +60,6 @@ import { tap, } from 'rxjs/operators'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { RequestService } from '../../core/data/request.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../core/eperson/group-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { Group } from '../../core/eperson/models/group.model'; -import { GroupDtoModel } from '../../core/eperson/models/group-dto.model'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { RouteService } from '../../core/services/route.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { - getAllSucceededRemoteData, - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../core/shared/operators'; -import { PageInfo } from '../../core/shared/page-info.model'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component'; import { hasValue } from '../../shared/empty.util'; diff --git a/src/app/accessibility/accessibility-settings.service.spec.ts b/src/app/accessibility/accessibility-settings.service.spec.ts index 98c8b3d95d2..1be910fdf2a 100644 --- a/src/app/accessibility/accessibility-settings.service.spec.ts +++ b/src/app/accessibility/accessibility-settings.service.spec.ts @@ -2,13 +2,13 @@ import { fakeAsync, flush, } from '@angular/core/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { CookieService } from '@core/services/cookie.service'; import { of } from 'rxjs'; import { AppConfig } from '../../config/app-config.interface'; -import { AuthService } from '../core/auth/auth.service'; -import { EPersonDataService } from '../core/eperson/eperson-data.service'; -import { EPerson } from '../core/eperson/models/eperson.model'; -import { CookieService } from '../core/services/cookie.service'; import { OrejimeServiceStub } from '../shared/cookies/orejime.service.stub'; import { CookieServiceMock } from '../shared/mocks/cookie.service.mock'; import { diff --git a/src/app/accessibility/accessibility-settings.service.ts b/src/app/accessibility/accessibility-settings.service.ts index c9d8a38a6d9..e1e8fb69d2a 100644 --- a/src/app/accessibility/accessibility-settings.service.ts +++ b/src/app/accessibility/accessibility-settings.service.ts @@ -3,6 +3,11 @@ import { Injectable, Optional, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { CookieService } from '@core/services/cookie.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import cloneDeep from 'lodash/cloneDeep'; import { combineLatest, @@ -20,11 +25,6 @@ import { AppConfig, } from '../../config/app-config.interface'; import { environment } from '../../environments/environment'; -import { AuthService } from '../core/auth/auth.service'; -import { EPersonDataService } from '../core/eperson/eperson-data.service'; -import { EPerson } from '../core/eperson/models/eperson.model'; -import { CookieService } from '../core/services/cookie.service'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { OrejimeService } from '../shared/cookies/orejime.service'; import { hasNoValue, diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts index 20c53f58ed9..a7ccb019cd3 100644 --- a/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts +++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts @@ -10,12 +10,12 @@ import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { TranslateModule } from '@ngx-translate/core'; - import { BATCH_IMPORT_SCRIPT_NAME, ScriptDataService, -} from '../../core/data/processes/script-data.service'; +} from '@core/data/processes/script-data.service'; +import { TranslateModule } from '@ngx-translate/core'; + import { ProcessParameter } from '../../process-page/processes/process-parameter.model'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts index c8446ced4a8..a63dbb81d65 100644 --- a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts +++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts @@ -2,6 +2,14 @@ import { Location } from '@angular/common'; import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { Router } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { + BATCH_IMPORT_SCRIPT_NAME, + ScriptDataService, +} from '@core/data/processes/script-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -10,14 +18,6 @@ import { import { UiSwitchModule } from 'ngx-ui-switch'; import { take } from 'rxjs/operators'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { - BATCH_IMPORT_SCRIPT_NAME, - ScriptDataService, -} from '../../core/data/processes/script-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths'; import { Process } from '../../process-page/processes/process.model'; import { ProcessParameter } from '../../process-page/processes/process-parameter.model'; diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts index b345da2c06f..e0e2cdd96f1 100644 --- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts +++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts @@ -10,12 +10,12 @@ import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { TranslateModule } from '@ngx-translate/core'; - import { METADATA_IMPORT_SCRIPT_NAME, ScriptDataService, -} from '../../core/data/processes/script-data.service'; +} from '@core/data/processes/script-data.service'; +import { TranslateModule } from '@ngx-translate/core'; + import { ProcessParameter } from '../../process-page/processes/process-parameter.model'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts index 56d504d57de..d6fd3623bce 100644 --- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts +++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts @@ -2,17 +2,17 @@ import { Location } from '@angular/common'; import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { Router } from '@angular/router'; +import { + METADATA_IMPORT_SCRIPT_NAME, + ScriptDataService, +} from '@core/data/processes/script-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { - METADATA_IMPORT_SCRIPT_NAME, - ScriptDataService, -} from '../../core/data/processes/script-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths'; import { Process } from '../../process-page/processes/process.model'; import { ProcessParameter } from '../../process-page/processes/process-parameter.model'; diff --git a/src/app/admin/admin-notifications/admin-notifications-routes.ts b/src/app/admin/admin-notifications/admin-notifications-routes.ts index 309910d6bbc..f736fccd469 100644 --- a/src/app/admin/admin-notifications/admin-notifications-routes.ts +++ b/src/app/admin/admin-notifications/admin-notifications-routes.ts @@ -1,8 +1,8 @@ import { Route } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; +import { sourcesBreadcrumbResolver } from '@core/breadcrumbs/sources-breadcrumb.resolver'; -import { authenticatedGuard } from '../../core/auth/authenticated.guard'; -import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { sourcesBreadcrumbResolver } from '../../core/breadcrumbs/sources-breadcrumb.resolver'; import { PublicationClaimComponent } from '../../notifications/suggestions/targets/publication-claim/publication-claim.component'; import { AdminNotificationsPublicationClaimPageResolver } from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service'; import { QualityAssuranceEventsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component'; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts index 0316913cf62..eda068ec4d2 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts @@ -1,8 +1,8 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; +import { notifyInfoGuard } from '@core/coar-notify/notify-info/notify-info.guard'; +import { siteAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; -import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { notifyInfoGuard } from '../../core/coar-notify/notify-info/notify-info.guard'; -import { siteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component'; import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component'; import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component'; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts index 82dc0f5d7d7..4283f6f6d0d 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts @@ -4,13 +4,13 @@ import { TestBed, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG } from '../../../config/app-config.interface'; import { environment } from '../../../environments/environment.test'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { SearchService } from '../../core/shared/search/search.service'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component'; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts index b9f7b2b81d2..8c430e2f38b 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts @@ -5,6 +5,10 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -16,10 +20,6 @@ import { APP_CONFIG, AppConfig, } from '../../../config/app-config.interface'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { SearchService } from '../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model'; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts index b2f70e6660a..bf2cd43bbe8 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts @@ -3,9 +3,9 @@ import { Inject, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service'; import { AdminNotifyLogsResultComponent } from '../admin-notify-logs-result/admin-notify-logs-result.component'; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts index ed1b78f4ae1..1aea5595cda 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts @@ -10,13 +10,13 @@ import { ActivatedRouteSnapshot, Router, } from '@angular/router'; +import { Context } from '@core/shared/context.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { Context } from '../../../../core/shared/context.model'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service'; import { SearchLabelsComponent } from '../../../../shared/search/search-labels/search-labels.component'; import { ThemedSearchComponent } from '../../../../shared/search/themed-search.component'; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts index 7a11c1a66c4..ddc48758014 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts @@ -3,9 +3,9 @@ import { Inject, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service'; import { AdminNotifyLogsResultComponent } from '../admin-notify-logs-result/admin-notify-logs-result.component'; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts index 0318fe58c5b..03ed21c9e48 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts @@ -3,9 +3,9 @@ import { TestBed, } from '@angular/core/testing'; import { Router } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { RouterStub } from '../../../shared/testing/router.stub'; import { AdminNotifyMetricsComponent } from './admin-notify-metrics.component'; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts index 6519826ddf9..cfaa22a3fb4 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts @@ -4,9 +4,9 @@ import { Input, } from '@angular/core'; import { Router } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { NotificationBoxComponent } from '../../../shared/notification-box/notification-box.component'; import { AdminNotifyMetricsRow } from './admin-notify-metrics.model'; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts index aff6514e4b9..18a837b4737 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts @@ -5,11 +5,11 @@ import { TestBed, } from '@angular/core/testing'; import { RouterModule } from '@angular/router'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component'; import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component'; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts index 7b0d3cd9335..e4314e16165 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts @@ -9,6 +9,8 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -16,8 +18,6 @@ import { Subscription, } from 'rxjs'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { TabulatableResultListElementsComponent } from '../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component'; import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component'; diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts index 2524ffed9b8..47c36b281a4 100644 --- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts +++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts @@ -1,3 +1,7 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, @@ -5,10 +9,6 @@ import { } from 'cerialize'; import { Observable } from 'rxjs'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { GenericConstructor } from '../../../core/shared/generic-constructor'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model'; import { ADMIN_NOTIFY_MESSAGE } from './admin-notify-message.resource-type'; diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts index 994146adb3d..dba334099c0 100644 --- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts +++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for AdminNotifyMessage diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts index 6178b201330..d895e4a03b3 100644 --- a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts +++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts @@ -1,3 +1,13 @@ +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RestResponse } from '@core/cache/response.models'; +import { ItemDataService } from '@core/data/item-data.service'; +import { LdnServicesService } from '@core/data/ldn-services-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { RequestEntry } from '@core/data/request-entry.model'; +import { RequestEntryState } from '@core/data/request-entry-state.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { deepClone } from 'fast-json-patch'; import { cold } from 'jasmine-marbles'; import { @@ -6,18 +16,8 @@ import { } from 'rxjs'; import { take } from 'rxjs/operators'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { RestResponse } from '../../../core/cache/response.models'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { RequestEntry } from '../../../core/data/request-entry.model'; -import { RequestEntryState } from '../../../core/data/request-entry-state.model'; -import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; -import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service'; import { mockAdminNotifyMessages } from '../admin-notify-search-result/admin-notify-search-result.component.spec'; import { AdminNotifyMessage } from '../models/admin-notify-message.model'; import { AdminNotifyMessagesService } from './admin-notify-messages.service'; diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts index 2211facfc87..8c0132bc20c 100644 --- a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts +++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts @@ -1,4 +1,17 @@ import { Injectable } from '@angular/core'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { LdnServicesService } from '@core/data/ldn-services-data.service'; +import { PostRequest } from '@core/data/request.models'; +import { RequestService } from '@core/data/request.service'; +import { RestRequest } from '@core/data/rest-request.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { + getAllSucceededRemoteDataPayload, + getFirstCompletedRemoteData, +} from '@core/shared/operators'; import { BehaviorSubject, from, @@ -13,20 +26,7 @@ import { tap, } from 'rxjs/operators'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { PostRequest } from '../../../core/data/request.models'; -import { RequestService } from '../../../core/data/request.service'; -import { RestRequest } from '../../../core/data/rest-request.model'; -import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; -import { - getAllSucceededRemoteDataPayload, - getFirstCompletedRemoteData, -} from '../../../core/shared/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service'; import { AdminNotifyMessage } from '../models/admin-notify-message.model'; /** diff --git a/src/app/admin/admin-registries/admin-registries-routes.ts b/src/app/admin/admin-registries/admin-registries-routes.ts index 06aaa934ab6..014d924f47b 100644 --- a/src/app/admin/admin-registries/admin-registries-routes.ts +++ b/src/app/admin/admin-registries/admin-registries-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths'; import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component'; import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component'; diff --git a/src/app/admin/admin-registries/admin-registries-routing-paths.ts b/src/app/admin/admin-registries/admin-registries-routing-paths.ts index fa8ee0b209f..367b343f530 100644 --- a/src/app/admin/admin-registries/admin-registries-routing-paths.ts +++ b/src/app/admin/admin-registries/admin-registries-routing-paths.ts @@ -1,4 +1,5 @@ -import { URLCombiner } from '../../core/url-combiner/url-combiner'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; + import { getRegistriesModuleRoute } from '../admin-routing-paths'; export const BITSTREAMFORMATS_MODULE_PATH = 'bitstream-formats'; diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts index 6deeeb1a153..28377e86231 100644 --- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts +++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts @@ -7,13 +7,13 @@ import { } from '@angular/core/testing'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { BitstreamFormatDataService } from '@core/data/bitstream-format-data.service'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { BitstreamFormatSupportLevel } from '@core/shared/bitstream-format-support-level'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; -import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'; -import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { FormService } from '../../../../shared/form/form.service'; import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts index a1ba387cfbd..e59b8291949 100644 --- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts @@ -1,14 +1,14 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; +import { BitstreamFormatDataService } from '@core/data/bitstream-format-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths'; import { FormatFormComponent } from '../format-form/format-form.component'; diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts index 874274af8b6..d1eb82d8a9c 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts @@ -1,7 +1,7 @@ /* eslint-disable max-classes-per-file */ +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; import { Action } from '@ngrx/store'; -import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; import { type } from '../../../shared/ngrx/type'; /** diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts index 09c867bc725..fd8b9131f25 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts @@ -1,6 +1,6 @@ +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; import { Action } from '@ngrx/store'; -import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; import { BitstreamFormatsRegistryDeselectAction, BitstreamFormatsRegistryDeselectAllAction, diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts index 40642a5fdbb..74b3976a469 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts @@ -1,4 +1,5 @@ -import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; + import { BitstreamFormatsRegistryAction, BitstreamFormatsRegistryActionTypes, diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts index 5c85d194a50..6fc63e08cdf 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component'; import { BitstreamFormatsComponent } from './bitstream-formats.component'; import { bitstreamFormatsResolver } from './bitstream-formats.resolver'; diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts index 7e31cedd82a..1120a05b4b1 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts @@ -6,15 +6,15 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterModule } from '@angular/router'; +import { BitstreamFormatDataService } from '@core/data/bitstream-format-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { BitstreamFormatSupportLevel } from '@core/shared/bitstream-format-support-level'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { hot } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; -import { BitstreamFormatSupportLevel } from '../../../core/shared/bitstream-format-support-level'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; import { diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index 381172bbe9f..af23b68d378 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -5,6 +5,14 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { BitstreamFormatDataService } from '@core/data/bitstream-format-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -18,14 +26,6 @@ import { toArray, } from 'rxjs/operators'; -import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts index 366f5a682b5..3d9240cf047 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts @@ -4,13 +4,12 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { BitstreamFormatDataService } from '@core/data/bitstream-format-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; -import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; - /** * Method for resolving an bitstreamFormat based on the parameters in the current route * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts index a8785477c98..60f84fd0259 100644 --- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts +++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts @@ -10,14 +10,14 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { BitstreamFormatDataService } from '@core/data/bitstream-format-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { BitstreamFormatSupportLevel } from '@core/shared/bitstream-format-support-level'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'; -import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { createFailedRemoteDataObject$, diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts index f53ae710321..e2bd3bdb2fd 100644 --- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts @@ -7,6 +7,10 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { BitstreamFormatDataService } from '@core/data/bitstream-format-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -14,10 +18,6 @@ import { import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths'; import { FormatFormComponent } from '../format-form/format-form.component'; diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts index 2b9f5034fe6..0e9a9d27c0e 100644 --- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts +++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts @@ -11,6 +11,8 @@ import { } from '@angular/forms'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { BitstreamFormatSupportLevel } from '@core/shared/bitstream-format-support-level'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DynamicCheckboxModel, @@ -19,8 +21,6 @@ import { } from '@ng-dynamic-forms/core'; import { TranslateModule } from '@ngx-translate/core'; -import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'; -import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level'; import { isEmpty } from '../../../../shared/empty.util'; import { FormComponent } from '../../../../shared/form/form.component'; import { RouterStub } from '../../../../shared/testing/router.stub'; diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts index 59fa50ee5b8..3987e079b5c 100644 --- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts @@ -7,6 +7,8 @@ import { Output, } from '@angular/core'; import { Router } from '@angular/router'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { BitstreamFormatSupportLevel } from '@core/shared/bitstream-format-support-level'; import { DynamicCheckboxModel, DynamicFormArrayModel, @@ -18,8 +20,6 @@ import { } from '@ng-dynamic-forms/core'; import { environment } from '../../../../../environments/environment'; -import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'; -import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level'; import { hasValue, isEmpty, diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts index 2e06d168ce7..23bafa711ee 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts @@ -1,8 +1,8 @@ /* eslint-disable max-classes-per-file */ +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; import { Action } from '@ngrx/store'; -import { MetadataField } from '../../../core/metadata/metadata-field.model'; -import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; import { type } from '../../../shared/ngrx/type'; /** diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts index 0b32cc466c9..0120bc190ee 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -12,18 +12,18 @@ import { import { By } from '@angular/platform-browser'; import { RouterLink } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { RegistryService } from '@core/registry/registry.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { FormBuilderService } from 'src/app/shared/form/builder/form-builder.service'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { RegistryService } from '../../../core/registry/registry.service'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { FormService } from '../../../shared/form/form.service'; import { HostWindowService } from '../../../shared/host-window.service'; import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock'; diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts index 9f69a78bb75..c958086e481 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts @@ -8,6 +8,13 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { RegistryService } from '@core/registry/registry.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -25,13 +32,6 @@ import { take, } from 'rxjs/operators'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { RegistryService } from '../../../core/registry/registry.service'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; import { toFindListOptions } from '../../../shared/pagination/pagination.utils'; diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts index 07d01b8dc32..10384a0ba5f 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts @@ -1,5 +1,6 @@ -import { MetadataField } from '../../../core/metadata/metadata-field.model'; -import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; + import { MetadataRegistryCancelFieldAction, MetadataRegistryCancelSchemaAction, diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts index 6cb72a0a8b3..0ccfabaeca2 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts @@ -1,5 +1,6 @@ -import { MetadataField } from '../../../core/metadata/metadata-field.model'; -import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; + import { MetadataRegistryAction, MetadataRegistryActionTypes, diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts index 5a4b4d162c7..ce5c1ebee02 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts @@ -7,12 +7,12 @@ import { waitForAsync, } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { RegistryService } from '@core/registry/registry.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model'; -import { RegistryService } from '../../../../core/registry/registry.service'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { FormComponent } from '../../../../shared/form/form.component'; import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts index ebc8e0675c6..fbe3482a99d 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts @@ -7,6 +7,8 @@ import { Output, } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { RegistryService } from '@core/registry/registry.service'; import { DynamicFormControlModel, DynamicFormGroupModel, @@ -27,8 +29,6 @@ import { take, } from 'rxjs/operators'; -import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model'; -import { RegistryService } from '../../../../core/registry/registry.service'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { FormComponent } from '../../../../shared/form/form.component'; diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts index 0816c9ee4dd..28db95257be 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts @@ -7,13 +7,13 @@ import { waitForAsync, } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { RegistryService } from '@core/registry/registry.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { MetadataField } from '../../../../core/metadata/metadata-field.model'; -import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model'; -import { RegistryService } from '../../../../core/registry/registry.service'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { FormComponent } from '../../../../shared/form/form.component'; import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts index f1f18090008..09e577adb22 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts @@ -8,6 +8,9 @@ import { Output, } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { RegistryService } from '@core/registry/registry.service'; import { DynamicFormControlModel, DynamicFormGroupModel, @@ -22,9 +25,6 @@ import { import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; -import { MetadataField } from '../../../../core/metadata/metadata-field.model'; -import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model'; -import { RegistryService } from '../../../../core/registry/registry.service'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { FormComponent } from '../../../../shared/form/form.component'; diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts index 8457c67c118..a625393841f 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts @@ -9,19 +9,19 @@ import { import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { RegistryService } from '@core/registry/registry.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { MetadataField } from '../../../core/metadata/metadata-field.model'; -import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { RegistryService } from '../../../core/registry/registry.service'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { HostWindowService } from '../../../shared/host-window.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts index 984988b199f..92742571dda 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts @@ -11,6 +11,17 @@ import { ActivatedRoute, RouterLink, } from '@angular/router'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { RegistryService } from '@core/registry/registry.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -29,17 +40,6 @@ import { take, } from 'rxjs/operators'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { MetadataField } from '../../../core/metadata/metadata-field.model'; -import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { RegistryService } from '../../../core/registry/registry.service'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; import { toFindListOptions } from '../../../shared/pagination/pagination.utils'; diff --git a/src/app/admin/admin-reports/admin-reports-routes.ts b/src/app/admin/admin-reports/admin-reports-routes.ts index be1f7cc7a09..cd459acaf6b 100644 --- a/src/app/admin/admin-reports/admin-reports-routes.ts +++ b/src/app/admin/admin-reports/admin-reports-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { FilteredCollectionsComponent } from './filtered-collections/filtered-collections.component'; import { FilteredItemsComponent } from './filtered-items/filtered-items.component'; diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts index d7a93f02bb2..c5eb1583e5b 100644 --- a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts +++ b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts @@ -9,12 +9,12 @@ import { } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { ScriptDataService } from '../../../../core/data/processes/script-data.service'; import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths'; import { Process } from '../../../../process-page/processes/process.model'; import { Script } from '../../../../process-page/scripts/script.model'; diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.ts index 977f325fdd5..eb16de6cd28 100644 --- a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.ts +++ b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.ts @@ -6,6 +6,11 @@ import { } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { Router } from '@angular/router'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -17,11 +22,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../../core/data/feature-authorization/feature-id'; -import { ScriptDataService } from '../../../../core/data/processes/script-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths'; import { Process } from '../../../../process-page/processes/process.model'; import { hasValue } from '../../../../shared/empty.util'; diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts index b12a7967c83..4587d91badd 100644 --- a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts +++ b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts @@ -1,7 +1,6 @@ +import { Collection } from '@core/shared/collection.model'; import { Item } from 'src/app/core/shared/item.model'; -import { Collection } from '../../../core/shared/collection.model'; - export class FilteredItems { public items: FilteredItem[] = []; diff --git a/src/app/admin/admin-routes.ts b/src/app/admin/admin-routes.ts index e5afe09cc79..36e2733f748 100644 --- a/src/app/admin/admin-routes.ts +++ b/src/app/admin/admin-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component'; import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component'; import { ThemedMetadataImportPageComponent } from './admin-import-metadata-page/themed-metadata-import-page.component'; @@ -67,7 +67,7 @@ export const ROUTES: Route[] = [ { path: '', pathMatch: 'full', redirectTo: 'services' }, { path: 'services', - loadChildren: () => import('./admin-ldn-services/admin-ldn-services-routes') + loadChildren: () => import('../core/data/admin-ldn-services/admin-ldn-services-routes') .then((m) => m.ROUTES), }, ], diff --git a/src/app/admin/admin-routing-paths.ts b/src/app/admin/admin-routing-paths.ts index bfcd16d18d4..96c2004283f 100644 --- a/src/app/admin/admin-routing-paths.ts +++ b/src/app/admin/admin-routing-paths.ts @@ -1,5 +1,6 @@ +import { URLCombiner } from '@core/url-combiner/url-combiner'; + import { getAdminModuleRoute } from '../app-routing-paths'; -import { URLCombiner } from '../core/url-combiner/url-combiner'; import { getQualityAssuranceEditRoute } from './admin-notifications/admin-notifications-routing-paths'; export const REGISTRIES_MODULE_PATH = 'registries'; diff --git a/src/app/admin/admin-search-page/admin-search-page.component.ts b/src/app/admin/admin-search-page/admin-search-page.component.ts index 341c2b12139..61b07f701b7 100644 --- a/src/app/admin/admin-search-page/admin-search-page.component.ts +++ b/src/app/admin/admin-search-page/admin-search-page.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; -import { Context } from '../../core/shared/context.model'; import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component'; @Component({ diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts index 470b3a52717..e3b9ba12e57 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts @@ -6,16 +6,16 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { FileService } from '@core/shared/file.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { Collection } from '../../../../../core/shared/collection.model'; -import { FileService } from '../../../../../core/shared/file.service'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock'; import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts index 6a4b80e3dc0..0ae4c403f54 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts @@ -3,11 +3,11 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Collection } from '@core/shared/collection.model'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths'; -import { Collection } from '../../../../../core/shared/collection.model'; -import { Context } from '../../../../../core/shared/context.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { CollectionSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts index 68210256534..3068b49c156 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts @@ -7,16 +7,16 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Community } from '@core/shared/community.model'; +import { FileService } from '@core/shared/file.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { Community } from '../../../../../core/shared/community.model'; -import { FileService } from '../../../../../core/shared/file.service'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock'; import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts index 6826c1ae3d6..a14a984b0c4 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts @@ -3,11 +3,11 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Community } from '@core/shared/community.model'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths'; -import { Community } from '../../../../../core/shared/community.model'; -import { Context } from '../../../../../core/shared/context.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { CommunitySearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts index 7a6b58dea2f..fdcb90f6682 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts @@ -6,18 +6,18 @@ import { } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { FileService } from '@core/shared/file.service'; +import { Item } from '@core/shared/item.model'; +import { ListableModule } from '@core/shared/listable.module'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Bitstream } from '../../../../../core/shared/bitstream.model'; -import { FileService } from '../../../../../core/shared/file.service'; -import { Item } from '../../../../../core/shared/item.model'; -import { ListableModule } from '../../../../../core/shared/listable.module'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock'; import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts index 362bd5d54e5..7ffcd4fdc39 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts @@ -6,13 +6,13 @@ import { OnInit, ViewChild, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { Context } from '@core/shared/context.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { Context } from '../../../../../core/shared/context.model'; -import { GenericConstructor } from '../../../../../core/shared/generic-constructor'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { hasValue } from '../../../../../shared/empty.util'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts index 7a4e2da68da..7a6cbdf19f5 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts @@ -6,14 +6,14 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Collection } from '@core/shared/collection.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { Collection } from '../../../../../core/shared/collection.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts index 0405b5203c4..199bec83a53 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts @@ -3,12 +3,12 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Collection } from '@core/shared/collection.model'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths'; -import { Collection } from '../../../../../core/shared/collection.model'; -import { Context } from '../../../../../core/shared/context.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { CollectionSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts index 04077bf590f..eec3f8459bf 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts @@ -6,14 +6,14 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Community } from '@core/shared/community.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { Community } from '../../../../../core/shared/community.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts index d8e0f235d42..fa67d7682a1 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts @@ -3,12 +3,12 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Community } from '@core/shared/community.model'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths'; -import { Community } from '../../../../../core/shared/community.model'; -import { Context } from '../../../../../core/shared/context.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { CommunitySearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts index a3631473e94..6da1540dac8 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts @@ -5,13 +5,13 @@ import { waitForAsync, } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts index aab686370de..6f1d4043dad 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ListableObjectComponentLoaderComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts index c598c5b40d7..6b2afe67f0f 100644 --- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts @@ -6,10 +6,10 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { Item } from '@core/shared/item.model'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { TranslateModule } from '@ngx-translate/core'; -import { Item } from '../../../core/shared/item.model'; -import { URLCombiner } from '../../../core/url-combiner/url-combiner'; import { ITEM_EDIT_DELETE_PATH, ITEM_EDIT_MOVE_PATH, diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts index e420d4be7f8..6a838784d87 100644 --- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts @@ -4,10 +4,10 @@ import { Input, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Item } from '@core/shared/item.model'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { TranslateModule } from '@ngx-translate/core'; -import { Item } from '../../../core/shared/item.model'; -import { URLCombiner } from '../../../core/url-combiner/url-combiner'; import { ITEM_EDIT_DELETE_PATH, ITEM_EDIT_MOVE_PATH, diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts index 68f3cc550f0..602c8d69cdc 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts +++ b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts @@ -14,6 +14,10 @@ import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { Item } from '@core/shared/item.model'; import { NgbModal, NgbModalRef, @@ -21,10 +25,6 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { ScriptDataService } from '../../core/data/processes/script-data.service'; -import { Item } from '../../core/shared/item.model'; import { MenuService } from '../../shared/menu/menu.service'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts index 6300c80c9d2..b52c61a470a 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts +++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts @@ -11,6 +11,8 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslatePipe } from '@ngx-translate/core'; import { @@ -26,8 +28,6 @@ import { withLatestFrom, } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { slideSidebar } from '../../shared/animations/slide'; import { MenuComponent } from '../../shared/menu/menu.component'; import { MenuService } from '../../shared/menu/menu.service'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts index 74de483c017..ef439a62532 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; -import { Context } from '../../core/shared/context.model'; import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component'; @Component({ diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.spec.ts index f5240422833..419e8743065 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.spec.ts @@ -6,14 +6,14 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestEntryState } from '@core/data/request-entry-state.model'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { RequestEntryState } from '../../../../../core/data/request-entry-state.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { URLCombiner } from '../../../../../core/url-combiner/url-combiner'; import { getWorkflowItemDeleteRoute, getWorkflowItemSendBackRoute, diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts index 12c3343d779..55856227305 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts @@ -4,9 +4,9 @@ import { Input, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { TranslateModule } from '@ngx-translate/core'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; import { getWorkflowItemDeleteRoute, getWorkflowItemSendBackRoute, diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.spec.ts index ec0d446f1a7..7d173c46058 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.spec.ts @@ -7,6 +7,9 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { Group } from '@core/eperson/models/group.model'; +import { SupervisionOrder } from '@core/supervision-order/models/supervision-order.model'; +import { SupervisionOrderDataService } from '@core/supervision-order/supervision-order-data.service'; import { NgbActiveModal, NgbPaginationModule, @@ -14,9 +17,6 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Group } from '../../../../../../core/eperson/models/group.model'; -import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model'; -import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service'; import { EpersonGroupListComponent } from '../../../../../../shared/eperson-group-list/eperson-group-list.component'; import { NotificationsService } from '../../../../../../shared/notifications/notifications.service'; import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector.component'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts index 8a5ed4407c2..7cecdcc04e7 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts @@ -5,6 +5,12 @@ import { Output, } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestEntryState } from '@core/data/request-entry-state.model'; +import { Group } from '@core/eperson/models/group.model'; +import { SupervisionOrder } from '@core/supervision-order/models/supervision-order.model'; +import { SupervisionOrderDataService } from '@core/supervision-order/supervision-order-data.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -13,12 +19,6 @@ import { import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; import { NotificationsService } from 'src/app/shared/notifications/notifications.service'; -import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../../../../../core/data/remote-data'; -import { RequestEntryState } from '../../../../../../core/data/request-entry-state.model'; -import { Group } from '../../../../../../core/eperson/models/group.model'; -import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model'; -import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service'; import { EpersonGroupListComponent } from '../../../../../../shared/eperson-group-list/eperson-group-list.component'; import { ErrorComponent } from '../../../../../../shared/error/error.component'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts index 6eac15735cc..2170572e56f 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts @@ -7,6 +7,11 @@ import { Output, SimpleChanges, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Group } from '@core/eperson/models/group.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { SupervisionOrder } from '@core/supervision-order/models/supervision-order.model'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -20,11 +25,6 @@ import { reduce, } from 'rxjs/operators'; -import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../../../../../core/data/remote-data'; -import { Group } from '../../../../../../core/eperson/models/group.model'; -import { getFirstCompletedRemoteData } from '../../../../../../core/shared/operators'; -import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model'; import { isNotEmpty } from '../../../../../../shared/empty.util'; import { VarDirective } from '../../../../../../shared/utils/var.directive'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts index b89c487ec06..d302cff32b8 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts @@ -6,17 +6,17 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestEntryState } from '@core/data/request-entry-state.model'; +import { Item } from '@core/shared/item.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { SupervisionOrderDataService } from '@core/supervision-order/supervision-order-data.service'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { RequestEntryState } from '../../../../../core/data/request-entry-state.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; -import { URLCombiner } from '../../../../../core/url-combiner/url-combiner'; import { ConfirmationModalComponent } from '../../../../../shared/confirmation-modal/confirmation-modal.component'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts index c03d0a11350..2232f953b4b 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts @@ -7,6 +7,13 @@ import { Output, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { SupervisionOrder } from '@core/supervision-order/models/supervision-order.model'; +import { SupervisionOrderDataService } from '@core/supervision-order/supervision-order-data.service'; import { NgbModal, NgbModalRef, @@ -25,13 +32,6 @@ import { tap, } from 'rxjs/operators'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators'; -import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model'; -import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../../../item-page/edit-item-page/edit-item-page.routing-paths'; import { ConfirmationModalComponent } from '../../../../../shared/confirmation-modal/confirmation-modal.component'; import { hasValue } from '../../../../../shared/empty.util'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts index 99c7a453937..8d7a13358ac 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts @@ -6,17 +6,17 @@ import { } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; +import { ListableModule } from '@core/shared/listable.module'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../../../core/shared/item.model'; -import { ListableModule } from '../../../../../core/shared/listable.module'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { AuthServiceMock } from '../../../../../shared/mocks/auth.service.mock'; import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts index 9d42f9c2b71..158d0c9b665 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts @@ -7,23 +7,23 @@ import { OnInit, ViewChild, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { Item } from '@core/shared/item.model'; +import { + getAllSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Context } from '../../../../../core/shared/context.model'; -import { GenericConstructor } from '../../../../../core/shared/generic-constructor'; -import { Item } from '../../../../../core/shared/item.model'; -import { - getAllSucceededRemoteData, - getRemoteDataPayload, -} from '../../../../../core/shared/operators'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { hasValue } from '../../../../../shared/empty.util'; import { diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts index 3bef33e42e3..469d68a8210 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts @@ -6,19 +6,19 @@ import { } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { ListableModule } from '@core/shared/listable.module'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { SupervisionOrderDataService } from '@core/supervision-order/supervision-order-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ListableModule } from '../../../../../core/shared/listable.module'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { AuthServiceMock } from '../../../../../shared/mocks/auth.service.mock'; import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts index aa7f26c5966..5771c100e1d 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts @@ -7,6 +7,24 @@ import { OnInit, ViewChild, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { Item } from '@core/shared/item.model'; +import { + getAllSucceededRemoteData, + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { SupervisionOrder } from '@core/supervision-order/models/supervision-order.model'; +import { SupervisionOrderDataService } from '@core/supervision-order/supervision-order-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -19,24 +37,6 @@ import { tap, } from 'rxjs/operators'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { PaginatedList } from '../../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Context } from '../../../../../core/shared/context.model'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; -import { GenericConstructor } from '../../../../../core/shared/generic-constructor'; -import { Item } from '../../../../../core/shared/item.model'; -import { - getAllSucceededRemoteData, - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../../../core/shared/operators'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model'; -import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { hasValue } from '../../../../../shared/empty.util'; import { diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts index cd722542f63..e48e8260975 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts @@ -6,18 +6,18 @@ import { } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { XSRFService } from '../../../../../core/xsrf/xsrf.service'; import { AuthServiceMock } from '../../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts index 90515fd5f77..dccce78e4d8 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts @@ -4,6 +4,17 @@ import { Inject, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -14,17 +25,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../../../core/shared/operators'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ListableObjectComponentLoaderComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts index 23842e9b658..61968a4c3b3 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts @@ -6,19 +6,19 @@ import { } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { SupervisionOrderDataService } from '@core/supervision-order/supervision-order-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { AuthServiceMock } from '../../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts index fcd4baa71be..8f42f542035 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts @@ -4,6 +4,21 @@ import { Inject, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { SupervisionOrder } from '@core/supervision-order/models/supervision-order.model'; +import { SupervisionOrderDataService } from '@core/supervision-order/supervision-order-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -20,21 +35,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { PaginatedList } from '../../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Context } from '../../../../../core/shared/context.model'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../../../core/shared/operators'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model'; -import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ListableObjectComponentLoaderComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; import { WorkspaceItemSearchResult } from '../../../../../shared/object-collection/shared/workspace-item-search-result.model'; diff --git a/src/app/app-routes.ts b/src/app/app-routes.ts index 9b1a2f28c99..55b734061c6 100644 --- a/src/app/app-routes.ts +++ b/src/app/app-routes.ts @@ -3,6 +3,15 @@ import { Route, RouterConfigOptions, } from '@angular/router'; +import { authBlockingGuard } from '@core/auth/auth-blocking.guard'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { groupAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/group-administrator.guard'; +import { siteAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; +import { siteRegisterGuard } from '@core/data/feature-authorization/feature-authorization-guard/site-register.guard'; +import { endUserAgreementCurrentUserGuard } from '@core/end-user-agreement/end-user-agreement-current-user.guard'; +import { reloadGuard } from '@core/reload/reload.guard'; +import { forgotPasswordCheckGuard } from '@core/rest-property/forgot-password-check-guard.guard'; +import { ServerCheckGuard } from '@core/server-check/server-check.guard'; import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths'; import { @@ -23,15 +32,6 @@ import { } from './app-routing-paths'; import { COLLECTION_MODULE_PATH } from './collection-page/collection-page-routing-paths'; import { COMMUNITY_MODULE_PATH } from './community-page/community-page-routing-paths'; -import { authBlockingGuard } from './core/auth/auth-blocking.guard'; -import { authenticatedGuard } from './core/auth/authenticated.guard'; -import { groupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard'; -import { siteAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; -import { siteRegisterGuard } from './core/data/feature-authorization/feature-authorization-guard/site-register.guard'; -import { endUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard'; -import { reloadGuard } from './core/reload/reload.guard'; -import { forgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard'; -import { ServerCheckGuard } from './core/server-check/server-check.guard'; import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component'; import { homePageResolver } from './home-page/home-page.resolver'; import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths'; diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts index 7b2c2d81ce0..fcc423e17cd 100644 --- a/src/app/app-routing-paths.ts +++ b/src/app/app-routing-paths.ts @@ -1,10 +1,11 @@ +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; + import { getCollectionPageRoute } from './collection-page/collection-page-routing-paths'; import { getCommunityPageRoute } from './community-page/community-page-routing-paths'; -import { Collection } from './core/shared/collection.model'; -import { Community } from './core/shared/community.model'; -import { DSpaceObject } from './core/shared/dspace-object.model'; -import { Item } from './core/shared/item.model'; -import { URLCombiner } from './core/url-combiner/url-combiner'; import { getItemModuleRoute, getItemPageRoute, diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 159fbb38f04..5be39f0b731 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -10,6 +10,15 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { authReducer } from '@core/auth/auth.reducer'; +import { AuthService } from '@core/auth/auth.service'; +import { LocaleService } from '@core/locale/locale.service'; +import { HeadTagService } from '@core/metadata/head-tag.service'; +import { RouteService } from '@core/services/route.service'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; import { Store, StoreModule, @@ -26,15 +35,6 @@ import { environment } from '../environments/environment'; import { AppComponent } from './app.component'; import { storeModuleConfig } from './app.reducer'; import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service'; -import { authReducer } from './core/auth/auth.reducer'; -import { AuthService } from './core/auth/auth.service'; -import { LocaleService } from './core/locale/locale.service'; -import { HeadTagService } from './core/metadata/head-tag.service'; -import { RouteService } from './core/services/route.service'; -import { - NativeWindowRef, - NativeWindowService, -} from './core/services/window.service'; import { ThemedRootComponent } from './root/themed-root.component'; import { HostWindowResizeAction } from './shared/host-window.actions'; import { HostWindowService } from './shared/host-window.service'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 66636c32495..626c4dc32a7 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -18,6 +18,13 @@ import { NavigationStart, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { isAuthenticationBlocking } from '@core/auth/selectors'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; +import { distinctNext } from '@core/shared/distinct-next'; import { NgbModal, NgbModalConfig, @@ -39,13 +46,6 @@ import { } from 'rxjs/operators'; import { environment } from '../environments/environment'; -import { AuthService } from './core/auth/auth.service'; -import { isAuthenticationBlocking } from './core/auth/selectors'; -import { - NativeWindowRef, - NativeWindowService, -} from './core/services/window.service'; -import { distinctNext } from './core/shared/distinct-next'; import { ThemedRootComponent } from './root/themed-root.component'; import { HostWindowResizeAction } from './shared/host-window.actions'; import { IdleModalComponent } from './shared/idle-modal/idle-modal.component'; diff --git a/src/app/app.config.ts b/src/app/app.config.ts index 584336a16e0..7c7fd646e4e 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -16,6 +16,17 @@ import { withPreloading, withRouterConfig, } from '@angular/router'; +import { AuthInterceptor } from '@core/auth/auth.interceptor'; +import { DspaceRestInterceptor } from '@core/dspace-rest/dspace-rest.interceptor'; +import { LocaleInterceptor } from '@core/locale/locale.interceptor'; +import { LogInterceptor } from '@core/log/log.interceptor'; +import { + models, + provideCore, +} from '@core/provide-core'; +import { ClientCookieService } from '@core/services/client-cookie.service'; +import { ListableModule } from '@core/shared/listable.module'; +import { XsrfInterceptor } from '@core/xsrf/xsrf.interceptor'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core'; import { EffectsModule } from '@ngrx/effects'; @@ -55,17 +66,6 @@ import { APP_ROUTING_SCROLL_CONF, } from './app-routes'; import { BROWSE_BY_DECORATOR_MAP } from './browse-by/browse-by-switcher/browse-by-decorator'; -import { AuthInterceptor } from './core/auth/auth.interceptor'; -import { DspaceRestInterceptor } from './core/dspace-rest/dspace-rest.interceptor'; -import { LocaleInterceptor } from './core/locale/locale.interceptor'; -import { LogInterceptor } from './core/log/log.interceptor'; -import { - models, - provideCore, -} from './core/provide-core'; -import { ClientCookieService } from './core/services/client-cookie.service'; -import { ListableModule } from './core/shared/listable.module'; -import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor'; import { LOGIN_METHOD_FOR_DECORATOR_MAP } from './external-log-in/decorators/external-log-in.methods-decorator'; import { RootModule } from './root.module'; import { AUTH_METHOD_FOR_DECORATOR_MAP } from './shared/log-in/methods/log-in.methods-decorator'; diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts index c2034b0a69d..ee066b9f05b 100644 --- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts +++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts @@ -9,6 +9,8 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { TranslateLoader, TranslateModule, @@ -16,8 +18,6 @@ import { import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { ResourcePoliciesComponent } from '../../shared/resource-policies/resource-policies.component'; diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts index 4821139b544..426af65da22 100644 --- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts +++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts @@ -7,6 +7,8 @@ import { ActivatedRoute, RouterLink, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { @@ -14,8 +16,6 @@ import { map, } from 'rxjs/operators'; -import { RemoteData } from '../../core/data/remote-data'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { ResourcePoliciesComponent } from '../../shared/resource-policies/resource-policies.component'; @Component({ diff --git a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts index 5ef75db2278..cb1599ae347 100644 --- a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts +++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts @@ -12,19 +12,19 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { SignpostingDataService } from '@core/data/signposting-data.service'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { ServerResponseService } from '@core/services/server-response.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { FileService } from '@core/shared/file.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { getForbiddenRoute } from '../../app-routing-paths'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { SignpostingDataService } from '../../core/data/signposting-data.service'; -import { HardRedirectService } from '../../core/services/hard-redirect.service'; -import { ServerResponseService } from '../../core/services/server-response.service'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { FileService } from '../../core/shared/file.service'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { MatomoService } from '../../statistics/matomo.service'; import { BitstreamDownloadPageComponent } from './bitstream-download-page.component'; diff --git a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts index 36d8eca6401..fd77e502ac8 100644 --- a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts +++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts @@ -15,6 +15,20 @@ import { Params, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { RemoteData } from '@core/data/remote-data'; +import { SignpostingDataService } from '@core/data/signposting-data.service'; +import { SignpostingLink } from '@core/data/signposting-links.model'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { ServerResponseService } from '@core/services/server-response.service'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { FileService } from '@core/shared/file.service'; +import { getRemoteDataPayload } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { combineLatest as observableCombineLatest, @@ -29,20 +43,6 @@ import { } from 'rxjs/operators'; import { getForbiddenRoute } from '../../app-routing-paths'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { RemoteData } from '../../core/data/remote-data'; -import { SignpostingDataService } from '../../core/data/signposting-data.service'; -import { SignpostingLink } from '../../core/data/signposting-links.model'; -import { HardRedirectService } from '../../core/services/hard-redirect.service'; -import { ServerResponseService } from '../../core/services/server-response.service'; -import { redirectOn4xx } from '../../core/shared/authorized.operators'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { FileService } from '../../core/shared/file.service'; -import { getRemoteDataPayload } from '../../core/shared/operators'; import { hasValue, isNotEmpty, diff --git a/src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts b/src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts index e46a1b12e6c..2fcd9587923 100644 --- a/src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts +++ b/src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts @@ -3,6 +3,8 @@ import { Router, UrlTree, } from '@angular/router'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { Bitstream } from '@core/shared/bitstream.model'; import { Observable, of, @@ -11,8 +13,6 @@ import { AuthService } from 'src/app/core/auth/auth.service'; import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; -import { BitstreamDataService } from '../core/data/bitstream-data.service'; -import { Bitstream } from '../core/shared/bitstream.model'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard'; diff --git a/src/app/bitstream-page/bitstream-page-authorizations.guard.ts b/src/app/bitstream-page/bitstream-page-authorizations.guard.ts index 6c5a6d3752c..a14383a1757 100644 --- a/src/app/bitstream-page/bitstream-page-authorizations.guard.ts +++ b/src/app/bitstream-page/bitstream-page-authorizations.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { bitstreamPageResolver } from './bitstream-page.resolver'; /** diff --git a/src/app/bitstream-page/bitstream-page-routes.ts b/src/app/bitstream-page/bitstream-page-routes.ts index 05de91d5003..404f059b81e 100644 --- a/src/app/bitstream-page/bitstream-page-routes.ts +++ b/src/app/bitstream-page/bitstream-page-routes.ts @@ -1,8 +1,8 @@ import { Route } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { bitstreamBreadcrumbResolver } from '@core/breadcrumbs/bitstream-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; -import { bitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component'; import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component'; import { resourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver'; diff --git a/src/app/bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts index f6a039b1d85..646e268535e 100644 --- a/src/app/bitstream-page/bitstream-page.resolver.ts +++ b/src/app/bitstream-page/bitstream-page.resolver.ts @@ -4,12 +4,12 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; -import { BitstreamDataService } from '../core/data/bitstream-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { Bitstream } from '../core/shared/bitstream.model'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { followLink, FollowLinkConfig, diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts index ca556264111..cd28d7faa15 100644 --- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts +++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts @@ -16,6 +16,15 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { BitstreamFormatDataService } from '@core/data/bitstream-format-data.service'; +import { PrimaryBitstreamService } from '@core/data/primary-bitstream.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { BitstreamFormatSupportLevel } from '@core/shared/bitstream-format-support-level'; +import { Item } from '@core/shared/item.model'; +import { MetadataValueFilter } from '@core/shared/metadata.models'; import { DynamicFormControlModel, DynamicFormService, @@ -23,15 +32,6 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../core/data/bitstream-data.service'; -import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service'; -import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { BitstreamFormat } from '../../core/shared/bitstream-format.model'; -import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level'; -import { Item } from '../../core/shared/item.model'; -import { MetadataValueFilter } from '../../core/shared/metadata.models'; import { getEntityEditRoute } from '../../item-page/item-page-routing-paths'; import { hasValue } from '../../shared/empty.util'; import { diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts index 61338f8df3c..0a1c151bd1a 100644 --- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts +++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts @@ -12,6 +12,25 @@ import { Router, RouterLink, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { FindAllDataImpl } from '@core/data/base/find-all-data'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { BitstreamFormatDataService } from '@core/data/bitstream-format-data.service'; +import { PrimaryBitstreamService } from '@core/data/primary-bitstream.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { BITSTREAM_FORMAT } from '@core/shared/bitstream-format.resource-type'; +import { BitstreamFormatSupportLevel } from '@core/shared/bitstream-format-support-level'; +import { Bundle } from '@core/shared/bundle.model'; +import { Item } from '@core/shared/item.model'; +import { Metadata } from '@core/shared/metadata.utils'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getFirstSucceededRemoteDataPayload, + getRemoteDataPayload, +} from '@core/shared/operators'; import { DynamicFormControlModel, DynamicFormGroupModel, @@ -39,25 +58,6 @@ import { tap, } from 'rxjs/operators'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { FindAllDataImpl } from '../../core/data/base/find-all-data'; -import { BitstreamDataService } from '../../core/data/bitstream-data.service'; -import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service'; -import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { BitstreamFormat } from '../../core/shared/bitstream-format.model'; -import { BITSTREAM_FORMAT } from '../../core/shared/bitstream-format.resource-type'; -import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level'; -import { Bundle } from '../../core/shared/bundle.model'; -import { Item } from '../../core/shared/item.model'; -import { Metadata } from '../../core/shared/metadata.utils'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getFirstSucceededRemoteDataPayload, - getRemoteDataPayload, -} from '../../core/shared/operators'; import { getEntityEditRoute } from '../../item-page/item-page-routing-paths'; import { hasValue, diff --git a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts index 1eb0e00b85f..f0965938781 100644 --- a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts +++ b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts @@ -1,13 +1,13 @@ +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestEntryState } from '@core/data/request-entry-state.model'; +import { BrowserHardRedirectService } from '@core/services/browser-hard-redirect.service'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { Bitstream } from '@core/shared/bitstream.model'; import { cold } from 'jasmine-marbles'; import { EMPTY } from 'rxjs'; import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths'; -import { BitstreamDataService } from '../core/data/bitstream-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { RequestEntryState } from '../core/data/request-entry-state.model'; -import { BrowserHardRedirectService } from '../core/services/browser-hard-redirect.service'; -import { HardRedirectService } from '../core/services/hard-redirect.service'; -import { Bitstream } from '../core/shared/bitstream.model'; import { RouterStub } from '../shared/testing/router.stub'; import { legacyBitstreamURLRedirectGuard } from './legacy-bitstream-url-redirect.guard'; diff --git a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts index 78403ed7e3f..2dcf8208bac 100644 --- a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts +++ b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts @@ -6,15 +6,15 @@ import { RouterStateSnapshot, UrlTree, } from '@angular/router'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths'; -import { BitstreamDataService } from '../core/data/bitstream-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { HardRedirectService } from '../core/services/hard-redirect.service'; -import { Bitstream } from '../core/shared/bitstream.model'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { hasNoValue } from '../shared/empty.util'; /** diff --git a/src/app/breadcrumbs/breadcrumb/breadcrumb-config.model.ts b/src/app/breadcrumbs/breadcrumb/breadcrumb-config.model.ts index cc9277ee50b..95f1b5641b6 100644 --- a/src/app/breadcrumbs/breadcrumb/breadcrumb-config.model.ts +++ b/src/app/breadcrumbs/breadcrumb/breadcrumb-config.model.ts @@ -1,4 +1,4 @@ -import { BreadcrumbsProviderService } from '../../core/breadcrumbs/breadcrumbsProviderService'; +import { BreadcrumbsProviderService } from '@core/breadcrumbs/breadcrumbsProviderService'; /** * Interface for breadcrumb configuration objects diff --git a/src/app/breadcrumbs/breadcrumbs.service.spec.ts b/src/app/breadcrumbs/breadcrumbs.service.spec.ts index 8f074cf5a47..bbbdf390b34 100644 --- a/src/app/breadcrumbs/breadcrumbs.service.spec.ts +++ b/src/app/breadcrumbs/breadcrumbs.service.spec.ts @@ -4,6 +4,7 @@ import { NavigationEnd, Router, } from '@angular/router'; +import { BreadcrumbsProviderService } from '@core/breadcrumbs/breadcrumbsProviderService'; import { cold } from 'jasmine-marbles'; import { Observable, @@ -11,7 +12,6 @@ import { Subject, } from 'rxjs'; -import { BreadcrumbsProviderService } from '../core/breadcrumbs/breadcrumbsProviderService'; import { Breadcrumb } from './breadcrumb/breadcrumb.model'; import { BreadcrumbConfig } from './breadcrumb/breadcrumb-config.model'; import { BreadcrumbsService } from './breadcrumbs.service'; diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts index 611ac7e23f0..36ecbc663b8 100644 --- a/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts +++ b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts @@ -16,6 +16,14 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseEntrySearchOptions } from '@core/browse/browse-entry-search-options.model'; +import { SortDirection } from '@core/cache/models/sort-options.model'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { BrowseEntry } from '@core/shared/browse-entry.model'; +import { Community } from '@core/shared/community.model'; +import { Item } from '@core/shared/item.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; @@ -24,14 +32,6 @@ import { of } from 'rxjs'; import { APP_CONFIG } from '../../../config/app-config.interface'; import { environment } from '../../../environments/environment'; -import { BrowseService } from '../../core/browse/browse.service'; -import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model'; -import { SortDirection } from '../../core/cache/models/sort-options.model'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { BrowseEntry } from '../../core/shared/browse-entry.model'; -import { Community } from '../../core/shared/community.model'; -import { Item } from '../../core/shared/item.model'; import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component'; import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; import { ComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/comcol-page-content.component'; diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts index 2b4b04d3480..ff903a98d0c 100644 --- a/src/app/browse-by/browse-by-date/browse-by-date.component.ts +++ b/src/app/browse-by/browse-by-date/browse-by-date.component.ts @@ -14,6 +14,16 @@ import { Params, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BrowseService } from '@core/browse/browse.service'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { combineLatest as observableCombineLatest, @@ -31,16 +41,6 @@ import { AppConfig, } from '../../../config/app-config.interface'; import { environment } from '../../../environments/environment'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { BrowseService } from '../../core/browse/browse.service'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { Item } from '../../core/shared/item.model'; import { isValidDate } from '../../shared/date.util'; import { hasValue, diff --git a/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts index a5a233dcd67..a34abba33ae 100644 --- a/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts +++ b/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts @@ -4,19 +4,19 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { DSOBreadcrumbsService } from '@core/breadcrumbs/dso-breadcrumbs.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { getDSORoute } from '../app-routing-paths'; import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model'; -import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service'; -import { DSpaceObjectDataService } from '../core/data/dspace-object-data.service'; -import { Collection } from '../core/shared/collection.model'; -import { Community } from '../core/shared/community.model'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../core/shared/operators'; import { hasValue } from '../shared/empty.util'; /** diff --git a/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.spec.ts b/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.spec.ts index 782af21f105..0dfeb9e53c5 100644 --- a/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.spec.ts +++ b/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.spec.ts @@ -5,15 +5,15 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { StoreModule } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { environment } from '../../../environments/environment'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { PageInfo } from '../../core/shared/page-info.model'; -import { SearchService } from '../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { FacetValue } from '../../shared/search/models/facet-value.model'; import { FilterType } from '../../shared/search/models/filter-type.model'; diff --git a/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.ts b/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.ts index 4b8a93928fb..5491c234bd0 100644 --- a/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.ts +++ b/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.ts @@ -11,6 +11,12 @@ import { ActivatedRoute, Params, } from '@angular/router'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; import { combineLatest, @@ -25,12 +31,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../core/shared/operators'; -import { SearchService } from '../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { hasValue } from '../../shared/empty.util'; import { GeospatialMapComponent } from '../../shared/geospatial-map/geospatial-map.component'; import { FacetValues } from '../../shared/search/models/facet-values.model'; diff --git a/src/app/browse-by/browse-by-guard.spec.ts b/src/app/browse-by/browse-by-guard.spec.ts index 1037ca4d95a..49034d37d90 100644 --- a/src/app/browse-by/browse-by-guard.spec.ts +++ b/src/app/browse-by/browse-by-guard.spec.ts @@ -1,6 +1,6 @@ +import { ValueListBrowseDefinition } from '@core/shared/value-list-browse-definition.model'; import { first } from 'rxjs/operators'; -import { ValueListBrowseDefinition } from '../core/shared/value-list-browse-definition.model'; import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$, diff --git a/src/app/browse-by/browse-by-guard.ts b/src/app/browse-by/browse-by-guard.ts index d154e8d4f6e..bfbb9af8cca 100644 --- a/src/app/browse-by/browse-by-guard.ts +++ b/src/app/browse-by/browse-by-guard.ts @@ -6,6 +6,10 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateService } from '@ngx-translate/core'; import { Observable, @@ -17,10 +21,6 @@ import { } from 'rxjs/operators'; import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths'; -import { BrowseDefinitionDataService } from '../core/browse/browse-definition-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { BrowseDefinition } from '../core/shared/browse-definition.model'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { hasNoValue, hasValue, diff --git a/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts index 64cf6df6db4..0d233cc9515 100644 --- a/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts +++ b/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts @@ -3,9 +3,9 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; /** * Method for resolving a browse-by i18n breadcrumb configuration object diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts index fc892c67e7e..24d1a54d760 100644 --- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts +++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts @@ -16,6 +16,20 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseEntrySearchOptions } from '@core/browse/browse-entry-search-options.model'; +import { SortDirection } from '@core/cache/models/sort-options.model'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { BrowseEntry } from '@core/shared/browse-entry.model'; +import { Community } from '@core/shared/community.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; @@ -33,20 +47,6 @@ import { routeServiceStub } from 'src/app/shared/testing/route-service.stub'; import { ThemeService } from 'src/app/shared/theme-support/theme.service'; import { APP_CONFIG } from '../../../config/app-config.interface'; -import { BrowseService } from '../../core/browse/browse.service'; -import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model'; -import { SortDirection } from '../../core/cache/models/sort-options.model'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { BrowseEntry } from '../../core/shared/browse-entry.model'; -import { Community } from '../../core/shared/community.model'; -import { Item } from '../../core/shared/item.model'; -import { PageInfo } from '../../core/shared/page-info.model'; import { RouterMock } from '../../shared/mocks/router.mock'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts index 6b66be8eaf8..f26abc50b6f 100644 --- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts +++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts @@ -17,6 +17,21 @@ import { Params, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseEntrySearchOptions } from '@core/browse/browse-entry-search-options.model'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { BrowseEntry } from '@core/shared/browse-entry.model'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -36,21 +51,6 @@ import { AppConfig, } from '../../../config/app-config.interface'; import { environment } from '../../../environments/environment'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { BrowseService } from '../../core/browse/browse.service'; -import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { BrowseEntry } from '../../core/shared/browse-entry.model'; -import { Context } from '../../core/shared/context.model'; -import { Item } from '../../core/shared/item.model'; -import { getFirstSucceededRemoteData } from '../../core/shared/operators'; import { hasValue, isNotEmpty, diff --git a/src/app/browse-by/browse-by-page-routes.ts b/src/app/browse-by/browse-by-page-routes.ts index 7c625afc1f8..a30b9e43654 100644 --- a/src/app/browse-by/browse-by-page-routes.ts +++ b/src/app/browse-by/browse-by-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { browseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver'; import { BrowseByGeospatialDataComponent } from './browse-by-geospatial-data/browse-by-geospatial-data.component'; import { browseByGuard } from './browse-by-guard'; diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts index b42639d69eb..d80b1d01fa2 100644 --- a/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts +++ b/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts @@ -6,9 +6,9 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; -import { BrowseDefinition } from '../../core/shared/browse-definition.model'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; import { DynamicComponentLoaderDirective } from '../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.ts index b0f32f2dd27..7aa806db099 100644 --- a/src/app/browse-by/browse-by-page/browse-by-page.component.ts +++ b/src/app/browse-by/browse-by-page/browse-by-page.component.ts @@ -4,10 +4,10 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { BrowseDefinition } from '../../core/shared/browse-definition.model'; import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type'; import { BrowseBySwitcherComponent } from '../browse-by-switcher/browse-by-switcher.component'; diff --git a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts index aac4c9abec4..e80621db3e3 100644 --- a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts +++ b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; -import { Context } from '../../core/shared/context.model'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; import { hasNoValue } from '../../shared/empty.util'; import { DEFAULT_THEME, diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts index 35197591be8..f2ab3657416 100644 --- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts +++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts @@ -7,10 +7,10 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { FlatBrowseDefinition } from '@core/shared/flat-browse-definition.model'; +import { NonHierarchicalBrowseDefinition } from '@core/shared/non-hierarchical-browse-definition'; +import { ValueListBrowseDefinition } from '@core/shared/value-list-browse-definition.model'; -import { FlatBrowseDefinition } from '../../core/shared/flat-browse-definition.model'; -import { NonHierarchicalBrowseDefinition } from '../../core/shared/non-hierarchical-browse-definition'; -import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model'; import { DynamicComponentLoaderDirective } from '../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { ThemeService } from '../../shared/theme-support/theme.service'; diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts index cb507674744..980a221d1ba 100644 --- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts +++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts @@ -6,9 +6,9 @@ import { Component, Input, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; -import { Context } from '../../core/shared/context.model'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; import { AbstractComponentLoaderComponent } from '../../shared/abstract-component-loader/abstract-component-loader.component'; import { DynamicComponentLoaderDirective } from '../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { BrowseByDataType } from './browse-by-data-type'; diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.spec.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.spec.ts index 8e759d73528..7136306b73a 100644 --- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.spec.ts +++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.spec.ts @@ -4,11 +4,11 @@ import { TestBed, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { HierarchicalBrowseDefinition } from '@core/shared/hierarchical-browse-definition.model'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject } from 'rxjs'; -import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model'; -import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { VocabularyTreeviewComponent } from '../../shared/form/vocabulary-treeview/vocabulary-treeview.component'; import { ThemeService } from '../../shared/theme-support/theme.service'; import { createDataWithBrowseDefinition } from '../browse-by-switcher/browse-by-switcher.component.spec'; diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts index 71abac56f7b..622719f9c8a 100644 --- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts +++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts @@ -10,6 +10,11 @@ import { Params, RouterLink, } from '@angular/router'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; +import { Context } from '@core/shared/context.model'; +import { HierarchicalBrowseDefinition } from '@core/shared/hierarchical-browse-definition.model'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { TranslatePipe, TranslateService, @@ -21,11 +26,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { BrowseDefinition } from '../../core/shared/browse-definition.model'; -import { Context } from '../../core/shared/context.model'; -import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model'; -import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model'; import { hasValue } from '../../shared/empty.util'; import { VocabularyTreeviewComponent } from '../../shared/form/vocabulary-treeview/vocabulary-treeview.component'; import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type'; diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts index f60a142ade9..fd7aed03c4c 100644 --- a/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts +++ b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts @@ -15,19 +15,19 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { BrowseService } from '@core/browse/browse.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { BrowseEntry } from '@core/shared/browse-entry.model'; +import { Community } from '@core/shared/community.model'; +import { Item } from '@core/shared/item.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../config/app-config.interface'; import { environment } from '../../../environments/environment'; -import { BrowseService } from '../../core/browse/browse.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { BrowseEntry } from '../../core/shared/browse-entry.model'; -import { Community } from '../../core/shared/community.model'; -import { Item } from '../../core/shared/item.model'; import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component'; import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; import { ComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/comcol-page-content.component'; diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts index bcf175f9007..61ceef90da5 100644 --- a/src/app/browse-by/browse-by-title/browse-by-title.component.ts +++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts @@ -7,6 +7,10 @@ import { OnInit, } from '@angular/core'; import { Params } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; import { TranslateModule } from '@ngx-translate/core'; import { combineLatest as observableCombineLatest, @@ -19,10 +23,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; diff --git a/src/app/collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts index 896edf8ceb3..6cc5a9b7e20 100644 --- a/src/app/collection-page/collection-form/collection-form.component.ts +++ b/src/app/collection-page/collection-form/collection-form.component.ts @@ -8,6 +8,16 @@ import { SimpleChange, SimpleChanges, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { RequestService } from '@core/data/request.service'; +import { Collection } from '@core/shared/collection.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { NONE_ENTITY_TYPE } from '@core/shared/item-relationships/item-type.resource-type'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { getFirstSucceededRemoteListPayload } from '@core/shared/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormControlModel, @@ -25,16 +35,6 @@ import { isNotNull, } from 'src/app/shared/empty.util'; -import { AuthService } from '../../core/auth/auth.service'; -import { ObjectCacheService } from '../../core/cache/object-cache.service'; -import { CollectionDataService } from '../../core/data/collection-data.service'; -import { EntityTypeDataService } from '../../core/data/entity-type-data.service'; -import { RequestService } from '../../core/data/request.service'; -import { Collection } from '../../core/shared/collection.model'; -import { ItemType } from '../../core/shared/item-relationships/item-type.model'; -import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type'; -import { MetadataValue } from '../../core/shared/metadata.models'; -import { getFirstSucceededRemoteListPayload } from '../../core/shared/operators'; import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component'; import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component'; import { FormComponent } from '../../shared/form/form.component'; diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts index 4a124fa48d3..d70fe44fa7d 100644 --- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts +++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts @@ -12,6 +12,21 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { RouteService } from '@core/services/route.service'; +import { Collection } from '@core/shared/collection.model'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -19,21 +34,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { GroupDataService } from '../../core/eperson/group-data.service'; -import { LinkHeadService } from '../../core/services/link-head.service'; -import { RouteService } from '../../core/services/route.service'; -import { Collection } from '../../core/shared/collection.model'; -import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; -import { SearchService } from '../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; import { ErrorComponent } from '../../shared/error/error.component'; import { HostWindowService } from '../../shared/host-window.service'; diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts index 745e59eb03a..ab463426496 100644 --- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts +++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts @@ -10,6 +10,28 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ItemDataService } from '@core/data/item-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getAllSucceededRemoteData, + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload, + toDSpaceObjectListRD, +} from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -27,28 +49,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Collection } from '../../core/shared/collection.model'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { - getAllSucceededRemoteData, - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getRemoteDataPayload, - toDSpaceObjectListRD, -} from '../../core/shared/operators'; -import { SearchService } from '../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; import { fadeIn, diff --git a/src/app/collection-page/collection-page-administrator.guard.ts b/src/app/collection-page/collection-page-administrator.guard.ts index 36875f23ad0..3311f94341c 100644 --- a/src/app/collection-page/collection-page-administrator.guard.ts +++ b/src/app/collection-page/collection-page-administrator.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { collectionPageResolver } from './collection-page.resolver'; /** diff --git a/src/app/collection-page/collection-page-routes.ts b/src/app/collection-page/collection-page-routes.ts index ce583b2cd58..3929f23b418 100644 --- a/src/app/collection-page/collection-page-routes.ts +++ b/src/app/collection-page/collection-page-routes.ts @@ -1,11 +1,11 @@ import { Route } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { collectionBreadcrumbResolver } from '@core/breadcrumbs/collection-breadcrumb.resolver'; +import { communityBreadcrumbResolver } from '@core/breadcrumbs/community-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; import { browseByGuard } from '../browse-by/browse-by-guard'; import { browseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; -import { collectionBreadcrumbResolver } from '../core/breadcrumbs/collection-breadcrumb.resolver'; -import { communityBreadcrumbResolver } from '../core/breadcrumbs/community-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component'; import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component'; import { MenuRoute } from '../shared/menu/menu-route.model'; diff --git a/src/app/collection-page/collection-page-routing-paths.ts b/src/app/collection-page/collection-page-routing-paths.ts index 2eebe31e1c5..54538cd7da3 100644 --- a/src/app/collection-page/collection-page-routing-paths.ts +++ b/src/app/collection-page/collection-page-routing-paths.ts @@ -1,4 +1,4 @@ -import { URLCombiner } from '../core/url-combiner/url-combiner'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; export const COLLECTION_PARENT_PARAMETER = 'parent'; diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts index 6e2f80a0307..fb920bd0be8 100644 --- a/src/app/collection-page/collection-page.component.ts +++ b/src/app/collection-page/collection-page.component.ts @@ -9,6 +9,16 @@ import { Router, RouterOutlet, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { RemoteData } from '@core/data/remote-data'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Collection } from '@core/shared/collection.model'; +import { getAllSucceededRemoteDataPayload } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { @@ -18,16 +28,6 @@ import { take, } from 'rxjs/operators'; -import { AuthService } from '../core/auth/auth.service'; -import { DSONameService } from '../core/breadcrumbs/dso-name.service'; -import { SortOptions } from '../core/cache/models/sort-options.model'; -import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../core/data/feature-authorization/feature-id'; -import { RemoteData } from '../core/data/remote-data'; -import { redirectOn4xx } from '../core/shared/authorized.operators'; -import { Bitstream } from '../core/shared/bitstream.model'; -import { Collection } from '../core/shared/collection.model'; -import { getAllSucceededRemoteDataPayload } from '../core/shared/operators'; import { fadeIn, fadeInOut, diff --git a/src/app/collection-page/collection-page.resolver.ts b/src/app/collection-page/collection-page.resolver.ts index 6befefc152d..b008b612642 100644 --- a/src/app/collection-page/collection-page.resolver.ts +++ b/src/app/collection-page/collection-page.resolver.ts @@ -4,15 +4,15 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { ResolvedAction } from '@core/resolving/resolver.actions'; +import { Collection } from '@core/shared/collection.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { AppState } from '../app.reducer'; -import { CollectionDataService } from '../core/data/collection-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { ResolvedAction } from '../core/resolving/resolver.actions'; -import { Collection } from '../core/shared/collection.model'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { followLink, FollowLinkConfig, diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts index bb22c8585b4..134c08fa46a 100644 --- a/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts +++ b/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts @@ -7,15 +7,15 @@ import { } from '@angular/core/testing'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { CollectionDataService } from '../../core/data/collection-data.service'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { RequestService } from '../../core/data/request.service'; -import { RouteService } from '../../core/services/route.service'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.ts index 1a36489f03b..e930dc40a15 100644 --- a/src/app/collection-page/create-collection-page/create-collection-page.component.ts +++ b/src/app/collection-page/create-collection-page/create-collection-page.component.ts @@ -1,17 +1,17 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { Router } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; +import { Collection } from '@core/shared/collection.model'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { CollectionDataService } from '../../core/data/collection-data.service'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { RequestService } from '../../core/data/request.service'; -import { RouteService } from '../../core/services/route.service'; -import { Collection } from '../../core/shared/collection.model'; import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts b/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts index b7c362118b8..71a56681f8e 100644 --- a/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts +++ b/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts @@ -1,6 +1,6 @@ +import { Community } from '@core/shared/community.model'; import { first } from 'rxjs/operators'; -import { Community } from '../../core/shared/community.model'; import { RouterMock } from '../../shared/mocks/router.mock'; import { createFailedRemoteDataObject$, diff --git a/src/app/collection-page/create-collection-page/create-collection-page.guard.ts b/src/app/collection-page/create-collection-page/create-collection-page.guard.ts index e52fe57d259..5152683a718 100644 --- a/src/app/collection-page/create-collection-page/create-collection-page.guard.ts +++ b/src/app/collection-page/create-collection-page/create-collection-page.guard.ts @@ -5,6 +5,10 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Community } from '@core/shared/community.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable, of, @@ -14,10 +18,6 @@ import { tap, } from 'rxjs/operators'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { Community } from '../../core/shared/community.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { hasNoValue, hasValue, diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts index 2b5b8a3d136..e9967d95dbb 100644 --- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts +++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts @@ -7,12 +7,12 @@ import { } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { RequestService } from '@core/data/request.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { CollectionDataService } from '../../core/data/collection-data.service'; -import { RequestService } from '../../core/data/request.service'; import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { DeleteCollectionPageComponent } from './delete-collection-page.component'; diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts index 30ecf9a2718..11d5721ed65 100644 --- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts +++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts @@ -4,14 +4,14 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { Collection } from '@core/shared/collection.model'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { CollectionDataService } from '../../core/data/collection-data.service'; -import { Collection } from '../../core/shared/collection.model'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts index f0305c6f590..a5cc34f498c 100644 --- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts @@ -3,9 +3,9 @@ import { TestBed, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { Community } from '@core/shared/community.model'; import { of } from 'rxjs'; -import { Community } from '../../../core/shared/community.model'; import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component'; import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; import { CollectionAccessControlComponent } from './collection-access-control.component'; diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts index 6d63b69533f..4d318c8a2b5 100644 --- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts @@ -4,12 +4,12 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Community } from '@core/shared/community.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Community } from '../../../core/shared/community.model'; -import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component'; @Component({ diff --git a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts index 779bf1d5e3d..f21b9ccd10c 100644 --- a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts @@ -9,11 +9,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { Collection } from '@core/shared/collection.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { Collection } from '../../../core/shared/collection.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; import { ResourcePoliciesComponent } from '../../../shared/resource-policies/resource-policies.component'; import { CollectionAuthorizationsComponent } from './collection-authorizations.component'; diff --git a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts index c3545494385..1bd0b6e7eb9 100644 --- a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts @@ -4,14 +4,14 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Observable } from 'rxjs'; import { first, map, } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { ResourcePoliciesComponent } from '../../../shared/resource-policies/resource-policies.component'; @Component({ diff --git a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts index 110b9f4c25e..42ee489513f 100644 --- a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts @@ -8,11 +8,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Collection } from '@core/shared/collection.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { Collection } from '../../../core/shared/collection.model'; import { CurationFormComponent } from '../../../curation-form/curation-form.component'; import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; import { CollectionCurateComponent } from './collection-curate.component'; diff --git a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts index f97baffff22..24db006f704 100644 --- a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts @@ -4,6 +4,9 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { @@ -12,9 +15,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Collection } from '../../../core/shared/collection.model'; import { CurationFormComponent } from '../../../curation-form/curation-form.component'; import { hasValue } from '../../../shared/empty.util'; diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts index a7dc82b00a2..918fd832e38 100644 --- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts @@ -11,18 +11,18 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { ItemTemplateDataService } from '@core/data/item-template-data.service'; +import { RequestService } from '@core/data/request.service'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; -import { AuthService } from '../../../core/auth/auth.service'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { CommunityDataService } from '../../../core/data/community-data.service'; -import { ItemTemplateDataService } from '../../../core/data/item-template-data.service'; -import { RequestService } from '../../../core/data/request.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { Item } from '../../../core/shared/item.model'; import { AuthServiceMock } from '../../../shared/mocks/auth.service.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts index 29a6ebb710c..c6b028b8fd0 100644 --- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts @@ -11,6 +11,17 @@ import { RouterLink, Scroll, } from '@angular/router'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { ItemTemplateDataService } from '@core/data/item-template-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -24,17 +35,6 @@ import { switchMap, } from 'rxjs/operators'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { ItemTemplateDataService } from '../../../core/data/item-template-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { Item } from '../../../core/shared/item.model'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component'; import { hasValue } from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts index 8fd4941eab5..1db22f1abad 100644 --- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts @@ -10,13 +10,13 @@ import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RequestService } from '@core/data/request.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Collection } from '@core/shared/collection.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RequestService } from '../../../core/data/request.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { Collection } from '../../../core/shared/collection.model'; import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts index 3911c16046a..d3d617b17b0 100644 --- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts @@ -4,19 +4,19 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { Observable } from 'rxjs'; import { first, map, } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Collection } from '../../../core/shared/collection.model'; -import { HALLink } from '../../../core/shared/hal-link.model'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; import { ComcolRoleComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component'; import { hasValue } from '../../../shared/empty.util'; diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts index c8249e170ae..d06ddacf334 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts @@ -7,20 +7,20 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { RequestService } from '@core/data/request.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Collection } from '@core/shared/collection.model'; +import { ContentSource } from '@core/shared/content-source.model'; +import { ContentSourceSetSerializer } from '@core/shared/content-source-set-serializer'; import { TranslateModule } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { CollectionDataService } from '../../../../core/data/collection-data.service'; -import { ProcessDataService } from '../../../../core/data/processes/process-data.service'; -import { ScriptDataService } from '../../../../core/data/processes/script-data.service'; -import { RequestService } from '../../../../core/data/request.service'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { Collection } from '../../../../core/shared/collection.model'; -import { ContentSource } from '../../../../core/shared/content-source.model'; -import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer'; import { Process } from '../../../../process-page/processes/process.model'; import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts index dbe20fc5796..490188ce6e6 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts @@ -6,6 +6,19 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { RequestService } from '@core/data/request.service'; +import { Collection } from '@core/shared/collection.model'; +import { ContentSource } from '@core/shared/content-source.model'; +import { ContentSourceSetSerializer } from '@core/shared/content-source-set-serializer'; +import { + getAllSucceededRemoteDataPayload, + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -22,19 +35,6 @@ import { tap, } from 'rxjs/operators'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { CollectionDataService } from '../../../../core/data/collection-data.service'; -import { ProcessDataService } from '../../../../core/data/processes/process-data.service'; -import { ScriptDataService } from '../../../../core/data/processes/script-data.service'; -import { RequestService } from '../../../../core/data/request.service'; -import { Collection } from '../../../../core/shared/collection.model'; -import { ContentSource } from '../../../../core/shared/content-source.model'; -import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer'; -import { - getAllSucceededRemoteDataPayload, - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../../core/shared/operators'; import { Process } from '../../../../process-page/processes/process.model'; import { ProcessStatus } from '../../../../process-page/processes/process-status.model'; import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive'; diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts index 3e61103ff60..3622521298a 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts @@ -14,6 +14,15 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { FieldUpdate } from '@core/data/object-updates/field-update.model'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RequestService } from '@core/data/request.service'; +import { Collection } from '@core/shared/collection.model'; +import { + ContentSource, + ContentSourceHarvestType, +} from '@core/shared/content-source.model'; import { DynamicFormControlModel, DynamicFormService, @@ -21,15 +30,6 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { FieldUpdate } from '../../../core/data/object-updates/field-update.model'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { RequestService } from '../../../core/data/request.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { - ContentSource, - ContentSourceHarvestType, -} from '../../../core/shared/content-source.model'; import { hasValue } from '../../../shared/empty.util'; import { FormComponent } from '../../../shared/form/form.component'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts index fa20b0e5e12..6f1b6f5732b 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -12,6 +12,22 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { FieldUpdate } from '@core/data/object-updates/field-update.model'; +import { FieldUpdates } from '@core/data/object-updates/field-updates.model'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { Collection } from '@core/shared/collection.model'; +import { + ContentSource, + ContentSourceHarvestType, +} from '@core/shared/content-source.model'; +import { MetadataConfig } from '@core/shared/metadata-config.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, +} from '@core/shared/operators'; import { DynamicFormControlModel, DynamicFormGroupModel, @@ -39,22 +55,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../../environments/environment'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { FieldUpdate } from '../../../core/data/object-updates/field-update.model'; -import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { - ContentSource, - ContentSourceHarvestType, -} from '../../../core/shared/content-source.model'; -import { MetadataConfig } from '../../../core/shared/metadata-config.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, -} from '../../../core/shared/operators'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { hasNoValue, diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page-routes.ts b/src/app/collection-page/edit-collection-page/edit-collection-page-routes.ts index 19dbaa616b2..b5a69cd6f2d 100644 --- a/src/app/collection-page/edit-collection-page/edit-collection-page-routes.ts +++ b/src/app/collection-page/edit-collection-page/edit-collection-page-routes.ts @@ -1,7 +1,7 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; +import { collectionAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard'; -import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { collectionAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard'; import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component'; import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component'; import { resourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver'; diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts index 9fff61ad19e..0e8809ddf8e 100644 --- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts @@ -7,10 +7,10 @@ import { } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { CollectionDataService } from '@core/data/collection-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { CollectionDataService } from '../../core/data/collection-data.service'; import { EditCollectionPageComponent } from './edit-collection-page.component'; describe('EditCollectionPageComponent', () => { diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts index 25a5c7b6d75..b10f605714d 100644 --- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts +++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts @@ -9,9 +9,9 @@ import { RouterLink, RouterOutlet, } from '@angular/router'; +import { Collection } from '@core/shared/collection.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Collection } from '../../core/shared/collection.model'; import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component'; import { getCollectionPageRoute } from '../collection-page-routing-paths'; diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts index 2cdcaf3cf97..3195495a234 100644 --- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts +++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts @@ -7,11 +7,11 @@ import { } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ItemTemplateDataService } from '@core/data/item-template-data.service'; +import { Collection } from '@core/shared/collection.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ItemTemplateDataService } from '../../core/data/item-template-data.service'; -import { Collection } from '../../core/shared/collection.model'; import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts index 7d67e5e63bb..0f50ceda985 100644 --- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts +++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts @@ -7,6 +7,12 @@ import { ActivatedRoute, RouterLink, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ItemTemplateDataService } from '@core/data/item-template-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { @@ -15,12 +21,6 @@ import { switchMap, } from 'rxjs/operators'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { ItemTemplateDataService } from '../../core/data/item-template-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { Collection } from '../../core/shared/collection.model'; -import { Item } from '../../core/shared/item.model'; -import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component'; import { AlertComponent } from '../../shared/alert/alert.component'; import { AlertType } from '../../shared/alert/alert-type'; diff --git a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts index d35cd0a3b04..fd77d6603f9 100644 --- a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts +++ b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts @@ -4,12 +4,12 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { ItemTemplateDataService } from '@core/data/item-template-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; -import { ItemTemplateDataService } from '../../core/data/item-template-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { Item } from '../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { followLink } from '../../shared/utils/follow-link-config.model'; export const itemTemplatePageResolver: ResolveFn> = ( diff --git a/src/app/community-list-page/community-list-datasource.ts b/src/app/community-list-page/community-list-datasource.ts index 95acc9dd862..c5248341406 100644 --- a/src/app/community-list-page/community-list-datasource.ts +++ b/src/app/community-list-page/community-list-datasource.ts @@ -2,6 +2,7 @@ import { CollectionViewer, DataSource, } from '@angular/cdk/collections'; +import { FindListOptions } from '@core/data/find-list-options.model'; import { BehaviorSubject, Observable, @@ -9,7 +10,6 @@ import { } from 'rxjs'; import { finalize } from 'rxjs/operators'; -import { FindListOptions } from '../core/data/find-list-options.model'; import { hasValue } from '../shared/empty.util'; import { CommunityListService } from './community-list-service'; import { FlatNode } from './flat-node.model'; diff --git a/src/app/community-list-page/community-list-page-routes.ts b/src/app/community-list-page/community-list-page-routes.ts index 9990efb4377..a6097e7ed66 100644 --- a/src/app/community-list-page/community-list-page-routes.ts +++ b/src/app/community-list-page/community-list-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedCommunityListPageComponent } from './themed-community-list-page.component'; /** diff --git a/src/app/community-list-page/community-list-service.spec.ts b/src/app/community-list-page/community-list-service.spec.ts index d6b3f406f57..05d856be18b 100644 --- a/src/app/community-list-page/community-list-service.spec.ts +++ b/src/app/community-list-page/community-list-service.spec.ts @@ -2,6 +2,17 @@ import { inject, TestBed, } from '@angular/core/testing'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { Store } from '@ngrx/store'; import { of } from 'rxjs'; import { take } from 'rxjs/operators'; @@ -9,17 +20,6 @@ import { APP_CONFIG } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment.test'; import { AppState } from '../app.reducer'; -import { - SortDirection, - SortOptions, -} from '../core/cache/models/sort-options.model'; -import { CollectionDataService } from '../core/data/collection-data.service'; -import { CommunityDataService } from '../core/data/community-data.service'; -import { FindListOptions } from '../core/data/find-list-options.model'; -import { buildPaginatedList } from '../core/data/paginated-list.model'; -import { Collection } from '../core/shared/collection.model'; -import { Community } from '../core/shared/community.model'; -import { PageInfo } from '../core/shared/page-info.model'; import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$, diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts index cf105b54d8c..0f9df3beabb 100644 --- a/src/app/community-list-page/community-list-service.ts +++ b/src/app/community-list-page/community-list-service.ts @@ -3,6 +3,21 @@ import { Inject, Injectable, } from '@angular/core'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, +} from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; import { createSelector, Store, @@ -26,21 +41,6 @@ import { v4 as uuidv4 } from 'uuid'; import { AppState } from '../app.reducer'; import { getCollectionPageRoute } from '../collection-page/collection-page-routing-paths'; import { getCommunityPageRoute } from '../community-page/community-page-routing-paths'; -import { CollectionDataService } from '../core/data/collection-data.service'; -import { CommunityDataService } from '../core/data/community-data.service'; -import { FindListOptions } from '../core/data/find-list-options.model'; -import { - buildPaginatedList, - PaginatedList, -} from '../core/data/paginated-list.model'; -import { RemoteData } from '../core/data/remote-data'; -import { Collection } from '../core/shared/collection.model'; -import { Community } from '../core/shared/community.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, -} from '../core/shared/operators'; -import { PageInfo } from '../core/shared/page-info.model'; import { hasValue, isNotEmpty, diff --git a/src/app/community-list-page/community-list.reducer.spec.ts b/src/app/community-list-page/community-list.reducer.spec.ts index a6dcacce6fc..084a22e6e37 100644 --- a/src/app/community-list-page/community-list.reducer.spec.ts +++ b/src/app/community-list-page/community-list.reducer.spec.ts @@ -1,8 +1,8 @@ +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Community } from '@core/shared/community.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { of } from 'rxjs'; -import { buildPaginatedList } from '../core/data/paginated-list.model'; -import { Community } from '../core/shared/community.model'; -import { PageInfo } from '../core/shared/page-info.model'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { CommunityListSaveAction } from './community-list.actions'; import { CommunityListReducer } from './community-list.reducer'; diff --git a/src/app/community-list-page/community-list/community-list.component.spec.ts b/src/app/community-list-page/community-list/community-list.component.spec.ts index 347f912789e..76d7021f52e 100644 --- a/src/app/community-list-page/community-list/community-list.component.spec.ts +++ b/src/app/community-list-page/community-list/community-list.component.spec.ts @@ -14,6 +14,10 @@ import { import { By } from '@angular/platform-browser'; import { RouterLinkWithHref } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateLoader, TranslateModule, @@ -21,10 +25,6 @@ import { import { of } from 'rxjs'; import { v4 as uuidv4 } from 'uuid'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { Collection } from '../../core/shared/collection.model'; -import { Community } from '../../core/shared/community.model'; -import { PageInfo } from '../../core/shared/page-info.model'; import { isEmpty, isNotEmpty, diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts index 3a178559377..67382f04496 100644 --- a/src/app/community-list-page/community-list/community-list.component.ts +++ b/src/app/community-list-page/community-list/community-list.component.ts @@ -9,15 +9,15 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; -import { TranslateModule } from '@ngx-translate/core'; -import { take } from 'rxjs/operators'; - -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { SortDirection, SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../core/data/find-list-options.model'; +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { TranslateModule } from '@ngx-translate/core'; +import { take } from 'rxjs/operators'; + import { isEmpty } from '../../shared/empty.util'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { TruncatableComponent } from '../../shared/truncatable/truncatable.component'; diff --git a/src/app/community-list-page/flat-node.model.ts b/src/app/community-list-page/flat-node.model.ts index 125ffc1e597..0f2292f7008 100644 --- a/src/app/community-list-page/flat-node.model.ts +++ b/src/app/community-list-page/flat-node.model.ts @@ -1,7 +1,7 @@ +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; import { Observable } from 'rxjs'; -import { Collection } from '../core/shared/collection.model'; -import { Community } from '../core/shared/community.model'; import { ShowMoreFlatNode } from './show-more-flat-node.model'; /** diff --git a/src/app/community-page/community-form/community-form.component.ts b/src/app/community-page/community-form/community-form.component.ts index 492d2d4141d..24055b38e45 100644 --- a/src/app/community-page/community-form/community-form.component.ts +++ b/src/app/community-page/community-form/community-form.component.ts @@ -6,6 +6,11 @@ import { SimpleChange, SimpleChanges, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RequestService } from '@core/data/request.service'; +import { Community } from '@core/shared/community.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormControlModel, @@ -19,11 +24,6 @@ import { } from '@ngx-translate/core'; import { environment } from '../../../environments/environment'; -import { AuthService } from '../../core/auth/auth.service'; -import { ObjectCacheService } from '../../core/cache/object-cache.service'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { RequestService } from '../../core/data/request.service'; -import { Community } from '../../core/shared/community.model'; import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component'; import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component'; import { FormComponent } from '../../shared/form/form.component'; diff --git a/src/app/community-page/community-page-administrator.guard.ts b/src/app/community-page/community-page-administrator.guard.ts index f4837799cd4..424e73116b6 100644 --- a/src/app/community-page/community-page-administrator.guard.ts +++ b/src/app/community-page/community-page-administrator.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { communityPageResolver } from './community-page.resolver'; /** diff --git a/src/app/community-page/community-page-routes.ts b/src/app/community-page/community-page-routes.ts index 979525ee1e6..6ce98be49f7 100644 --- a/src/app/community-page/community-page-routes.ts +++ b/src/app/community-page/community-page-routes.ts @@ -1,10 +1,10 @@ import { Route } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { communityBreadcrumbResolver } from '@core/breadcrumbs/community-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; import { browseByGuard } from '../browse-by/browse-by-guard'; import { browseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; -import { communityBreadcrumbResolver } from '../core/breadcrumbs/community-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component'; import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component'; import { MenuRoute } from '../shared/menu/menu-route.model'; diff --git a/src/app/community-page/community-page-routing-paths.ts b/src/app/community-page/community-page-routing-paths.ts index 759d72cf3eb..e5f5fd66a31 100644 --- a/src/app/community-page/community-page-routing-paths.ts +++ b/src/app/community-page/community-page-routing-paths.ts @@ -1,5 +1,6 @@ +import { URLCombiner } from '@core/url-combiner/url-combiner'; + import { getCollectionPageRoute } from '../collection-page/collection-page-routing-paths'; -import { URLCombiner } from '../core/url-combiner/url-combiner'; export const COMMUNITY_PARENT_PARAMETER = 'parent'; diff --git a/src/app/community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts index c4596eb6ed4..b1a410f4b4f 100644 --- a/src/app/community-page/community-page.component.ts +++ b/src/app/community-page/community-page.component.ts @@ -10,6 +10,15 @@ import { RouterModule, RouterOutlet, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { RemoteData } from '@core/data/remote-data'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Community } from '@core/shared/community.model'; +import { getAllSucceededRemoteDataPayload } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { @@ -18,15 +27,6 @@ import { mergeMap, } from 'rxjs/operators'; -import { AuthService } from '../core/auth/auth.service'; -import { DSONameService } from '../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../core/data/feature-authorization/feature-id'; -import { RemoteData } from '../core/data/remote-data'; -import { redirectOn4xx } from '../core/shared/authorized.operators'; -import { Bitstream } from '../core/shared/bitstream.model'; -import { Community } from '../core/shared/community.model'; -import { getAllSucceededRemoteDataPayload } from '../core/shared/operators'; import { fadeInOut } from '../shared/animations/fade'; import { ThemedComcolPageBrowseByComponent } from '../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; import { ThemedComcolPageContentComponent } from '../shared/comcol/comcol-page-content/themed-comcol-page-content.component'; diff --git a/src/app/community-page/community-page.resolver.ts b/src/app/community-page/community-page.resolver.ts index b8820629e78..c121d2e7804 100644 --- a/src/app/community-page/community-page.resolver.ts +++ b/src/app/community-page/community-page.resolver.ts @@ -4,15 +4,15 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { ResolvedAction } from '@core/resolving/resolver.actions'; +import { Community } from '@core/shared/community.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { AppState } from '../app.reducer'; -import { CommunityDataService } from '../core/data/community-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { ResolvedAction } from '../core/resolving/resolver.actions'; -import { Community } from '../core/shared/community.model'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { followLink, FollowLinkConfig, diff --git a/src/app/community-page/create-community-page/create-community-page.component.spec.ts b/src/app/community-page/create-community-page/create-community-page.component.spec.ts index c54589b09cc..4ebf49b46f3 100644 --- a/src/app/community-page/create-community-page/create-community-page.component.spec.ts +++ b/src/app/community-page/create-community-page/create-community-page.component.spec.ts @@ -7,13 +7,13 @@ import { } from '@angular/core/testing'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { RequestService } from '../../core/data/request.service'; -import { RouteService } from '../../core/services/route.service'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; diff --git a/src/app/community-page/create-community-page/create-community-page.component.ts b/src/app/community-page/create-community-page/create-community-page.component.ts index 8feed94d238..36bbb572635 100644 --- a/src/app/community-page/create-community-page/create-community-page.component.ts +++ b/src/app/community-page/create-community-page/create-community-page.component.ts @@ -1,16 +1,16 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { Router } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; +import { Community } from '@core/shared/community.model'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { RequestService } from '../../core/data/request.service'; -import { RouteService } from '../../core/services/route.service'; -import { Community } from '../../core/shared/community.model'; import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/community-page/create-community-page/create-community-page.guard.spec.ts b/src/app/community-page/create-community-page/create-community-page.guard.spec.ts index 363db42fa28..21ab36e11b5 100644 --- a/src/app/community-page/create-community-page/create-community-page.guard.spec.ts +++ b/src/app/community-page/create-community-page/create-community-page.guard.spec.ts @@ -1,6 +1,6 @@ +import { Community } from '@core/shared/community.model'; import { first } from 'rxjs/operators'; -import { Community } from '../../core/shared/community.model'; import { RouterMock } from '../../shared/mocks/router.mock'; import { createFailedRemoteDataObject$, diff --git a/src/app/community-page/create-community-page/create-community-page.guard.ts b/src/app/community-page/create-community-page/create-community-page.guard.ts index c0cff337932..c62b0dcb405 100644 --- a/src/app/community-page/create-community-page/create-community-page.guard.ts +++ b/src/app/community-page/create-community-page/create-community-page.guard.ts @@ -5,6 +5,10 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Community } from '@core/shared/community.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable, of, @@ -14,10 +18,6 @@ import { tap, } from 'rxjs/operators'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { Community } from '../../core/shared/community.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { hasNoValue, hasValue, diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts b/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts index c69172d5f5d..2f58eadc0b7 100644 --- a/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts +++ b/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts @@ -7,12 +7,12 @@ import { } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RequestService } from '@core/data/request.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { RequestService } from '../../core/data/request.service'; import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { DeleteCommunityPageComponent } from './delete-community-page.component'; diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts index 27578e40c7e..725d3955839 100644 --- a/src/app/community-page/delete-community-page/delete-community-page.component.ts +++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts @@ -4,14 +4,14 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { Community } from '@core/shared/community.model'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { Community } from '../../core/shared/community.model'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts index 43f784891c7..2920fb8d423 100644 --- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts +++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts @@ -3,9 +3,9 @@ import { TestBed, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { Community } from '@core/shared/community.model'; import { of } from 'rxjs'; -import { Community } from '../../../core/shared/community.model'; import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component'; import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; import { CommunityAccessControlComponent } from './community-access-control.component'; diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts index cc632c0e94c..d2c03a17fd8 100644 --- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts +++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts @@ -4,12 +4,12 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Community } from '@core/shared/community.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Community } from '../../../core/shared/community.model'; -import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component'; @Component({ diff --git a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts index e321c8a0b48..f53815d73e3 100644 --- a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts +++ b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts @@ -9,11 +9,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { Collection } from '@core/shared/collection.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { Collection } from '../../../core/shared/collection.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; import { ResourcePoliciesComponent } from '../../../shared/resource-policies/resource-policies.component'; import { CommunityAuthorizationsComponent } from './community-authorizations.component'; diff --git a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts index 1fd9fc8454c..76650d6d937 100644 --- a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts +++ b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts @@ -4,14 +4,14 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Observable } from 'rxjs'; import { first, map, } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { ResourcePoliciesComponent } from '../../../shared/resource-policies/resource-policies.component'; @Component({ diff --git a/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts b/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts index bf669f68eae..8d6c28a4746 100644 --- a/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts +++ b/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts @@ -8,11 +8,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Community } from '@core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { Community } from '../../../core/shared/community.model'; import { CurationFormComponent } from '../../../curation-form/curation-form.component'; import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; import { CommunityCurateComponent } from './community-curate.component'; diff --git a/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts b/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts index 68233c46751..bd4e37b8e39 100644 --- a/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts +++ b/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts @@ -4,6 +4,9 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Community } from '@core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { @@ -12,9 +15,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Community } from '../../../core/shared/community.model'; import { CurationFormComponent } from '../../../curation-form/curation-form.component'; import { hasValue } from '../../../shared/empty.util'; diff --git a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts index b45a190a287..911d7378dd3 100644 --- a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts +++ b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts @@ -7,10 +7,10 @@ import { } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { CommunityDataService } from '@core/data/community-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { CommunityDataService } from '../../../core/data/community-data.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; import { CommunityFormComponent } from '../../community-form/community-form.component'; diff --git a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts index c2827cf892b..eb6787904f7 100644 --- a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts +++ b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts @@ -4,10 +4,10 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { Community } from '@core/shared/community.model'; import { TranslateService } from '@ngx-translate/core'; -import { CommunityDataService } from '../../../core/data/community-data.service'; -import { Community } from '../../../core/shared/community.model'; import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { CommunityFormComponent } from '../../community-form/community-form.component'; diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts index c5e46058262..7c471236edc 100644 --- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts +++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts @@ -10,13 +10,13 @@ import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RequestService } from '@core/data/request.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Community } from '@core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RequestService } from '../../../core/data/request.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { Community } from '../../../core/shared/community.model'; import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts index a46aa0d4249..056544f745c 100644 --- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts +++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts @@ -4,19 +4,19 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Community } from '@core/shared/community.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { Observable } from 'rxjs'; import { first, map, } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Community } from '../../../core/shared/community.model'; -import { HALLink } from '../../../core/shared/hal-link.model'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; import { ComcolRoleComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component'; /** diff --git a/src/app/community-page/edit-community-page/edit-community-page-routes.ts b/src/app/community-page/edit-community-page/edit-community-page-routes.ts index 2402c2037d5..5ffc2d894b3 100644 --- a/src/app/community-page/edit-community-page/edit-community-page-routes.ts +++ b/src/app/community-page/edit-community-page/edit-community-page-routes.ts @@ -1,7 +1,7 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; +import { communityAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/community-administrator.guard'; -import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { communityAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/community-administrator.guard'; import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component'; import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component'; import { resourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver'; diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts b/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts index 8b8eea3d716..5000b92310e 100644 --- a/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts +++ b/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts @@ -7,10 +7,10 @@ import { } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { CommunityDataService } from '@core/data/community-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { CommunityDataService } from '../../core/data/community-data.service'; import { EditCommunityPageComponent } from './edit-community-page.component'; describe('EditCommunityPageComponent', () => { diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.ts b/src/app/community-page/edit-community-page/edit-community-page.component.ts index 32eddf09d6f..2795998a7d6 100644 --- a/src/app/community-page/edit-community-page/edit-community-page.component.ts +++ b/src/app/community-page/edit-community-page/edit-community-page.component.ts @@ -9,9 +9,9 @@ import { RouterLink, RouterOutlet, } from '@angular/router'; +import { Community } from '@core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Community } from '../../core/shared/community.model'; import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component'; import { getCommunityPageRoute } from '../community-page-routing-paths'; diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.spec.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.spec.ts index dc4ab520812..f4f1c8878c9 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.spec.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.spec.ts @@ -10,20 +10,20 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { Community } from '@core/shared/community.model'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { CollectionDataService } from '../../../../core/data/collection-data.service'; -import { ConfigurationDataService } from '../../../../core/data/configuration-data.service'; -import { FindListOptions } from '../../../../core/data/find-list-options.model'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { LinkHeadService } from '../../../../core/services/link-head.service'; -import { Community } from '../../../../core/shared/community.model'; -import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; import { HostWindowService } from '../../../../shared/host-window.service'; import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock'; import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service'; diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts index ee78a1b2f7c..61830de9620 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts @@ -6,6 +6,16 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -14,16 +24,6 @@ import { } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { - SortDirection, - SortOptions, -} from '../../../../core/cache/models/sort-options.model'; -import { CollectionDataService } from '../../../../core/data/collection-data.service'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Community } from '../../../../core/shared/community.model'; import { fadeIn } from '../../../../shared/animations/fade'; import { hasValue } from '../../../../shared/empty.util'; import { ErrorComponent } from '../../../../shared/error/error.component'; diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts index 29141d7b7db..758f41c6084 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { Community } from '@core/shared/community.model'; -import { Community } from '../../../../core/shared/community.model'; import { ThemedComponent } from '../../../../shared/theme-support/themed.component'; import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component'; diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts index 40c0024a7be..05d72dd1295 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts @@ -7,11 +7,11 @@ import { ActivatedRoute, Data, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Community } from '@core/shared/community.model'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Community } from '../../../core/shared/community.model'; import { ThemedCollectionPageSubCollectionListComponent } from './sub-collection-list/themed-community-page-sub-collection-list.component'; import { ThemedCommunityPageSubCommunityListComponent } from './sub-community-list/themed-community-page-sub-community-list.component'; diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts index 2654585eda9..4e520e3e10c 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts @@ -10,20 +10,20 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { Community } from '@core/shared/community.model'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { ConfigurationDataService } from '../../../../core/data/configuration-data.service'; -import { FindListOptions } from '../../../../core/data/find-list-options.model'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { LinkHeadService } from '../../../../core/services/link-head.service'; -import { Community } from '../../../../core/shared/community.model'; -import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; import { HostWindowService } from '../../../../shared/host-window.service'; import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock'; import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service'; diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts index 2ad66c76a8b..d711f8a39ef 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts @@ -6,6 +6,15 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Community } from '@core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -14,15 +23,6 @@ import { } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { - SortDirection, - SortOptions, -} from '../../../../core/cache/models/sort-options.model'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { Community } from '../../../../core/shared/community.model'; import { fadeIn } from '../../../../shared/animations/fade'; import { hasValue } from '../../../../shared/empty.util'; import { ErrorComponent } from '../../../../shared/error/error.component'; diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component.ts index 85d0c02ad15..0b1b6cac3bc 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { Community } from '@core/shared/community.model'; -import { Community } from '../../../../core/shared/community.model'; import { ThemedComponent } from '../../../../shared/theme-support/themed.component'; import { CommunityPageSubCommunityListComponent } from './community-page-sub-community-list.component'; diff --git a/src/app/submission/sections/section-coar-notify/submission-coar-notify.config.ts b/src/app/core/coar-notify/models/submission-coar-notify.model.ts similarity index 58% rename from src/app/submission/sections/section-coar-notify/submission-coar-notify.config.ts rename to src/app/core/coar-notify/models/submission-coar-notify.model.ts index 04decc64599..90a49be6281 100644 --- a/src/app/submission/sections/section-coar-notify/submission-coar-notify.config.ts +++ b/src/app/core/coar-notify/models/submission-coar-notify.model.ts @@ -5,11 +5,11 @@ import { inheritSerialization, } from 'cerialize'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { CacheableObject } from '../../../core/cache/cacheable-object.model'; -import { ResourceType } from '../../../core/shared/resource-type'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; -import { SUBMISSION_COAR_NOTIFY_CONFIG } from './section-coar-notify-service.resource-type'; +import { typedObject } from '../../cache/builders/build-decorators'; +import { CacheableObject } from '../../cache/cacheable-object.model'; +import { ResourceType } from '../../shared/resource-type'; +import { SUBMISSION_COAR_NOTIFY_CONFIG } from '../../shared/section-coar-notify-service.resource-type'; +import { excludeFromEquals } from '../../utilities/equals.decorators'; export interface LdnPattern { pattern: string, @@ -18,7 +18,7 @@ export interface LdnPattern { /** A SubmissionCoarNotifyConfig and its properties. */ @typedObject @inheritSerialization(CacheableObject) -export class SubmissionCoarNotifyConfig extends CacheableObject { +export class SubmissionCoarNotifyModel extends CacheableObject { static type = SUBMISSION_COAR_NOTIFY_CONFIG; @excludeFromEquals diff --git a/src/app/core/data-services-map.ts b/src/app/core/data-services-map.ts index c9ebbc5ffc3..0d6f56a5233 100644 --- a/src/app/core/data-services-map.ts +++ b/src/app/core/data-services-map.ts @@ -1,8 +1,4 @@ import { LazyDataServicesMap } from '../../config/app-config.interface'; -import { - LDN_SERVICE, - LDN_SERVICE_CONSTRAINT_FILTERS, -} from '../admin/admin-ldn-services/ldn-services-model/ldn-service.resource-type'; import { ADMIN_NOTIFY_MESSAGE } from '../admin/admin-notify-dashboard/models/admin-notify-message.resource-type'; import { NOTIFYREQUEST } from '../item-page/simple/notify-requests-status/notify-requests-status.resource-type'; import { PROCESS } from '../process-page/processes/process.resource-type'; @@ -11,7 +7,6 @@ import { ACCESS_STATUS } from '../shared/object-collection/shared/badges/access- import { DUPLICATE } from '../shared/object-list/duplicate-data/duplicate.resource-type'; import { IDENTIFIERS } from '../shared/object-list/identifier-data/identifier-data.resource-type'; import { SUBSCRIPTION } from '../shared/subscriptions/models/subscription.resource-type'; -import { SUBMISSION_COAR_NOTIFY_CONFIG } from '../submission/sections/section-coar-notify/section-coar-notify-service.resource-type'; import { SYSTEMWIDEALERT } from '../system-wide-alert/system-wide-alert.resource-type'; import { BULK_ACCESS_CONDITION_OPTIONS, @@ -19,6 +14,10 @@ import { SUBMISSION_FORMS_TYPE, SUBMISSION_UPLOADS_TYPE, } from './config/models/config-type'; +import { + LDN_SERVICE, + LDN_SERVICE_CONSTRAINT_FILTERS, +} from './data/admin-ldn-services/ldn-services-model/ldn-service.resource-type'; import { ROOT } from './data/root.resource-type'; import { EPERSON } from './eperson/models/eperson.resource-type'; import { GROUP } from './eperson/models/group.resource-type'; @@ -52,6 +51,7 @@ import { ITEM_TYPE } from './shared/item-relationships/item-type.resource-type'; import { RELATIONSHIP } from './shared/item-relationships/relationship.resource-type'; import { RELATIONSHIP_TYPE } from './shared/item-relationships/relationship-type.resource-type'; import { LICENSE } from './shared/license.resource-type'; +import { SUBMISSION_COAR_NOTIFY_CONFIG } from './shared/section-coar-notify-service.resource-type'; import { SITE } from './shared/site.resource-type'; import { VERSION } from './shared/version.resource-type'; import { VERSION_HISTORY } from './shared/version-history.resource-type'; @@ -122,9 +122,9 @@ export const LAZY_DATA_SERVICES: LazyDataServicesMap = new Map([ [FEATURE.value, () => import('./data/feature-authorization/authorization-data.service').then(m => m.AuthorizationDataService)], [DSPACE_OBJECT.value, () => import('./data/dspace-object-data.service').then(m => m.DSpaceObjectDataService)], [BITSTREAM_FORMAT.value, () => import('./data/bitstream-format-data.service').then(m => m.BitstreamFormatDataService)], - [SUBMISSION_COAR_NOTIFY_CONFIG.value, () => import('../submission/sections/section-coar-notify/coar-notify-config-data.service').then(m => m.CoarNotifyConfigDataService)], - [LDN_SERVICE_CONSTRAINT_FILTERS.value, () => import('../admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service').then(m => m.LdnItemfiltersService)], - [LDN_SERVICE.value, () => import('../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service').then(m => m.LdnServicesService)], + [SUBMISSION_COAR_NOTIFY_CONFIG.value, () => import('./data/coar-notify-config-data.service').then(m => m.CoarNotifyConfigDataService)], + [LDN_SERVICE_CONSTRAINT_FILTERS.value, () => import('./data/ldn-itemfilters-data.service').then(m => m.LdnItemfiltersService)], + [LDN_SERVICE.value, () => import('./data/ldn-services-data.service').then(m => m.LdnServicesService)], [ADMIN_NOTIFY_MESSAGE.value, () => import('../admin/admin-notify-dashboard/services/admin-notify-messages.service').then(m => m.AdminNotifyMessagesService)], [SUBMISSION_FORMS_TYPE.value, () => import('./config/submission-forms-config-data.service').then(m => m.SubmissionFormsConfigDataService)], [NOTIFYREQUEST.value, () => import('./data/notify-services-status-data.service').then(m => m.NotifyRequestsStatusDataService)], diff --git a/src/app/admin/admin-ldn-services/admin-ldn-services-routes.ts b/src/app/core/data/admin-ldn-services/admin-ldn-services-routes.ts similarity index 86% rename from src/app/admin/admin-ldn-services/admin-ldn-services-routes.ts rename to src/app/core/data/admin-ldn-services/admin-ldn-services-routes.ts index 66420f7a7ba..ca1722c6fcb 100644 --- a/src/app/admin/admin-ldn-services/admin-ldn-services-routes.ts +++ b/src/app/core/data/admin-ldn-services/admin-ldn-services-routes.ts @@ -1,7 +1,7 @@ import { Routes } from '@angular/router'; -import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { navigationBreadcrumbResolver } from '../../core/breadcrumbs/navigation-breadcrumb.resolver'; +import { i18nBreadcrumbResolver } from '../../breadcrumbs/i18n-breadcrumb.resolver'; +import { navigationBreadcrumbResolver } from '../../breadcrumbs/navigation-breadcrumb.resolver'; import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component'; import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component'; diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.html similarity index 100% rename from src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html rename to src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.html diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss b/src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss similarity index 91% rename from src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss rename to src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss index afd5c80d1cb..ea2be88b3ba 100644 --- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss +++ b/src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss @@ -1,5 +1,5 @@ -@import '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.scss'; -@import '../../../shared/form/form.component.scss'; +@import '../../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component'; +@import '../../../../shared/form/form.component'; form { font-size: 14px; diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts b/src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts similarity index 92% rename from src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts rename to src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts index 769726fc096..0cf37d2970d 100644 --- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts +++ b/src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts @@ -20,6 +20,7 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RouteService } from '@core/services/route.service'; import { NgbDropdownModule, NgbModal, @@ -32,14 +33,13 @@ import { import { PaginationService } from 'ngx-pagination'; import { of } from 'rxjs'; -import { RouteService } from '../../../core/services/route.service'; -import { MockActivatedRoute } from '../../../shared/mocks/active-router.mock'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; -import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; -import { RouterStub } from '../../../shared/testing/router.stub'; -import { LdnItemfiltersService } from '../ldn-services-data/ldn-itemfilters-data.service'; -import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service'; +import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; +import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; +import { RouterStub } from '../../../../shared/testing/router.stub'; +import { LdnItemfiltersService } from '../../ldn-itemfilters-data.service'; +import { LdnServicesService } from '../../ldn-services-data.service'; import { LdnServiceFormComponent } from './ldn-service-form.component'; describe('LdnServiceFormEditComponent', () => { diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts b/src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts similarity index 96% rename from src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts rename to src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts index 80860c4b6e3..aa975cc2b37 100644 --- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts +++ b/src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts @@ -25,6 +25,8 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbDropdownModule, NgbModal, @@ -41,14 +43,12 @@ import { } from 'rxjs'; import { RemoteData } from 'src/app/core/data/remote-data'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { IpV4Validator } from '../../../shared/utils/ipV4.validator'; -import { LdnItemfiltersService } from '../ldn-services-data/ldn-itemfilters-data.service'; -import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { IpV4Validator } from '../../../../shared/utils/ipV4.validator'; +import { FindListOptions } from '../../find-list-options.model'; +import { LdnItemfiltersService } from '../../ldn-itemfilters-data.service'; +import { LdnServicesService } from '../../ldn-services-data.service'; +import { PaginatedList } from '../../paginated-list.model'; import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type'; import { Itemfilter } from '../ldn-services-model/ldn-service-itemfilters'; import { NotifyServicePattern } from '../ldn-services-model/ldn-service-patterns.model'; diff --git a/src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts b/src/app/core/data/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts similarity index 91% rename from src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts rename to src/app/core/data/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts index bd732ea37ec..ced83c8d27f 100644 --- a/src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts +++ b/src/app/core/data/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts @@ -3,9 +3,9 @@ import { of, } from 'rxjs'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; +import { PaginatedList } from '../../paginated-list.model'; +import { RemoteData } from '../../remote-data'; import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type'; import { LdnService } from '../ldn-services-model/ldn-services.model'; diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html b/src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html similarity index 100% rename from src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html rename to src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.scss b/src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.scss similarity index 100% rename from src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.scss rename to src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.scss diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts b/src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts similarity index 85% rename from src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts rename to src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts index fff3331e9cd..bd5a89daca8 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts +++ b/src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts @@ -10,6 +10,7 @@ import { tick, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -17,19 +18,18 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { PaginationComponent } from '../../../shared/pagination/pagination.component'; -import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; -import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; -import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; -import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; -import { createPaginatedList } from '../../../shared/testing/utils.test'; -import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component'; -import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component'; -import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { PaginationComponent } from '../../../../shared/pagination/pagination.component'; +import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; +import { ActivatedRouteStub } from '../../../../shared/testing/active-router.stub'; +import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; +import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; +import { createPaginatedList } from '../../../../shared/testing/utils.test'; +import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component'; +import { TruncatablePartComponent } from '../../../../shared/truncatable/truncatable-part/truncatable-part.component'; +import { LdnServicesService } from '../../ldn-services-data.service'; +import { PaginatedList } from '../../paginated-list.model'; +import { RemoteData } from '../../remote-data'; import { LdnService } from '../ldn-services-model/ldn-services.model'; import { LdnServicesOverviewComponent } from './ldn-services-directory.component'; diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts b/src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts similarity index 87% rename from src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts rename to src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts index 691110873c2..97d55b33263 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts +++ b/src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts @@ -12,6 +12,7 @@ import { ViewChild, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -26,19 +27,18 @@ import { map, switchMap, } from 'rxjs/operators'; -import { LdnServicesService } from 'src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service'; +import { LdnServicesService } from 'src/app/core/data/ldn-services-data.service'; import { PaginationService } from 'src/app/core/pagination/pagination.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import { hasValue } from '../../../shared/empty.util'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { PaginationComponent } from '../../../shared/pagination/pagination.component'; -import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; -import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component'; -import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component'; +import { hasValue } from '../../../../shared/empty.util'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { PaginationComponent } from '../../../../shared/pagination/pagination.component'; +import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; +import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component'; +import { TruncatablePartComponent } from '../../../../shared/truncatable/truncatable-part/truncatable-part.component'; +import { FindListOptions } from '../../find-list-options.model'; +import { PaginatedList } from '../../paginated-list.model'; +import { RemoteData } from '../../remote-data'; import { LdnService } from '../ldn-services-model/ldn-services.model'; /** diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts b/src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts similarity index 66% rename from src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts rename to src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts index 25fb9e70dd4..425c86fe7d7 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts +++ b/src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts @@ -1,13 +1,13 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, inheritSerialization, } from 'cerialize'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { CacheableObject } from '../../../core/cache/cacheable-object.model'; -import { ResourceType } from '../../../core/shared/resource-type'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; import { LDN_SERVICE_CONSTRAINT_FILTER } from './ldn-service.resource-type'; /** A single filter value and its properties. */ diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-patterns.model.ts b/src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service-patterns.model.ts similarity index 100% rename from src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-patterns.model.ts rename to src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service-patterns.model.ts diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts b/src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts similarity index 100% rename from src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts rename to src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.constrain.model.ts b/src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service.constrain.model.ts similarity index 100% rename from src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.constrain.model.ts rename to src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service.constrain.model.ts diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts b/src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts similarity index 83% rename from src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts rename to src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts index 05a881e7e74..7c0473cc2b5 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts +++ b/src/app/core/data/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts @@ -4,7 +4,7 @@ * Needs to be in a separate file to prevent circular * dependencies in webpack. */ -import { ResourceType } from '../../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; export const LDN_SERVICE = new ResourceType('ldnservice'); export const LDN_SERVICE_CONSTRAINT_FILTERS = new ResourceType('itemfilters'); diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts b/src/app/core/data/admin-ldn-services/ldn-services-model/ldn-services.model.ts similarity index 80% rename from src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts rename to src/app/core/data/admin-ldn-services/ldn-services-model/ldn-services.model.ts index 5aed22ffb96..e9c73ac9973 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts +++ b/src/app/core/data/admin-ldn-services/ldn-services-model/ldn-services.model.ts @@ -1,3 +1,7 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, @@ -5,10 +9,6 @@ import { inheritSerialization, } from 'cerialize'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { CacheableObject } from '../../../core/cache/cacheable-object.model'; -import { ResourceType } from '../../../core/shared/resource-type'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; import { LDN_SERVICE } from './ldn-service.resource-type'; import { NotifyServicePattern } from './ldn-service-patterns.model'; diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/service-constrain-type.model.ts b/src/app/core/data/admin-ldn-services/ldn-services-model/service-constrain-type.model.ts similarity index 100% rename from src/app/admin/admin-ldn-services/ldn-services-model/service-constrain-type.model.ts rename to src/app/core/data/admin-ldn-services/ldn-services-model/service-constrain-type.model.ts diff --git a/src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts b/src/app/core/data/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts similarity index 100% rename from src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts rename to src/app/core/data/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts diff --git a/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.spec.ts b/src/app/core/data/coar-notify-config-data.service.spec.ts similarity index 66% rename from src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.spec.ts rename to src/app/core/data/coar-notify-config-data.service.spec.ts index cfad518b852..68ab4d1dd0a 100644 --- a/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.spec.ts +++ b/src/app/core/data/coar-notify-config-data.service.spec.ts @@ -5,25 +5,25 @@ import { import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { RestResponse } from '../../../core/cache/response.models'; -import { CreateData } from '../../../core/data/base/create-data'; -import { testCreateDataImplementation } from '../../../core/data/base/create-data.spec'; -import { DeleteData } from '../../../core/data/base/delete-data'; -import { testDeleteDataImplementation } from '../../../core/data/base/delete-data.spec'; -import { FindAllData } from '../../../core/data/base/find-all-data'; -import { testFindAllDataImplementation } from '../../../core/data/base/find-all-data.spec'; -import { PatchData } from '../../../core/data/base/patch-data'; -import { testPatchDataImplementation } from '../../../core/data/base/patch-data.spec'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { RequestEntry } from '../../../core/data/request-entry.model'; -import { RequestEntryState } from '../../../core/data/request-entry-state.model'; -import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { RestResponse } from '../cache/response.models'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { CreateData } from './base/create-data'; +import { testCreateDataImplementation } from './base/create-data.spec'; +import { DeleteData } from './base/delete-data'; +import { testDeleteDataImplementation } from './base/delete-data.spec'; +import { FindAllData } from './base/find-all-data'; +import { testFindAllDataImplementation } from './base/find-all-data.spec'; +import { PatchData } from './base/patch-data'; +import { testPatchDataImplementation } from './base/patch-data.spec'; import { CoarNotifyConfigDataService } from './coar-notify-config-data.service'; +import { RemoteData } from './remote-data'; +import { RequestService } from './request.service'; +import { RequestEntry } from './request-entry.model'; +import { RequestEntryState } from './request-entry-state.model'; describe('CoarNotifyConfigDataService test', () => { let scheduler: TestScheduler; diff --git a/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.ts b/src/app/core/data/coar-notify-config-data.service.ts similarity index 54% rename from src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.ts rename to src/app/core/data/coar-notify-config-data.service.ts index 74b2f0b97ea..826b29d3d40 100644 --- a/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.ts +++ b/src/app/core/data/coar-notify-config-data.service.ts @@ -6,52 +6,52 @@ import { take, } from 'rxjs/operators'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { RequestParam } from '../../../core/cache/models/request-param.model'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { RequestParam } from '../cache/models/request-param.model'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { SubmissionCoarNotifyModel } from '../coar-notify/models/submission-coar-notify.model'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { NoContent } from '../shared/NoContent.model'; +import { URLCombiner } from '../url-combiner/url-combiner'; import { CreateData, CreateDataImpl, -} from '../../../core/data/base/create-data'; +} from './base/create-data'; import { DeleteData, DeleteDataImpl, -} from '../../../core/data/base/delete-data'; +} from './base/delete-data'; import { FindAllData, FindAllDataImpl, -} from '../../../core/data/base/find-all-data'; -import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service'; +} from './base/find-all-data'; +import { IdentifiableDataService } from './base/identifiable-data.service'; import { PatchData, PatchDataImpl, -} from '../../../core/data/base/patch-data'; -import { ChangeAnalyzer } from '../../../core/data/change-analyzer'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { MultipartPostRequest } from '../../../core/data/request.models'; -import { RequestService } from '../../../core/data/request.service'; -import { RestRequest } from '../../../core/data/rest-request.model'; -import { RestRequestMethod } from '../../../core/data/rest-request-method'; -import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { URLCombiner } from '../../../core/url-combiner/url-combiner'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; -import { SubmissionCoarNotifyConfig } from './submission-coar-notify.config'; +} from './base/patch-data'; +import { ChangeAnalyzer } from './change-analyzer'; +import { FindListOptions } from './find-list-options.model'; +import { PaginatedList } from './paginated-list.model'; +import { RemoteData } from './remote-data'; +import { MultipartPostRequest } from './request.models'; +import { RequestService } from './request.service'; +import { RestRequest } from './rest-request.model'; +import { RestRequestMethod } from './rest-request-method'; /** * A service responsible for fetching/sending data from/to the REST API on the CoarNotifyConfig endpoint */ @Injectable({ providedIn: 'root' }) -export class CoarNotifyConfigDataService extends IdentifiableDataService implements FindAllData, DeleteData, PatchData, CreateData { - createData: CreateDataImpl; - private findAllData: FindAllDataImpl; - private deleteData: DeleteDataImpl; - private patchData: PatchDataImpl; - private comparator: ChangeAnalyzer; +export class CoarNotifyConfigDataService extends IdentifiableDataService implements FindAllData, DeleteData, PatchData, CreateData { + createData: CreateDataImpl; + private findAllData: FindAllDataImpl; + private deleteData: DeleteDataImpl; + private patchData: PatchDataImpl; + private comparator: ChangeAnalyzer; constructor( protected requestService: RequestService, @@ -69,15 +69,15 @@ export class CoarNotifyConfigDataService extends IdentifiableDataService> { + create(object: SubmissionCoarNotifyModel, ...params: RequestParam[]): Observable> { return this.createData.create(object, ...params); } - patch(object: SubmissionCoarNotifyConfig, operations: Operation[]): Observable> { + patch(object: SubmissionCoarNotifyModel, operations: Operation[]): Observable> { return this.patchData.patch(object, operations); } - update(object: SubmissionCoarNotifyConfig): Observable> { + update(object: SubmissionCoarNotifyModel): Observable> { return this.patchData.update(object); } @@ -85,11 +85,11 @@ export class CoarNotifyConfigDataService extends IdentifiableDataService { + createPatchFromCache(object: SubmissionCoarNotifyModel): Observable { return this.patchData.createPatchFromCache(object); } - findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig[]): Observable>> { + findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig[]): Observable>> { return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); } @@ -102,7 +102,7 @@ export class CoarNotifyConfigDataService extends IdentifiableDataService> { + public invoke(serviceName: string, serviceId: string, files: File[]): Observable> { const requestId = this.requestService.generateRequestId(); this.getBrowseEndpoint().pipe( take(1), @@ -113,7 +113,7 @@ export class CoarNotifyConfigDataService extends IdentifiableDataService this.requestService.send(request)); - return this.rdbService.buildFromRequestUUID(requestId); + return this.rdbService.buildFromRequestUUID(requestId); } private getInvocationFormData(files: File[]): FormData { diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts index c4f241243c5..d73fc46bfeb 100644 --- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts +++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts @@ -4,14 +4,14 @@ import { Router, UrlTree, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Observable, of, } from 'rxjs'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; -import { AuthService } from '../../../auth/auth.service'; -import { DSpaceObject } from '../../../shared/dspace-object.model'; import { RemoteData } from '../../remote-data'; import { AuthorizationDataService } from '../authorization-data.service'; import { FeatureID } from '../feature-id'; diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts index 5073a386532..dd4d571db13 100644 --- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts +++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts @@ -4,10 +4,10 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { DSpaceObject } from '../../../shared/dspace-object.model'; import { RemoteData } from '../../remote-data'; import { FeatureID } from '../feature-id'; import { dsoPageSomeFeatureGuard } from './dso-page-some-feature.guard'; diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts index 025c2c7a0a1..575edd13aa1 100644 --- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts +++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts @@ -4,14 +4,14 @@ import { Router, UrlTree, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Observable, of, } from 'rxjs'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; -import { AuthService } from '../../../auth/auth.service'; -import { DSpaceObject } from '../../../shared/dspace-object.model'; import { RemoteData } from '../../remote-data'; import { AuthorizationDataService } from '../authorization-data.service'; import { FeatureID } from '../feature-id'; diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts index 7469f113b49..e2c0de5fdd7 100644 --- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts +++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts @@ -4,6 +4,8 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getAllSucceededRemoteDataPayload } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -11,8 +13,6 @@ import { hasNoValue, hasValue, } from '../../../../shared/empty.util'; -import { DSpaceObject } from '../../../shared/dspace-object.model'; -import { getAllSucceededRemoteDataPayload } from '../../../shared/operators'; import { RemoteData } from '../../remote-data'; import { FeatureID } from '../feature-id'; import { diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts index 8bf7785e5fa..8afdfa04f22 100644 --- a/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts +++ b/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts @@ -6,12 +6,12 @@ import { Router, UrlTree, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; import { Observable, of, } from 'rxjs'; -import { AuthService } from '../../../auth/auth.service'; import { AuthorizationDataService } from '../authorization-data.service'; import { FeatureID } from '../feature-id'; import { singleFeatureAuthorizationGuard } from './single-feature-authorization.guard'; diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts index 4a1d06f83c6..bc595262541 100644 --- a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts +++ b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts @@ -6,12 +6,12 @@ import { Router, UrlTree, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; import { Observable, of, } from 'rxjs'; -import { AuthService } from '../../../auth/auth.service'; import { AuthorizationDataService } from '../authorization-data.service'; import { FeatureID } from '../feature-id'; import { someFeatureAuthorizationGuard } from './some-feature-authorization.guard'; diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts index 1ce7fe5f91e..00e32f107af 100644 --- a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts +++ b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts @@ -6,6 +6,8 @@ import { RouterStateSnapshot, UrlTree, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { returnForbiddenUrlTreeOrLoginOnAllFalse } from '@core/shared/authorized.operators'; import { combineLatest as observableCombineLatest, Observable, @@ -13,8 +15,6 @@ import { } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { AuthService } from '../../../auth/auth.service'; -import { returnForbiddenUrlTreeOrLoginOnAllFalse } from '../../../shared/authorized.operators'; import { AuthorizationDataService } from '../authorization-data.service'; import { FeatureID } from '../feature-id'; diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilter-data.service.spec.ts b/src/app/core/data/ldn-itemfilter-data.service.spec.ts similarity index 71% rename from src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilter-data.service.spec.ts rename to src/app/core/data/ldn-itemfilter-data.service.spec.ts index 110a0779fbd..16551359f2c 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilter-data.service.spec.ts +++ b/src/app/core/data/ldn-itemfilter-data.service.spec.ts @@ -5,19 +5,19 @@ import { import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { RestResponse } from '../../../core/cache/response.models'; -import { FindAllData } from '../../../core/data/base/find-all-data'; -import { testFindAllDataImplementation } from '../../../core/data/base/find-all-data.spec'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { RequestEntry } from '../../../core/data/request-entry.model'; -import { RequestEntryState } from '../../../core/data/request-entry-state.model'; -import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { RestResponse } from '../cache/response.models'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { FindAllData } from './base/find-all-data'; +import { testFindAllDataImplementation } from './base/find-all-data.spec'; import { LdnItemfiltersService } from './ldn-itemfilters-data.service'; +import { RemoteData } from './remote-data'; +import { RequestService } from './request.service'; +import { RequestEntry } from './request-entry.model'; +import { RequestEntryState } from './request-entry-state.model'; describe('LdnItemfiltersService test', () => { let scheduler: TestScheduler; diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts b/src/app/core/data/ldn-itemfilters-data.service.ts similarity index 69% rename from src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts rename to src/app/core/data/ldn-itemfilters-data.service.ts index d64d2ed5cbc..3abbfea3ea9 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts +++ b/src/app/core/data/ldn-itemfilters-data.service.ts @@ -1,21 +1,21 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { Itemfilter } from './admin-ldn-services/ldn-services-model/ldn-service-itemfilters'; import { FindAllData, FindAllDataImpl, -} from '../../../core/data/base/find-all-data'; -import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; -import { Itemfilter } from '../ldn-services-model/ldn-service-itemfilters'; +} from './base/find-all-data'; +import { IdentifiableDataService } from './base/identifiable-data.service'; +import { FindListOptions } from './find-list-options.model'; +import { PaginatedList } from './paginated-list.model'; +import { RemoteData } from './remote-data'; +import { RequestService } from './request.service'; /** * A service responsible for fetching/sending data from/to the REST API on the itemfilters endpoint diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.spec.ts b/src/app/core/data/ldn-services-data.service.spec.ts similarity index 69% rename from src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.spec.ts rename to src/app/core/data/ldn-services-data.service.spec.ts index 4224b0aafd5..606211a9a09 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.spec.ts +++ b/src/app/core/data/ldn-services-data.service.spec.ts @@ -5,31 +5,31 @@ import { import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { RequestParam } from '../../../core/cache/models/request-param.model'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { RestResponse } from '../../../core/cache/response.models'; -import { CreateData } from '../../../core/data/base/create-data'; -import { testCreateDataImplementation } from '../../../core/data/base/create-data.spec'; -import { DeleteData } from '../../../core/data/base/delete-data'; -import { testDeleteDataImplementation } from '../../../core/data/base/delete-data.spec'; -import { FindAllData } from '../../../core/data/base/find-all-data'; -import { testFindAllDataImplementation } from '../../../core/data/base/find-all-data.spec'; -import { PatchData } from '../../../core/data/base/patch-data'; -import { testPatchDataImplementation } from '../../../core/data/base/patch-data.spec'; -import { SearchData } from '../../../core/data/base/search-data'; -import { testSearchDataImplementation } from '../../../core/data/base/search-data.spec'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { RequestEntry } from '../../../core/data/request-entry.model'; -import { RequestEntryState } from '../../../core/data/request-entry-state.model'; -import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; -import { createPaginatedList } from '../../../shared/testing/utils.test'; -import { mockLdnService } from '../ldn-service-serviceMock/ldnServicesRD$-mock'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { createPaginatedList } from '../../shared/testing/utils.test'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { RequestParam } from '../cache/models/request-param.model'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { RestResponse } from '../cache/response.models'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { mockLdnService } from './admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock'; +import { CreateData } from './base/create-data'; +import { testCreateDataImplementation } from './base/create-data.spec'; +import { DeleteData } from './base/delete-data'; +import { testDeleteDataImplementation } from './base/delete-data.spec'; +import { FindAllData } from './base/find-all-data'; +import { testFindAllDataImplementation } from './base/find-all-data.spec'; +import { PatchData } from './base/patch-data'; +import { testPatchDataImplementation } from './base/patch-data.spec'; +import { SearchData } from './base/search-data'; +import { testSearchDataImplementation } from './base/search-data.spec'; +import { FindListOptions } from './find-list-options.model'; import { LdnServicesService } from './ldn-services-data.service'; +import { RemoteData } from './remote-data'; +import { RequestService } from './request.service'; +import { RequestEntry } from './request-entry.model'; +import { RequestEntryState } from './request-entry-state.model'; describe('LdnServicesService test', () => { let scheduler: TestScheduler; diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts b/src/app/core/data/ldn-services-data.service.ts similarity index 85% rename from src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts rename to src/app/core/data/ldn-services-data.service.ts index 6e368dd6809..b089ff1f71a 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts +++ b/src/app/core/data/ldn-services-data.service.ts @@ -6,42 +6,42 @@ import { take, } from 'rxjs/operators'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { RequestParam } from '../../../core/cache/models/request-param.model'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { RequestParam } from '../cache/models/request-param.model'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { NoContent } from '../shared/NoContent.model'; +import { URLCombiner } from '../url-combiner/url-combiner'; +import { LdnServiceConstrain } from './admin-ldn-services/ldn-services-model/ldn-service.constrain.model'; +import { LdnService } from './admin-ldn-services/ldn-services-model/ldn-services.model'; import { CreateData, CreateDataImpl, -} from '../../../core/data/base/create-data'; +} from './base/create-data'; import { DeleteData, DeleteDataImpl, -} from '../../../core/data/base/delete-data'; +} from './base/delete-data'; import { FindAllData, FindAllDataImpl, -} from '../../../core/data/base/find-all-data'; -import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service'; +} from './base/find-all-data'; +import { IdentifiableDataService } from './base/identifiable-data.service'; import { PatchData, PatchDataImpl, -} from '../../../core/data/base/patch-data'; -import { SearchDataImpl } from '../../../core/data/base/search-data'; -import { ChangeAnalyzer } from '../../../core/data/change-analyzer'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { MultipartPostRequest } from '../../../core/data/request.models'; -import { RequestService } from '../../../core/data/request.service'; -import { RestRequest } from '../../../core/data/rest-request.model'; -import { RestRequestMethod } from '../../../core/data/rest-request-method'; -import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { URLCombiner } from '../../../core/url-combiner/url-combiner'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; -import { LdnServiceConstrain } from '../ldn-services-model/ldn-service.constrain.model'; -import { LdnService } from '../ldn-services-model/ldn-services.model'; +} from './base/patch-data'; +import { SearchDataImpl } from './base/search-data'; +import { ChangeAnalyzer } from './change-analyzer'; +import { FindListOptions } from './find-list-options.model'; +import { PaginatedList } from './paginated-list.model'; +import { RemoteData } from './remote-data'; +import { MultipartPostRequest } from './request.models'; +import { RequestService } from './request.service'; +import { RestRequest } from './rest-request.model'; +import { RestRequestMethod } from './rest-request-method'; /** * Injectable service responsible for fetching/sending data from/to the REST API on the ldnservices endpoint. diff --git a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts index ddf38dd2bb1..1d2d0178d67 100644 --- a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts +++ b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts @@ -1,6 +1,6 @@ +import { MetadatumViewModel } from '@core/shared/metadata.models'; import { Operation } from 'fast-json-patch'; -import { MetadatumViewModel } from '../../../shared/metadata.models'; import { FieldChangeType } from '../field-change-type.model'; import { FieldUpdates } from '../field-updates.model'; import { MetadataPatchOperationService } from './metadata-patch-operation.service'; diff --git a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts index b6dccb759b2..37609c85d1e 100644 --- a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts +++ b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { MetadatumViewModel } from '@core/shared/metadata.models'; import { Operation } from 'fast-json-patch'; import { hasValue } from '../../../../shared/empty.util'; -import { MetadatumViewModel } from '../../../shared/metadata.models'; import { FieldChangeType } from '../field-change-type.model'; import { FieldUpdates } from '../field-updates.model'; import { MetadataPatchAddOperation } from './operations/metadata/metadata-patch-add-operation.model'; diff --git a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts index 7cdd55a86fb..5a5aa6d49bd 100644 --- a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts +++ b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts @@ -1,4 +1,14 @@ import { HttpClient } from '@angular/common/http'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RestResponse } from '@core/cache/response.models'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RequestService } from '@core/data/request.service'; +import { RequestEntry } from '@core/data/request-entry.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { ReplaceOperation } from 'fast-json-patch'; import { cold, @@ -15,16 +25,6 @@ import { import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject } from '../../../../shared/remote-data.utils'; import { ObjectCacheServiceStub } from '../../../../shared/testing/object-cache-service.stub'; -import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service'; -import { RequestParam } from '../../../cache/models/request-param.model'; -import { ObjectCacheService } from '../../../cache/object-cache.service'; -import { RestResponse } from '../../../cache/response.models'; -import { FindListOptions } from '../../../data/find-list-options.model'; -import { buildPaginatedList } from '../../../data/paginated-list.model'; -import { RequestService } from '../../../data/request.service'; -import { RequestEntry } from '../../../data/request-entry.model'; -import { HALEndpointService } from '../../../shared/hal-endpoint.service'; -import { PageInfo } from '../../../shared/page-info.model'; import { QualityAssuranceEventDataService } from './quality-assurance-event-data.service'; describe('QualityAssuranceEventDataService', () => { diff --git a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts index 7e6e8884173..2ba63715c31 100644 --- a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts +++ b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts @@ -3,50 +3,50 @@ import { HttpParams, } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ReplaceOperation } from 'fast-json-patch'; -import { Observable } from 'rxjs'; -import { - find, - switchMap, - take, -} from 'rxjs/operators'; - -import { QualityAssuranceEventData } from '../../../../notifications/qa/project-entry-import-modal/project-entry-import-modal.component'; -import { hasValue } from '../../../../shared/empty.util'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model'; -import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service'; -import { RequestParam } from '../../../cache/models/request-param.model'; -import { ObjectCacheService } from '../../../cache/object-cache.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; import { CreateData, CreateDataImpl, -} from '../../../data/base/create-data'; +} from '@core/data/base/create-data'; import { DeleteData, DeleteDataImpl, -} from '../../../data/base/delete-data'; -import { IdentifiableDataService } from '../../../data/base/identifiable-data.service'; +} from '@core/data/base/delete-data'; +import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; import { PatchData, PatchDataImpl, -} from '../../../data/base/patch-data'; +} from '@core/data/base/patch-data'; import { SearchData, SearchDataImpl, -} from '../../../data/base/search-data'; -import { DefaultChangeAnalyzer } from '../../../data/default-change-analyzer.service'; -import { FindListOptions } from '../../../data/find-list-options.model'; -import { PaginatedList } from '../../../data/paginated-list.model'; -import { RemoteData } from '../../../data/remote-data'; +} from '@core/data/base/search-data'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; import { DeleteByIDRequest, PostRequest, -} from '../../../data/request.models'; -import { RequestService } from '../../../data/request.service'; -import { HttpOptions } from '../../../dspace-rest/dspace-rest.service'; -import { HALEndpointService } from '../../../shared/hal-endpoint.service'; -import { NoContent } from '../../../shared/NoContent.model'; +} from '@core/data/request.models'; +import { RequestService } from '@core/data/request.service'; +import { HttpOptions } from '@core/dspace-rest/dspace-rest.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { ReplaceOperation } from 'fast-json-patch'; +import { Observable } from 'rxjs'; +import { + find, + switchMap, + take, +} from 'rxjs/operators'; + +import { QualityAssuranceEventData } from '../../../../notifications/qa/project-entry-import-modal/project-entry-import-modal.component'; +import { hasValue } from '../../../../shared/empty.util'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model'; import { QualityAssuranceEventObject } from '../models/quality-assurance-event.model'; /** diff --git a/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts index 84aff6ba2cf..9043ac4d9cd 100644 --- a/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts +++ b/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for the Quality Assurance event diff --git a/src/app/core/notifications/qa/models/quality-assurance-event.model.ts b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts index e2a00f2e755..edba2f4d6e0 100644 --- a/src/app/core/notifications/qa/models/quality-assurance-event.model.ts +++ b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts @@ -1,4 +1,15 @@ /* eslint-disable max-classes-per-file */ +import { + link, + typedObject, +} from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { RemoteData } from '@core/data/remote-data'; +import { HALLink } from '@core/shared/hal-link.model'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, autoserializeAs, @@ -6,17 +17,6 @@ import { } from 'cerialize'; import { Observable } from 'rxjs'; -import { - link, - typedObject, -} from '../../../cache/builders/build-decorators'; -import { CacheableObject } from '../../../cache/cacheable-object.model'; -import { RemoteData } from '../../../data/remote-data'; -import { HALLink } from '../../../shared/hal-link.model'; -import { Item } from '../../../shared/item.model'; -import { ITEM } from '../../../shared/item.resource-type'; -import { ResourceType } from '../../../shared/resource-type'; -import { excludeFromEquals } from '../../../utilities/equals.decorators'; import { QUALITY_ASSURANCE_EVENT_OBJECT } from './quality-assurance-event-object.resource-type'; /** diff --git a/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts index b4f64b24d14..4511f672e39 100644 --- a/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts +++ b/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for the Quality Assurance source diff --git a/src/app/core/notifications/qa/models/quality-assurance-source.model.ts b/src/app/core/notifications/qa/models/quality-assurance-source.model.ts index 56c674b031c..81a33013cf2 100644 --- a/src/app/core/notifications/qa/models/quality-assurance-source.model.ts +++ b/src/app/core/notifications/qa/models/quality-assurance-source.model.ts @@ -1,13 +1,13 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, } from 'cerialize'; -import { typedObject } from '../../../cache/builders/build-decorators'; -import { CacheableObject } from '../../../cache/cacheable-object.model'; -import { HALLink } from '../../../shared/hal-link.model'; -import { ResourceType } from '../../../shared/resource-type'; -import { excludeFromEquals } from '../../../utilities/equals.decorators'; import { QUALITY_ASSURANCE_SOURCE_OBJECT } from './quality-assurance-source-object.resource-type'; /** diff --git a/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts index e9fc57a307c..7739b3b9b63 100644 --- a/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts +++ b/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for the Quality Assurance topic diff --git a/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts b/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts index 0d4235a5311..91fcfdcfd34 100644 --- a/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts +++ b/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts @@ -1,13 +1,13 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, } from 'cerialize'; -import { typedObject } from '../../../cache/builders/build-decorators'; -import { CacheableObject } from '../../../cache/cacheable-object.model'; -import { HALLink } from '../../../shared/hal-link.model'; -import { ResourceType } from '../../../shared/resource-type'; -import { excludeFromEquals } from '../../../utilities/equals.decorators'; import { QUALITY_ASSURANCE_TOPIC_OBJECT } from './quality-assurance-topic-object.resource-type'; /** diff --git a/src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts index 25e625f88ed..9069eaa7a51 100644 --- a/src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts +++ b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts @@ -1,4 +1,12 @@ import { HttpClient } from '@angular/common/http'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RestResponse } from '@core/cache/response.models'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RequestService } from '@core/data/request.service'; +import { RequestEntry } from '@core/data/request-entry.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { cold, getTestScheduler, @@ -13,14 +21,6 @@ import { import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject } from '../../../../shared/remote-data.utils'; import { ObjectCacheServiceStub } from '../../../../shared/testing/object-cache-service.stub'; -import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../cache/object-cache.service'; -import { RestResponse } from '../../../cache/response.models'; -import { buildPaginatedList } from '../../../data/paginated-list.model'; -import { RequestService } from '../../../data/request.service'; -import { RequestEntry } from '../../../data/request-entry.model'; -import { HALEndpointService } from '../../../shared/hal-endpoint.service'; -import { PageInfo } from '../../../shared/page-info.model'; import { QualityAssuranceSourceDataService } from './quality-assurance-source-data.service'; describe('QualityAssuranceSourceDataService', () => { diff --git a/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts index 89f28e1e9ef..cb484b39ee4 100644 --- a/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts +++ b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts @@ -1,24 +1,24 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; - -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model'; -import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../cache/object-cache.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; import { FindAllData, FindAllDataImpl, -} from '../../../data/base/find-all-data'; -import { IdentifiableDataService } from '../../../data/base/identifiable-data.service'; +} from '@core/data/base/find-all-data'; +import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; import { SearchData, SearchDataImpl, -} from '../../../data/base/search-data'; -import { FindListOptions } from '../../../data/find-list-options.model'; -import { PaginatedList } from '../../../data/paginated-list.model'; -import { RemoteData } from '../../../data/remote-data'; -import { RequestService } from '../../../data/request.service'; -import { HALEndpointService } from '../../../shared/hal-endpoint.service'; +} from '@core/data/base/search-data'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Observable } from 'rxjs'; + +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model'; import { QualityAssuranceSourceObject } from '../models/quality-assurance-source.model'; /** diff --git a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts index 03463adcb64..ee018660611 100644 --- a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts +++ b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts @@ -1,4 +1,12 @@ import { HttpClient } from '@angular/common/http'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RestResponse } from '@core/cache/response.models'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RequestService } from '@core/data/request.service'; +import { RequestEntry } from '@core/data/request-entry.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { cold, getTestScheduler, @@ -13,14 +21,6 @@ import { import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject } from '../../../../shared/remote-data.utils'; import { ObjectCacheServiceStub } from '../../../../shared/testing/object-cache-service.stub'; -import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../cache/object-cache.service'; -import { RestResponse } from '../../../cache/response.models'; -import { buildPaginatedList } from '../../../data/paginated-list.model'; -import { RequestService } from '../../../data/request.service'; -import { RequestEntry } from '../../../data/request-entry.model'; -import { HALEndpointService } from '../../../shared/hal-endpoint.service'; -import { PageInfo } from '../../../shared/page-info.model'; import { QualityAssuranceTopicDataService } from './quality-assurance-topic-data.service'; describe('QualityAssuranceTopicDataService', () => { diff --git a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts index 3ae6eab2f18..68c8e2a7ed1 100644 --- a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts +++ b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts @@ -1,24 +1,24 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; - -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model'; -import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../cache/object-cache.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; import { FindAllData, FindAllDataImpl, -} from '../../../data/base/find-all-data'; -import { IdentifiableDataService } from '../../../data/base/identifiable-data.service'; +} from '@core/data/base/find-all-data'; +import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; import { SearchData, SearchDataImpl, -} from '../../../data/base/search-data'; -import { FindListOptions } from '../../../data/find-list-options.model'; -import { PaginatedList } from '../../../data/paginated-list.model'; -import { RemoteData } from '../../../data/remote-data'; -import { RequestService } from '../../../data/request.service'; -import { HALEndpointService } from '../../../shared/hal-endpoint.service'; +} from '@core/data/base/search-data'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Observable } from 'rxjs'; + +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model'; import { QualityAssuranceTopicObject } from '../models/quality-assurance-topic.model'; /** diff --git a/src/app/core/notifications/suggestions/models/suggestion-objects.resource-type.ts b/src/app/core/notifications/suggestions/models/suggestion-objects.resource-type.ts index 8f87027a8c5..55ce9da896e 100644 --- a/src/app/core/notifications/suggestions/models/suggestion-objects.resource-type.ts +++ b/src/app/core/notifications/suggestions/models/suggestion-objects.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for the Suggestion object diff --git a/src/app/core/notifications/suggestions/models/suggestion-source-object.resource-type.ts b/src/app/core/notifications/suggestions/models/suggestion-source-object.resource-type.ts index 2e26fe4301c..129956a39af 100644 --- a/src/app/core/notifications/suggestions/models/suggestion-source-object.resource-type.ts +++ b/src/app/core/notifications/suggestions/models/suggestion-source-object.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for the Suggestion Source object diff --git a/src/app/core/notifications/suggestions/models/suggestion-source.model.ts b/src/app/core/notifications/suggestions/models/suggestion-source.model.ts index 0218ab4ae14..c097fe867a1 100644 --- a/src/app/core/notifications/suggestions/models/suggestion-source.model.ts +++ b/src/app/core/notifications/suggestions/models/suggestion-source.model.ts @@ -1,13 +1,13 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, } from 'cerialize'; -import { typedObject } from '../../../cache/builders/build-decorators'; -import { CacheableObject } from '../../../cache/cacheable-object.model'; -import { HALLink } from '../../../shared/hal-link.model'; -import { ResourceType } from '../../../shared/resource-type'; -import { excludeFromEquals } from '../../../utilities/equals.decorators'; import { SUGGESTION_SOURCE } from './suggestion-source-object.resource-type'; /** diff --git a/src/app/core/notifications/suggestions/models/suggestion-target-object.resource-type.ts b/src/app/core/notifications/suggestions/models/suggestion-target-object.resource-type.ts index 71dd41912ac..4b735e7a812 100644 --- a/src/app/core/notifications/suggestions/models/suggestion-target-object.resource-type.ts +++ b/src/app/core/notifications/suggestions/models/suggestion-target-object.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for the Suggestion Target object diff --git a/src/app/core/notifications/suggestions/models/suggestion-target.model.ts b/src/app/core/notifications/suggestions/models/suggestion-target.model.ts index 94d6b7bfa10..0b1f853f55d 100644 --- a/src/app/core/notifications/suggestions/models/suggestion-target.model.ts +++ b/src/app/core/notifications/suggestions/models/suggestion-target.model.ts @@ -1,13 +1,13 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, } from 'cerialize'; -import { typedObject } from '../../../cache/builders/build-decorators'; -import { CacheableObject } from '../../../cache/cacheable-object.model'; -import { HALLink } from '../../../shared/hal-link.model'; -import { ResourceType } from '../../../shared/resource-type'; -import { excludeFromEquals } from '../../../utilities/equals.decorators'; import { SUGGESTION_TARGET } from './suggestion-target-object.resource-type'; /** diff --git a/src/app/core/notifications/suggestions/models/suggestion.model.ts b/src/app/core/notifications/suggestions/models/suggestion.model.ts index 82bc46750e6..24a9031e1c0 100644 --- a/src/app/core/notifications/suggestions/models/suggestion.model.ts +++ b/src/app/core/notifications/suggestions/models/suggestion.model.ts @@ -1,18 +1,18 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { + MetadataMap, + MetadataMapSerializer, +} from '@core/shared/metadata.models'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, autoserializeAs, deserialize, } from 'cerialize'; -import { typedObject } from '../../../cache/builders/build-decorators'; -import { CacheableObject } from '../../../cache/cacheable-object.model'; -import { HALLink } from '../../../shared/hal-link.model'; -import { - MetadataMap, - MetadataMapSerializer, -} from '../../../shared/metadata.models'; -import { ResourceType } from '../../../shared/resource-type'; -import { excludeFromEquals } from '../../../utilities/equals.decorators'; import { SUGGESTION } from './suggestion-objects.resource-type'; /** diff --git a/src/app/core/notifications/suggestions/source/suggestion-source-data.service.spec.ts b/src/app/core/notifications/suggestions/source/suggestion-source-data.service.spec.ts index 42fc9e7774b..4e5ce267c6d 100644 --- a/src/app/core/notifications/suggestions/source/suggestion-source-data.service.spec.ts +++ b/src/app/core/notifications/suggestions/source/suggestion-source-data.service.spec.ts @@ -1,4 +1,17 @@ import { HttpClient } from '@angular/common/http'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RestResponse } from '@core/cache/response.models'; +import { CoreState } from '@core/core-state.model'; +import { FindAllData } from '@core/data/base/find-all-data'; +import { testFindAllDataImplementation } from '@core/data/base/find-all-data.spec'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { RemoteData } from '@core/data/remote-data'; +import { GetRequest } from '@core/data/request.models'; +import { RequestService } from '@core/data/request.service'; +import { RequestEntry } from '@core/data/request-entry.model'; +import { RequestEntryState } from '@core/data/request-entry-state.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { Store } from '@ngrx/store'; import { cold, @@ -9,19 +22,6 @@ import { TestScheduler } from 'rxjs/testing'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; -import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../cache/object-cache.service'; -import { RestResponse } from '../../../cache/response.models'; -import { CoreState } from '../../../core-state.model'; -import { FindAllData } from '../../../data/base/find-all-data'; -import { testFindAllDataImplementation } from '../../../data/base/find-all-data.spec'; -import { DefaultChangeAnalyzer } from '../../../data/default-change-analyzer.service'; -import { RemoteData } from '../../../data/remote-data'; -import { GetRequest } from '../../../data/request.models'; -import { RequestService } from '../../../data/request.service'; -import { RequestEntry } from '../../../data/request-entry.model'; -import { RequestEntryState } from '../../../data/request-entry-state.model'; -import { HALEndpointService } from '../../../shared/hal-endpoint.service'; import { SuggestionSource } from '../models/suggestion-source.model'; import { SuggestionSourceDataService } from './suggestion-source-data.service'; diff --git a/src/app/core/notifications/suggestions/source/suggestion-source-data.service.ts b/src/app/core/notifications/suggestions/source/suggestion-source-data.service.ts index d90c1a8e8c4..3af45aecd63 100644 --- a/src/app/core/notifications/suggestions/source/suggestion-source-data.service.ts +++ b/src/app/core/notifications/suggestions/source/suggestion-source-data.service.ts @@ -1,24 +1,24 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { CoreState } from '@core/core-state.model'; +import { + FindAllData, + FindAllDataImpl, +} from '@core/data/base/find-all-data'; +import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model'; -import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../cache/object-cache.service'; -import { CoreState } from '../../../core-state.model'; -import { - FindAllData, - FindAllDataImpl, -} from '../../../data/base/find-all-data'; -import { IdentifiableDataService } from '../../../data/base/identifiable-data.service'; -import { DefaultChangeAnalyzer } from '../../../data/default-change-analyzer.service'; -import { FindListOptions } from '../../../data/find-list-options.model'; -import { PaginatedList } from '../../../data/paginated-list.model'; -import { RemoteData } from '../../../data/remote-data'; -import { RequestService } from '../../../data/request.service'; -import { HALEndpointService } from '../../../shared/hal-endpoint.service'; import { SuggestionSource } from '../models/suggestion-source.model'; /** diff --git a/src/app/core/notifications/suggestions/target/suggestion-target-data.service.spec.ts b/src/app/core/notifications/suggestions/target/suggestion-target-data.service.spec.ts index b88513abe3e..7e0476e2f4c 100644 --- a/src/app/core/notifications/suggestions/target/suggestion-target-data.service.spec.ts +++ b/src/app/core/notifications/suggestions/target/suggestion-target-data.service.spec.ts @@ -1,4 +1,20 @@ import { HttpClient } from '@angular/common/http'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RestResponse } from '@core/cache/response.models'; +import { CoreState } from '@core/core-state.model'; +import { FindAllData } from '@core/data/base/find-all-data'; +import { testFindAllDataImplementation } from '@core/data/base/find-all-data.spec'; +import { SearchData } from '@core/data/base/search-data'; +import { testSearchDataImplementation } from '@core/data/base/search-data.spec'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { RemoteData } from '@core/data/remote-data'; +import { GetRequest } from '@core/data/request.models'; +import { RequestService } from '@core/data/request.service'; +import { RequestEntry } from '@core/data/request-entry.model'; +import { RequestEntryState } from '@core/data/request-entry-state.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { Store } from '@ngrx/store'; import { cold, @@ -9,22 +25,6 @@ import { TestScheduler } from 'rxjs/testing'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; -import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service'; -import { RequestParam } from '../../../cache/models/request-param.model'; -import { ObjectCacheService } from '../../../cache/object-cache.service'; -import { RestResponse } from '../../../cache/response.models'; -import { CoreState } from '../../../core-state.model'; -import { FindAllData } from '../../../data/base/find-all-data'; -import { testFindAllDataImplementation } from '../../../data/base/find-all-data.spec'; -import { SearchData } from '../../../data/base/search-data'; -import { testSearchDataImplementation } from '../../../data/base/search-data.spec'; -import { DefaultChangeAnalyzer } from '../../../data/default-change-analyzer.service'; -import { RemoteData } from '../../../data/remote-data'; -import { GetRequest } from '../../../data/request.models'; -import { RequestService } from '../../../data/request.service'; -import { RequestEntry } from '../../../data/request-entry.model'; -import { RequestEntryState } from '../../../data/request-entry-state.model'; -import { HALEndpointService } from '../../../shared/hal-endpoint.service'; import { SuggestionTarget } from '../models/suggestion-target.model'; import { SuggestionTargetDataService } from './suggestion-target-data.service'; diff --git a/src/app/core/notifications/suggestions/target/suggestion-target-data.service.ts b/src/app/core/notifications/suggestions/target/suggestion-target-data.service.ts index a83b24f0853..4892a33a26c 100644 --- a/src/app/core/notifications/suggestions/target/suggestion-target-data.service.ts +++ b/src/app/core/notifications/suggestions/target/suggestion-target-data.service.ts @@ -1,29 +1,29 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs'; - -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model'; -import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service'; -import { RequestParam } from '../../../cache/models/request-param.model'; -import { ObjectCacheService } from '../../../cache/object-cache.service'; -import { CoreState } from '../../../core-state.model'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { CoreState } from '@core/core-state.model'; import { FindAllData, FindAllDataImpl, -} from '../../../data/base/find-all-data'; -import { IdentifiableDataService } from '../../../data/base/identifiable-data.service'; +} from '@core/data/base/find-all-data'; +import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; import { SearchData, SearchDataImpl, -} from '../../../data/base/search-data'; -import { DefaultChangeAnalyzer } from '../../../data/default-change-analyzer.service'; -import { FindListOptions } from '../../../data/find-list-options.model'; -import { PaginatedList } from '../../../data/paginated-list.model'; -import { RemoteData } from '../../../data/remote-data'; -import { RequestService } from '../../../data/request.service'; -import { HALEndpointService } from '../../../shared/hal-endpoint.service'; +} from '@core/data/base/search-data'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Store } from '@ngrx/store'; +import { Observable } from 'rxjs'; + +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model'; import { SuggestionTarget } from '../models/suggestion-target.model'; @Injectable({ providedIn: 'root' }) diff --git a/src/app/core/provide-core.ts b/src/app/core/provide-core.ts index 0057c0823d7..619def6b5fc 100644 --- a/src/app/core/provide-core.ts +++ b/src/app/core/provide-core.ts @@ -2,8 +2,6 @@ import { HttpClient } from '@angular/common/http'; import { makeEnvironmentProviders } from '@angular/core'; import { environment } from '../../environments/environment'; -import { Itemfilter } from '../admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters'; -import { LdnService } from '../admin/admin-ldn-services/ldn-services-model/ldn-services.model'; import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model'; import { Process } from '../process-page/processes/process.model'; import { Script } from '../process-page/scripts/script.model'; @@ -15,16 +13,18 @@ import { import { AccessStatusObject } from '../shared/object-collection/shared/badges/access-status-badge/access-status.model'; import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model'; import { Subscription } from '../shared/subscriptions/models/subscription.model'; -import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config'; import { SystemWideAlert } from '../system-wide-alert/system-wide-alert.model'; import { AuthStatus } from './auth/models/auth-status.model'; import { ShortLivedToken } from './auth/models/short-lived-token.model'; +import { SubmissionCoarNotifyModel } from './coar-notify/models/submission-coar-notify.model'; import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model'; import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model'; import { SubmissionDefinitionsModel } from './config/models/config-submission-definitions.model'; import { SubmissionFormsModel } from './config/models/config-submission-forms.model'; import { SubmissionSectionModel } from './config/models/config-submission-section.model'; import { SubmissionUploadsModel } from './config/models/config-submission-uploads.model'; +import { Itemfilter } from './data/admin-ldn-services/ldn-services-model/ldn-service-itemfilters'; +import { LdnService } from './data/admin-ldn-services/ldn-services-model/ldn-services.model'; import { Root } from './data/root.model'; import { DspaceRestService } from './dspace-rest/dspace-rest.service'; import { EPerson } from './eperson/models/eperson.model'; @@ -184,7 +184,7 @@ export const models = SuggestionSource, LdnService, Itemfilter, - SubmissionCoarNotifyConfig, + SubmissionCoarNotifyModel, NotifyRequestsStatus, SystemWideAlert, ]; diff --git a/src/app/core/shared/search/search-filters/search-config.model.ts b/src/app/core/shared/search/search-filters/search-config.model.ts index 2ebe5e84555..b1673c6a2ae 100644 --- a/src/app/core/shared/search/search-filters/search-config.model.ts +++ b/src/app/core/shared/search/search-filters/search-config.model.ts @@ -1,11 +1,11 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; import { autoserialize, deserialize, } from 'cerialize'; import { FilterType } from '../../../../shared/search/models/filter-type.model'; -import { typedObject } from '../../../cache/builders/build-decorators'; -import { CacheableObject } from '../../../cache/cacheable-object.model'; import { HALLink } from '../../hal-link.model'; import { ResourceType } from '../../resource-type'; import { SEARCH_CONFIG } from './search-config.resource-type'; diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts b/src/app/core/shared/section-coar-notify-service.resource-type.ts similarity index 81% rename from src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts rename to src/app/core/shared/section-coar-notify-service.resource-type.ts index 53e41783ced..fa783c7b073 100644 --- a/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts +++ b/src/app/core/shared/section-coar-notify-service.resource-type.ts @@ -4,7 +4,7 @@ * Needs to be in a separate file to prevent circular * dependencies in webpack. */ -import { ResourceType } from '../../../core/shared/resource-type'; +import { ResourceType } from './resource-type'; export const SUBMISSION_COAR_NOTIFY_CONFIG = new ResourceType('submissioncoarnotifyconfig'); diff --git a/src/app/core/submission/vocabularies/models/vocabularies.resource-type.ts b/src/app/core/submission/vocabularies/models/vocabularies.resource-type.ts index 5902fe4e173..952e679091f 100644 --- a/src/app/core/submission/vocabularies/models/vocabularies.resource-type.ts +++ b/src/app/core/submission/vocabularies/models/vocabularies.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for vocabulary models diff --git a/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts index f7dff16a405..b832b301645 100644 --- a/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts +++ b/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts @@ -1,11 +1,11 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { HALLink } from '@core/shared/hal-link.model'; import { autoserialize, deserialize, inheritSerialization, } from 'cerialize'; -import { typedObject } from '../../../cache/builders/build-decorators'; -import { HALLink } from '../../../shared/hal-link.model'; import { VOCABULARY_ENTRY_DETAIL } from './vocabularies.resource-type'; import { VocabularyEntry } from './vocabulary-entry.model'; diff --git a/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts index 85b310bad88..059e52f73b4 100644 --- a/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts +++ b/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts @@ -1,3 +1,7 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { HALLink } from '@core/shared/hal-link.model'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, @@ -7,10 +11,6 @@ import { isNotEmpty } from '../../../../shared/empty.util'; import { PLACEHOLDER_PARENT_METADATA } from '../../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants'; import { OtherInformation } from '../../../../shared/form/builder/models/form-field-metadata-value.model'; import { ListableObject } from '../../../../shared/object-collection/shared/listable-object.model'; -import { typedObject } from '../../../cache/builders/build-decorators'; -import { GenericConstructor } from '../../../shared/generic-constructor'; -import { HALLink } from '../../../shared/hal-link.model'; -import { excludeFromEquals } from '../../../utilities/equals.decorators'; import { VOCABULARY_ENTRY } from './vocabularies.resource-type'; /** diff --git a/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts index f9b061f0f74..e05d7c2c239 100644 --- a/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts +++ b/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts @@ -1,7 +1,8 @@ +import { RequestParam } from '@core/cache/models/request-param.model'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; + import { isNotEmpty } from '../../../../shared/empty.util'; -import { RequestParam } from '../../../cache/models/request-param.model'; -import { SortOptions } from '../../../cache/models/sort-options.model'; -import { FindListOptions } from '../../../data/find-list-options.model'; /** * Representing properties used to build a vocabulary find request diff --git a/src/app/core/submission/vocabularies/models/vocabulary.model.ts b/src/app/core/submission/vocabularies/models/vocabulary.model.ts index 9da5ade3267..12f96b65e95 100644 --- a/src/app/core/submission/vocabularies/models/vocabulary.model.ts +++ b/src/app/core/submission/vocabularies/models/vocabulary.model.ts @@ -1,18 +1,18 @@ +import { + link, + typedObject, +} from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { HALLink } from '@core/shared/hal-link.model'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, } from 'cerialize'; import { Observable } from 'rxjs'; -import { - link, - typedObject, -} from '../../../cache/builders/build-decorators'; -import { CacheableObject } from '../../../cache/cacheable-object.model'; -import { PaginatedList } from '../../../data/paginated-list.model'; -import { RemoteData } from '../../../data/remote-data'; -import { HALLink } from '../../../shared/hal-link.model'; -import { excludeFromEquals } from '../../../utilities/equals.decorators'; import { VOCABULARY, VOCABULARY_ENTRY, diff --git a/src/app/correlation-id/correlation-id.service.spec.ts b/src/app/correlation-id/correlation-id.service.spec.ts index 709ade04eee..754c522e037 100644 --- a/src/app/correlation-id/correlation-id.service.spec.ts +++ b/src/app/correlation-id/correlation-id.service.spec.ts @@ -1,4 +1,5 @@ import { TestBed } from '@angular/core/testing'; +import { UUIDService } from '@core/shared/uuid.service'; import { Store, StoreModule, @@ -11,7 +12,6 @@ import { AppState, storeModuleConfig, } from '../app.reducer'; -import { UUIDService } from '../core/shared/uuid.service'; import { CORRELATION_ID_COOKIE } from '../shared/cookies/orejime-configuration'; import { CookieServiceMock } from '../shared/mocks/cookie.service.mock'; import { SetCorrelationIdAction } from './correlation-id.actions'; diff --git a/src/app/correlation-id/correlation-id.service.ts b/src/app/correlation-id/correlation-id.service.ts index 9075643c244..adcb94df349 100644 --- a/src/app/correlation-id/correlation-id.service.ts +++ b/src/app/correlation-id/correlation-id.service.ts @@ -2,6 +2,12 @@ import { Inject, Injectable, } from '@angular/core'; +import { CookieService } from '@core/services/cookie.service'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; +import { UUIDService } from '@core/shared/uuid.service'; import { select, Store, @@ -9,12 +15,6 @@ import { import { take } from 'rxjs/operators'; import { AppState } from '../app.reducer'; -import { CookieService } from '../core/services/cookie.service'; -import { - NativeWindowRef, - NativeWindowService, -} from '../core/services/window.service'; -import { UUIDService } from '../core/shared/uuid.service'; import { OrejimeService } from '../shared/cookies/orejime.service'; import { CORRELATION_ID_COOKIE, diff --git a/src/app/curation-form/curation-form.component.spec.ts b/src/app/curation-form/curation-form.component.spec.ts index 8ca8e5e19d7..e1b45752641 100644 --- a/src/app/curation-form/curation-form.component.spec.ts +++ b/src/app/curation-form/curation-form.component.spec.ts @@ -12,13 +12,13 @@ import { } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { ProcessDataService } from '../core/data/processes/process-data.service'; -import { ScriptDataService } from '../core/data/processes/script-data.service'; -import { ConfigurationProperty } from '../core/shared/configuration-property.model'; import { getProcessDetailRoute } from '../process-page/process-page-routing.paths'; import { Process } from '../process-page/processes/process.model'; import { HandleService } from '../shared/handle.service'; diff --git a/src/app/curation-form/curation-form.component.ts b/src/app/curation-form/curation-form.component.ts index d48f6b113d1..a2103ddc51e 100644 --- a/src/app/curation-form/curation-form.component.ts +++ b/src/app/curation-form/curation-form.component.ts @@ -13,6 +13,14 @@ import { UntypedFormGroup, } from '@angular/forms'; import { Router } from '@angular/router'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -23,14 +31,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { ScriptDataService } from '../core/data/processes/script-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { ConfigurationProperty } from '../core/shared/configuration-property.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../core/shared/operators'; import { getProcessDetailRoute } from '../process-page/process-page-routing.paths'; import { Process } from '../process-page/processes/process.model'; import { diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts index 23859828c32..2694caafe06 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts @@ -6,14 +6,14 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { MetadataValue } from '@core/shared/metadata.models'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, of, } from 'rxjs'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { MetadataValue } from '../../../core/shared/metadata.models'; import { VarDirective } from '../../../shared/utils/var.directive'; import { DsoEditMetadataForm } from '../dso-edit-metadata-form'; import { DsoEditMetadataValueComponent } from '../dso-edit-metadata-value/dso-edit-metadata-value.component'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts index 0929f4a21f0..f41c3c0faff 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts @@ -10,13 +10,13 @@ import { Input, Output, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { BehaviorSubject, Observable, } from 'rxjs'; -import { Context } from '../../../core/shared/context.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { DsoEditMetadataChangeType, DsoEditMetadataForm, diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts index 01a6ba48caa..05f13767ad1 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts @@ -1,5 +1,6 @@ -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { MetadataValue } from '../../core/shared/metadata.models'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { MetadataValue } from '@core/shared/metadata.models'; + import { DsoEditMetadataChangeType, DsoEditMetadataForm, diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index f45f43181b6..106ee789ef8 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -1,18 +1,18 @@ /* eslint-disable max-classes-per-file */ +import { ArrayMoveChangeAnalyzer } from '@core/data/array-move-change-analyzer.service'; +import { MetadataPatchAddOperation } from '@core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model'; +import { MetadataPatchMoveOperation } from '@core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model'; +import { MetadataPatchRemoveOperation } from '@core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model'; +import { MetadataPatchReplaceOperation } from '@core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model'; +import { + MetadataMap, + MetadataValue, +} from '@core/shared/metadata.models'; import { MoveOperation, Operation, } from 'fast-json-patch'; -import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service'; -import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model'; -import { MetadataPatchMoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model'; -import { MetadataPatchRemoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model'; -import { MetadataPatchReplaceOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model'; -import { - MetadataMap, - MetadataValue, -} from '../../core/shared/metadata.models'; import { hasNoValue, hasValue, diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/abstract-dso-edit-metadata-value-field.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/abstract-dso-edit-metadata-value-field.component.ts index 3bd5b5b2e99..8bb5629403d 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/abstract-dso-edit-metadata-value-field.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/abstract-dso-edit-metadata-value-field.component.ts @@ -4,9 +4,9 @@ import { Input, Output, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; -import { Context } from '../../../core/shared/context.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { DsoEditMetadataValue } from '../dso-edit-metadata-form'; import { EditMetadataValueFieldType } from './dso-edit-metadata-field-type.enum'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.spec.ts index 1482c329b57..fb1704785a9 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.spec.ts @@ -4,19 +4,19 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { ItemDataService } from '@core/data/item-data.service'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { RegistryService } from '@core/registry/registry.service'; +import { Collection } from '@core/shared/collection.model'; +import { ConfidenceType } from '@core/shared/confidence-type'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { Vocabulary } from '@core/submission/vocabularies/models/vocabulary.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { TranslateModule } from '@ngx-translate/core'; -import { ItemDataService } from '../../../../core/data/item-data.service'; -import { MetadataField } from '../../../../core/metadata/metadata-field.model'; -import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model'; -import { RegistryService } from '../../../../core/registry/registry.service'; -import { Collection } from '../../../../core/shared/collection.model'; -import { ConfidenceType } from '../../../../core/shared/confidence-type'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { Item } from '../../../../core/shared/item.model'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; -import { Vocabulary } from '../../../../core/submission/vocabularies/models/vocabulary.model'; -import { VocabularyService } from '../../../../core/submission/vocabularies/vocabulary.service'; import { DynamicOneboxModel } from '../../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model'; import { DsDynamicScrollableDropdownComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component'; import { DynamicScrollableDropdownModel } from '../../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.ts index a6a4e0cb626..dd54f2262e5 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.ts @@ -14,6 +14,15 @@ import { UntypedFormControl, UntypedFormGroup, } from '@angular/forms'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RegistryService } from '@core/registry/registry.service'; +import { ConfidenceType } from '@core/shared/confidence-type'; +import { + getFirstCompletedRemoteData, + metadataFieldsToString, +} from '@core/shared/operators'; +import { Vocabulary } from '@core/submission/vocabularies/models/vocabulary.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -31,15 +40,6 @@ import { tap, } from 'rxjs/operators'; -import { ItemDataService } from '../../../../core/data/item-data.service'; -import { RegistryService } from '../../../../core/registry/registry.service'; -import { ConfidenceType } from '../../../../core/shared/confidence-type'; -import { - getFirstCompletedRemoteData, - metadataFieldsToString, -} from '../../../../core/shared/operators'; -import { Vocabulary } from '../../../../core/submission/vocabularies/models/vocabulary.model'; -import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model'; import { isNotEmpty } from '../../../../shared/empty.util'; import { DsDynamicOneboxComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component'; import { diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component.spec.ts index 486f4e825e9..b0345041fdd 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component.spec.ts @@ -2,9 +2,9 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; import { TranslateModule } from '@ngx-translate/core'; -import { EntityTypeDataService } from '../../../../core/data/entity-type-data.service'; import { EntityTypeDataServiceStub } from '../../../../shared/testing/entity-type-data.service.stub'; import { DsoEditMetadataEntityFieldComponent } from './dso-edit-metadata-entity-field.component'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component.ts index e4e2087cf16..15d5c97556d 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component.ts @@ -4,12 +4,12 @@ import { OnInit, } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { getFirstSucceededRemoteListPayload } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { EntityTypeDataService } from '../../../../core/data/entity-type-data.service'; -import { ItemType } from '../../../../core/shared/item-relationships/item-type.model'; -import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators'; import { AbstractDsoEditMetadataValueFieldComponent } from '../abstract-dso-edit-metadata-value-field.component'; /** diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-field.service.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-field.service.spec.ts index daea727838b..e5ec883937b 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-field.service.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-field.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; +import { ItemDataService } from '@core/data/item-data.service'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service'; import { ItemDataServiceStub } from '../../../shared/testing/item-data.service.stub'; import { VocabularyServiceStub } from '../../../shared/testing/vocabulary-service.stub'; import { DsoEditMetadataFieldService } from './dso-edit-metadata-field.service'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-field.service.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-field.service.ts index bcf5d525d1d..fff5199ebb1 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-field.service.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-field.service.ts @@ -1,17 +1,17 @@ import { Injectable } from '@angular/core'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { Vocabulary } from '@core/submission/vocabularies/models/vocabulary.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { Observable, of, } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; -import { Vocabulary } from '../../../core/submission/vocabularies/models/vocabulary.model'; -import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service'; import { isNotEmpty } from '../../../shared/empty.util'; import { followLink } from '../../../shared/utils/follow-link-config.model'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field-loader.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field-loader.component.ts index de44895556b..45a29becc96 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field-loader.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field-loader.component.ts @@ -4,10 +4,10 @@ import { Input, Output, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; -import { Context } from '../../../../core/shared/context.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { GenericConstructor } from '../../../../core/shared/generic-constructor'; import { AbstractComponentLoaderComponent } from '../../../../shared/abstract-component-loader/abstract-component-loader.component'; import { DynamicComponentLoaderDirective } from '../../../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { DsoEditMetadataValue } from '../../dso-edit-metadata-form'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field.decorator.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field.decorator.ts index 34decfceaab..94e2cda2282 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field.decorator.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field.decorator.ts @@ -1,4 +1,5 @@ -import { Context } from '../../../../core/shared/context.model'; +import { Context } from '@core/shared/context.model'; + import { hasValue } from '../../../../shared/empty.util'; import { DEFAULT_CONTEXT, diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts index 8ef37535543..8b5fad5b803 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts @@ -9,16 +9,16 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterModule } from '@angular/router'; -import { TranslateModule } from '@ngx-translate/core'; -import { of } from 'rxjs'; - -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; import { MetadataValue, VIRTUAL_METADATA_PREFIX, -} from '../../../core/shared/metadata.models'; -import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model'; +} from '@core/shared/metadata.models'; +import { ItemMetadataRepresentation } from '@core/shared/metadata-representation/item/item-metadata-representation.model'; +import { TranslateModule } from '@ngx-translate/core'; +import { of } from 'rxjs'; + import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { ThemedTypeBadgeComponent } from '../../../shared/object-collection/shared/badges/type-badge/themed-type-badge.component'; import { DsoEditMetadataFieldServiceStub } from '../../../shared/testing/dso-edit-metadata-field.service.stub'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts index 44b1efe4140..6c6150bdce6 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts @@ -17,6 +17,18 @@ import { } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { MetadataService } from '@core/metadata/metadata.service'; +import { ConfidenceType } from '@core/shared/confidence-type'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { ItemMetadataRepresentation } from '@core/shared/metadata-representation/item/item-metadata-representation.model'; +import { + MetadataRepresentation, + MetadataRepresentationType, +} from '@core/shared/metadata-representation/metadata-representation.model'; +import { Vocabulary } from '@core/submission/vocabularies/models/vocabulary.model'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -25,18 +37,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { MetadataService } from '../../../core/metadata/metadata.service'; -import { ConfidenceType } from '../../../core/shared/confidence-type'; -import { Context } from '../../../core/shared/context.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model'; -import { - MetadataRepresentation, - MetadataRepresentationType, -} from '../../../core/shared/metadata-representation/metadata-representation.model'; -import { Vocabulary } from '../../../core/submission/vocabularies/models/vocabulary.model'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { hasValue } from '../../../shared/empty.util'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts index cbe2c187924..4435acfbbe6 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts @@ -13,14 +13,14 @@ import { By, } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { ArrayMoveChangeAnalyzer } from '@core/data/array-move-change-analyzer.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; +import { MetadataValue } from '@core/shared/metadata.models'; import { TranslateModule } from '@ngx-translate/core'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; -import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { Item } from '../../core/shared/item.model'; -import { ITEM } from '../../core/shared/item.resource-type'; -import { MetadataValue } from '../../core/shared/metadata.models'; import { AlertComponent } from '../../shared/alert/alert.component'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index efbc6ec93a8..180fbc6df52 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -13,6 +13,14 @@ import { ActivatedRoute, Data, } from '@angular/router'; +import { ArrayMoveChangeAnalyzer } from '@core/data/array-move-change-analyzer.service'; +import { RemoteData } from '@core/data/remote-data'; +import { UpdateDataService } from '@core/data/update-data.service'; +import { lazyDataService } from '@core/lazy-data-service'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { ResourceType } from '@core/shared/resource-type'; import { TranslateModule, TranslateService, @@ -34,14 +42,6 @@ import { APP_DATA_SERVICES_MAP, LazyDataServicesMap, } from '../../../config/app-config.interface'; -import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { UpdateDataService } from '../../core/data/update-data.service'; -import { lazyDataService } from '../../core/lazy-data-service'; -import { Context } from '../../core/shared/context.model'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { ResourceType } from '../../core/shared/resource-type'; import { AlertComponent } from '../../shared/alert/alert.component'; import { AlertType } from '../../shared/alert/alert-type'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts index 93d52e71478..dbfef5fbac4 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts @@ -6,15 +6,15 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; -import { TranslateModule } from '@ngx-translate/core'; - import { SortDirection, SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { MetadataField } from '../../../core/metadata/metadata-field.model'; -import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; -import { RegistryService } from '../../../core/registry/registry.service'; +} from '@core/cache/models/sort-options.model'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { RegistryService } from '@core/registry/registry.service'; +import { TranslateModule } from '@ngx-translate/core'; + import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createFailedRemoteDataObject$, diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts index bd9bf8a9e88..53c11eb5b3a 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts @@ -18,6 +18,17 @@ import { ReactiveFormsModule, UntypedFormControl, } from '@angular/forms'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { RegistryService } from '@core/registry/registry.service'; +import { + getAllSucceededRemoteData, + getFirstCompletedRemoteData, + metadataFieldsToString, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -39,17 +50,6 @@ import { tap, } from 'rxjs/operators'; -import { - SortDirection, - SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { RegistryService } from '../../../core/registry/registry.service'; -import { - getAllSucceededRemoteData, - getFirstCompletedRemoteData, - metadataFieldsToString, -} from '../../../core/shared/operators'; import { hasValue } from '../../../shared/empty.util'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; diff --git a/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts index 2097d6b5e44..c653012c930 100644 --- a/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts @@ -2,9 +2,9 @@ import { Component, Input, } from '@angular/core'; +import { UpdateDataService } from '@core/data/update-data.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; -import { UpdateDataService } from '../../core/data/update-data.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { ThemedComponent } from '../../shared/theme-support/themed.component'; import { DsoEditMetadataComponent } from './dso-edit-metadata.component'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts index d8e66eff85e..172860ea14b 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts @@ -8,12 +8,12 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { of } from 'rxjs'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts index d96e9868b1f..fe94247738f 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { JournalIssueSearchResultGridElementComponent } from '../search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts index b40e4ea3b3b..52c50fc5e4c 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts @@ -9,16 +9,16 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; import { AuthServiceMock } from '../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts index 83d70461a5e..ebb946c2c1e 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { JournalVolumeSearchResultGridElementComponent } from '../search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts index b00efb6dba3..7fc9bcd53a3 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts @@ -8,12 +8,12 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { of } from 'rxjs'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts index 3c5f3a687ba..29bcea1a8ac 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { JournalSearchResultGridElementComponent } from '../search-result-grid-elements/journal/journal-search-result-grid-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts index a268c4b97b8..c0882f53f3b 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts @@ -1,6 +1,7 @@ -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec'; import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts index 5b4424821f8..70c24d691ee 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { focusShadow } from '../../../../../shared/animations/focus'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts index ba8793237a6..45b31d41cb2 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts @@ -1,6 +1,7 @@ -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec'; import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts index ea8c755b117..f4e73b3121d 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { focusShadow } from '../../../../../shared/animations/focus'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts index 40d7987c143..19e787d0c43 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts @@ -1,6 +1,7 @@ -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec'; import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts index a92232586e8..75f6ba90870 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { focusShadow } from '../../../../../shared/animations/focus'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts index 4217dc5a479..dad7c00987e 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts @@ -8,15 +8,15 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment.test'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../../core/shared/item.model'; import { AuthServiceMock } from '../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../shared/mocks/mock-trucatable.service'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts index beff4c1a085..2177cf732b5 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { JournalIssueSearchResultListElementComponent } from '../search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts index b7ed26dfc27..1e4409872dc 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts @@ -7,10 +7,10 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Item } from '@core/shared/item.model'; import { of } from 'rxjs'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { Item } from '../../../../core/shared/item.model'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts index 064fcc34ac4..333dc7c0c48 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { JournalVolumeSearchResultListElementComponent } from '../search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts index 55805cf4670..98c5831dec0 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts @@ -8,15 +8,15 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment.test'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../../core/shared/item.model'; import { AuthServiceMock } from '../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts index 3d1777abf2e..63bb8c2dffc 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { JournalSearchResultListElementComponent } from '../search-result-list-elements/journal/journal-search-result-list-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts index ce1da0af8e5..20631971eb6 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts @@ -9,12 +9,12 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { Item } from '../../../../../core/shared/item.model'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts index 59dc23014d5..4cbc6a3c761 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts @@ -4,8 +4,8 @@ import { } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts index f828b1e95a1..4cb604b6daf 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts @@ -10,14 +10,14 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Item } from '@core/shared/item.model'; import { of } from 'rxjs'; import { getMockThemeService } from 'src/app/shared/mocks/theme-service.mock'; import { ActivatedRouteStub } from 'src/app/shared/testing/active-router.stub'; import { ThemeService } from 'src/app/shared/theme-support/theme.service'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { Item } from '../../../../../core/shared/item.model'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts index e23fadafa2d..ef98026af5f 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts @@ -4,8 +4,8 @@ import { } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts index 29ac885a510..b65c5f07cbb 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts @@ -9,14 +9,14 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { ActivatedRouteStub } from 'src/app/shared/testing/active-router.stub'; import { ThemeService } from 'src/app/shared/theme-support/theme.service'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { Item } from '../../../../../core/shared/item.model'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts index bda7a6ba57a..546d119320f 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts @@ -4,8 +4,8 @@ import { } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts index 5cf06fdeade..f7f4825c408 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts @@ -1,5 +1,6 @@ -import { Collection } from '../../../../../core/shared/collection.model'; -import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; import { JournalIssueSidebarSearchListElementComponent } from './journal-issue-sidebar-search-list-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts index c26917457c1..13f1ec3f85a 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts @@ -3,11 +3,11 @@ import { NgClass, } from '@angular/common'; import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { isNotEmpty } from '../../../../../shared/empty.util'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts index 16f13945337..6e52899cace 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts @@ -1,5 +1,6 @@ -import { Collection } from '../../../../../core/shared/collection.model'; -import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; import { JournalVolumeSidebarSearchListElementComponent } from './journal-volume-sidebar-search-list-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts index 19186fca213..11c30be35f0 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts @@ -3,11 +3,11 @@ import { NgClass, } from '@angular/common'; import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { isNotEmpty } from '../../../../../shared/empty.util'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts index a7c2af3806f..931ff7c2e4d 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts @@ -1,5 +1,6 @@ -import { Collection } from '../../../../../core/shared/collection.model'; -import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; import { JournalSidebarSearchListElementComponent } from './journal-sidebar-search-list-element.component'; diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts index d4f547290c9..06666e3dc1e 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts @@ -3,11 +3,11 @@ import { NgClass, } from '@angular/common'; import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { isNotEmpty } from '../../../../../shared/empty.util'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts index 74a83c1c836..607df04799c 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts @@ -1,6 +1,7 @@ -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { createRelationshipsObservable, getItemPageFieldsTest, diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts index 046e5bcd61c..5d74b7d3415 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts index 6c2549a4974..0005106cd77 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts @@ -1,6 +1,7 @@ -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { createRelationshipsObservable, getItemPageFieldsTest, diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts index 02ca72f2fc3..dcd9be4f53c 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts index 1ae584455a2..02df833610e 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts @@ -11,6 +11,27 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { VersionDataService } from '@core/data/version-data.service'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { RouteService } from '@core/services/route.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { UUIDService } from '@core/shared/uuid.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { Store } from '@ngrx/store'; import { TranslateLoader, @@ -22,27 +43,6 @@ import { APP_CONFIG, APP_DATA_SERVICES_MAP, } from '../../../../../config/app-config.interface'; -import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; -import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service'; -import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service'; -import { ItemDataService } from '../../../../core/data/item-data.service'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { VersionDataService } from '../../../../core/data/version-data.service'; -import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; -import { RouteService } from '../../../../core/services/route.service'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { UUIDService } from '../../../../core/shared/uuid.service'; -import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service'; import { MetadataValuesComponent } from '../../../../item-page/field-components/metadata-values/metadata-values.component'; import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts index dc884708cbf..8f69f23866c 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts index 082ad20f2d7..5f0a0dc865d 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts @@ -9,15 +9,15 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateModule } from '@ngx-translate/core'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; import { AuthServiceMock } from '../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../shared/mocks/mock-trucatable.service'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts index a16f33f6e98..f196e47c4ca 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { OrgUnitSearchResultGridElementComponent } from '../search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts index 1761e84cbc3..a12b6efde21 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts @@ -8,12 +8,12 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { of } from 'rxjs'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts index 87cc85c233f..080c0396338 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { PersonSearchResultGridElementComponent } from '../search-result-grid-elements/person/person-search-result-grid-element.component'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts index 7dbc3251f32..375eb3a79cf 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts @@ -9,15 +9,15 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateModule } from '@ngx-translate/core'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; import { AuthServiceMock } from '../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../shared/mocks/mock-trucatable.service'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts index 4337d9f795f..5e20df6709b 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { ProjectSearchResultGridElementComponent } from '../search-result-grid-elements/project/project-search-result-grid-element.component'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts index a73ba72cc6c..ccd7ee0bc9b 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts @@ -1,6 +1,7 @@ -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec'; import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts index 41ba821d1de..9bf87b693b3 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { focusShadow } from '../../../../../shared/animations/focus'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts index 46f08feda10..4366161e21a 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts @@ -1,6 +1,7 @@ -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec'; import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts index 0294875d7e2..1bb2b952eea 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { focusShadow } from '../../../../../shared/animations/focus'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts index 9745ff55546..f8dfe3b490e 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts @@ -1,6 +1,7 @@ -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec'; import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts index 90f5ae8cab2..5f7edc41110 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { focusShadow } from '../../../../../shared/animations/focus'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts index d539105a8d1..05741334b44 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts @@ -8,15 +8,15 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment.test'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../../core/shared/item.model'; import { AuthServiceMock } from '../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../shared/mocks/mock-trucatable.service'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts index 15d5458b8c3..59e4c532c15 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { OrgUnitSearchResultListElementComponent } from '../search-result-list-elements/org-unit/org-unit-search-result-list-element.component'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts index d7dab8ec663..0b05abdc1e1 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts @@ -8,15 +8,15 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment.test'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../../core/shared/item.model'; import { AuthServiceMock } from '../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../shared/mocks/mock-trucatable.service'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts index 3d375388b4c..22671fa1ab9 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { PersonSearchResultListElementComponent } from '../search-result-list-elements/person/person-search-result-list-element.component'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts index 16248dc66c5..47120885372 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts @@ -8,15 +8,15 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment.test'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../../core/shared/item.model'; import { AuthServiceMock } from '../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../shared/mocks/mock-trucatable.service'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts index 1c9e317962b..b945f5aecdb 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { ProjectSearchResultListElementComponent } from '../search-result-list-elements/project/project-search-result-list-element.component'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts index a8b0940195b..c1242fc518a 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts @@ -9,6 +9,10 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateLoader, TranslateModule, @@ -16,10 +20,6 @@ import { import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../../../core/shared/item.model'; import { AuthServiceMock } from '../../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts index e629691636b..3ec04532ca3 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts @@ -4,9 +4,9 @@ import { } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts index 895983af073..1a260b0b464 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts @@ -9,6 +9,10 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateLoader, TranslateModule, @@ -16,10 +20,6 @@ import { import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../../../core/shared/item.model'; import { AuthServiceMock } from '../../../../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts index 95a4337f78d..654385a7002 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts @@ -8,14 +8,14 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG, AppConfig, } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts index dbf3d175a33..54fd102763b 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts @@ -9,11 +9,11 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Item } from '@core/shared/item.model'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { Item } from '../../../../../core/shared/item.model'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts index af05fbaf8b0..f0055536ea9 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts @@ -4,8 +4,8 @@ import { } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts index 4d3f27f6ef4..26179cac87f 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts @@ -1,5 +1,6 @@ -import { Collection } from '../../../../../core/shared/collection.model'; -import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; import { OrgUnitSidebarSearchListElementComponent } from './org-unit-sidebar-search-list-element.component'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts index 3d1f1d78369..be229084a8f 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts @@ -3,11 +3,11 @@ import { NgClass, } from '@angular/common'; import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts index 6e614c58114..15cba735018 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts @@ -1,5 +1,6 @@ -import { Collection } from '../../../../../core/shared/collection.model'; -import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; import { PersonSidebarSearchListElementComponent } from './person-sidebar-search-list-element.component'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts index 8c4323df074..dbbb8d3b219 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts @@ -3,16 +3,16 @@ import { NgClass, } from '@angular/common'; import { Component } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { isNotEmpty } from '../../../../../shared/empty.util'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts index a7be69965fc..0944d6329ca 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts @@ -1,5 +1,6 @@ -import { Collection } from '../../../../../core/shared/collection.model'; -import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; + import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; import { ProjectSidebarSearchListElementComponent } from './project-sidebar-search-list-element.component'; diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts index c46d4c6ccf7..c34537ded7e 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts @@ -3,11 +3,11 @@ import { NgClass, } from '@angular/common'; import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component'; diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts index da38e57dd0e..1f345be840c 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts @@ -1,6 +1,7 @@ -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { createRelationshipsObservable, getItemPageFieldsTest, diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts index c9537418ab9..ffd424c95ed 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ItemPageImgFieldComponent } from '../../../../item-page/simple/field-components/specific-field/img/item-page-img-field.component'; import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts index 5ebd795032b..725ecf75532 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts @@ -1,6 +1,7 @@ -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { createRelationshipsObservable, getItemPageFieldsTest, diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts index b1d43fca5bf..e930b7f9513 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts index 3d8fccaa6fb..0933d905fb6 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts @@ -1,6 +1,7 @@ -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { Item } from '../../../../core/shared/item.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { createRelationshipsObservable, getItemPageFieldsTest, diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts index 1f13975b5df..2fe3d52cdcb 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; diff --git a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts index 8ecfcaefbcf..3a6352f5982 100644 --- a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts @@ -9,11 +9,11 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterLink } from '@angular/router'; +import { Item } from '@core/shared/item.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { ItemMetadataRepresentation } from '@core/shared/metadata-representation/item/item-metadata-representation.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { Item } from '../../../../core/shared/item.model'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; -import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model'; import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component'; import { OrgUnitItemMetadataListElementComponent } from './org-unit-item-metadata-list-element.component'; diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts index 05b322c0e27..c5007a1e22e 100644 --- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts @@ -9,11 +9,11 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterLink } from '@angular/router'; +import { Item } from '@core/shared/item.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { ItemMetadataRepresentation } from '@core/shared/metadata-representation/item/item-metadata-representation.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { Item } from '../../../../core/shared/item.model'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; -import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model'; import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component'; import { PersonItemMetadataListElementComponent } from './person-item-metadata-list-element.component'; diff --git a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.spec.ts b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.spec.ts index 05c73f31b5f..c0cf716aebd 100644 --- a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.spec.ts @@ -9,12 +9,12 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Item } from '@core/shared/item.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { ItemMetadataRepresentation } from '@core/shared/metadata-representation/item/item-metadata-representation.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { Item } from '../../../../core/shared/item.model'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; -import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model'; import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock'; import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component'; import { ProjectItemMetadataListElementComponent } from './project-item-metadata-list-element.component'; diff --git a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts index d2dd577146a..bd90b098c0d 100644 --- a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts +++ b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component'; import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component'; diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts index af448acf974..4690653c39e 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts @@ -4,9 +4,9 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { ExternalSourceEntry } from '@core/shared/external-source-entry.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ExternalSourceEntry } from '../../../../../core/shared/external-source-entry.model'; import { ExternalSourceEntryListSubmissionElementComponent } from './external-source-entry-list-submission-element.component'; describe('ExternalSourceEntryListSubmissionElementComponent', () => { diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts index c9eea611184..528febbd4b8 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts @@ -3,12 +3,12 @@ import { Component, OnInit, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { ExternalSourceEntry } from '@core/shared/external-source-entry.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { Metadata } from '@core/shared/metadata.utils'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Context } from '../../../../../core/shared/context.model'; -import { ExternalSourceEntry } from '../../../../../core/shared/external-source-entry.model'; -import { MetadataValue } from '../../../../../core/shared/metadata.models'; -import { Metadata } from '../../../../../core/shared/metadata.utils'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts index 3b3a6011989..039fe8492b6 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts @@ -9,6 +9,21 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; +import { UUIDService } from '@core/shared/uuid.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; @@ -19,21 +34,6 @@ import { import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../../../core/cache/object-cache.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { CommunityDataService } from '../../../../../core/data/community-data.service'; -import { DefaultChangeAnalyzer } from '../../../../../core/data/default-change-analyzer.service'; -import { DSOChangeAnalyzer } from '../../../../../core/data/dso-change-analyzer.service'; -import { ItemDataService } from '../../../../../core/data/item-data.service'; -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { RelationshipDataService } from '../../../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Bitstream } from '../../../../../core/shared/bitstream.model'; -import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service'; -import { Item } from '../../../../../core/shared/item.model'; -import { UUIDService } from '../../../../../core/shared/uuid.service'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts index 98948ea6d02..1c0b2dd6335 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts @@ -5,6 +5,14 @@ import { OnInit, } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { ViewMode } from '@core/shared/view-mode.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { take } from 'rxjs/operators'; @@ -13,14 +21,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { ItemDataService } from '../../../../../core/data/item-data.service'; -import { RelationshipDataService } from '../../../../../core/data/relationship-data.service'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { MetadataValue } from '../../../../../core/shared/metadata.models'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts index d7fa1609286..7124fc3ec25 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts @@ -11,6 +11,21 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { AuthService } from '@core/auth/auth.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; +import { UUIDService } from '@core/shared/uuid.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; @@ -21,21 +36,6 @@ import { import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { REQUEST } from '../../../../../../express.tokens'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../../../core/cache/object-cache.service'; -import { CommunityDataService } from '../../../../../core/data/community-data.service'; -import { DefaultChangeAnalyzer } from '../../../../../core/data/default-change-analyzer.service'; -import { DSOChangeAnalyzer } from '../../../../../core/data/dso-change-analyzer.service'; -import { ItemDataService } from '../../../../../core/data/item-data.service'; -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { RelationshipDataService } from '../../../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Bitstream } from '../../../../../core/shared/bitstream.model'; -import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service'; -import { Item } from '../../../../../core/shared/item.model'; -import { UUIDService } from '../../../../../core/shared/uuid.service'; -import { XSRFService } from '../../../../../core/xsrf/xsrf.service'; import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock'; import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts index c0bc3214ce1..2bf5011f571 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts @@ -8,6 +8,13 @@ import { OnInit, } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { ViewMode } from '@core/shared/view-mode.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { take } from 'rxjs/operators'; @@ -15,13 +22,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { ItemDataService } from '../../../../../core/data/item-data.service'; -import { RelationshipDataService } from '../../../../../core/data/relationship-data.service'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { MetadataValue } from '../../../../../core/shared/metadata.models'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; diff --git a/src/app/external-log-in/decorators/external-login-method-entry.component.ts b/src/app/external-log-in/decorators/external-login-method-entry.component.ts index d4854cd4bb8..83b0a54b800 100644 --- a/src/app/external-log-in/decorators/external-login-method-entry.component.ts +++ b/src/app/external-log-in/decorators/external-login-method-entry.component.ts @@ -1,6 +1,5 @@ import { Inject } from '@angular/core'; - -import { Registration } from '../../core/shared/registration.model'; +import { Registration } from '@core/shared/registration.model'; /** * This component renders a form to complete the registration process diff --git a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.spec.ts b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.spec.ts index 5aa2b91653b..9510fab4236 100644 --- a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.spec.ts +++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.spec.ts @@ -12,6 +12,13 @@ import { ReactiveFormsModule, } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { NativeWindowService } from '@core/services/window.service'; +import { Registration } from '@core/shared/registration.model'; import { TranslateLoader, TranslateModule, @@ -19,13 +26,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../../core/auth/auth.service'; -import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { HardRedirectService } from '../../../core/services/hard-redirect.service'; -import { NativeWindowService } from '../../../core/services/window.service'; -import { Registration } from '../../../core/shared/registration.model'; import { MockWindow, NativeWindowMockFactory, diff --git a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts index 8f79b37dc54..93863b9532b 100644 --- a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts @@ -12,6 +12,19 @@ import { ReactiveFormsModule, Validators, } from '@angular/forms'; +import { AuthService } from '@core/auth/auth.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { Registration } from '@core/shared/registration.model'; import { TranslateModule, TranslateService, @@ -23,19 +36,6 @@ import { take, } from 'rxjs'; -import { AuthService } from '../../../core/auth/auth.service'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { HardRedirectService } from '../../../core/services/hard-redirect.service'; -import { - NativeWindowRef, - NativeWindowService, -} from '../../../core/services/window.service'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; -import { Registration } from '../../../core/shared/registration.model'; import { hasNoValue, hasValue, diff --git a/src/app/external-log-in/external-log-in/external-log-in.component.spec.ts b/src/app/external-log-in/external-log-in/external-log-in.component.spec.ts index 2d306bf2045..27a2ba69dff 100644 --- a/src/app/external-log-in/external-log-in/external-log-in.component.spec.ts +++ b/src/app/external-log-in/external-log-in/external-log-in.component.spec.ts @@ -7,6 +7,14 @@ import { import { FormBuilder } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { authReducer } from '@core/auth/auth.reducer'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthMethodsService } from '@core/auth/auth-methods.service'; +import { AuthMethod } from '@core/auth/models/auth.method'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; +import { AuthRegistrationType } from '@core/auth/models/auth.registration-type'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { Registration } from '@core/shared/registration.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { StoreModule } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; @@ -17,14 +25,6 @@ import { import { of } from 'rxjs'; import { storeModuleConfig } from '../../app.reducer'; -import { authReducer } from '../../core/auth/auth.reducer'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthMethodsService } from '../../core/auth/auth-methods.service'; -import { AuthMethod } from '../../core/auth/models/auth.method'; -import { AuthMethodType } from '../../core/auth/models/auth.method-type'; -import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; -import { MetadataValue } from '../../core/shared/metadata.models'; -import { Registration } from '../../core/shared/registration.model'; import { AuthMethodTypeComponent } from '../../shared/log-in/methods/auth-methods.type'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe'; diff --git a/src/app/external-log-in/external-log-in/external-log-in.component.ts b/src/app/external-log-in/external-log-in/external-log-in.component.ts index 4673e0ef096..25e3000de63 100644 --- a/src/app/external-log-in/external-log-in/external-log-in.component.ts +++ b/src/app/external-log-in/external-log-in/external-log-in.component.ts @@ -10,6 +10,11 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthMethodsService } from '@core/auth/auth-methods.service'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; +import { AuthRegistrationType } from '@core/auth/models/auth.registration-type'; +import { Registration } from '@core/shared/registration.model'; import { NgbModal, NgbModalRef, @@ -21,11 +26,6 @@ import { import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthMethodsService } from '../../core/auth/auth-methods.service'; -import { AuthMethodType } from '../../core/auth/models/auth.method-type'; -import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; -import { Registration } from '../../core/shared/registration.model'; import { AlertComponent } from '../../shared/alert/alert.component'; import { AlertType } from '../../shared/alert/alert-type'; import { diff --git a/src/app/external-log-in/guards/registration-token-guard.ts b/src/app/external-log-in/guards/registration-token-guard.ts index df49c712c6a..066b58017e2 100644 --- a/src/app/external-log-in/guards/registration-token-guard.ts +++ b/src/app/external-log-in/guards/registration-token-guard.ts @@ -5,16 +5,16 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { Registration } from '@core/shared/registration.model'; import { map, Observable, of, } from 'rxjs'; -import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { Registration } from '../../core/shared/registration.model'; import { hasValue } from '../../shared/empty.util'; /** diff --git a/src/app/external-log-in/guards/registration-token.guard.spec.ts b/src/app/external-log-in/guards/registration-token.guard.spec.ts index 2e914815fd2..a3b87879877 100644 --- a/src/app/external-log-in/guards/registration-token.guard.spec.ts +++ b/src/app/external-log-in/guards/registration-token.guard.spec.ts @@ -7,15 +7,15 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Registration } from '@core/shared/registration.model'; import { Observable, of, } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { Registration } from '../../core/shared/registration.model'; import { RouterMock } from '../../shared/mocks/router.mock'; import { createFailedRemoteDataObject$, diff --git a/src/app/external-log-in/models/registration-data.mock.model.ts b/src/app/external-log-in/models/registration-data.mock.model.ts index 43efe5a0f31..4e1e402b320 100644 --- a/src/app/external-log-in/models/registration-data.mock.model.ts +++ b/src/app/external-log-in/models/registration-data.mock.model.ts @@ -1,6 +1,6 @@ -import { AuthMethodType } from '../../core/auth/models/auth.method-type'; -import { MetadataValue } from '../../core/shared/metadata.models'; -import { Registration } from '../../core/shared/registration.model'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { Registration } from '@core/shared/registration.model'; export const mockRegistrationDataModel: Registration = Object.assign( new Registration(), diff --git a/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts index 1d1cc43a917..5f17bee70eb 100644 --- a/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts +++ b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts @@ -9,9 +9,9 @@ import { FormGroup, ReactiveFormsModule, } from '@angular/forms'; +import { Registration } from '@core/shared/registration.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Registration } from '../../../core/shared/registration.model'; import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe'; import { ExternalLoginMethodEntryComponent } from '../../decorators/external-login-method-entry.component'; diff --git a/src/app/external-log-in/resolvers/registration-data.resolver.spec.ts b/src/app/external-log-in/resolvers/registration-data.resolver.spec.ts index 58b593c8885..79783972f0b 100644 --- a/src/app/external-log-in/resolvers/registration-data.resolver.spec.ts +++ b/src/app/external-log-in/resolvers/registration-data.resolver.spec.ts @@ -3,9 +3,9 @@ import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { Registration } from '@core/shared/registration.model'; -import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; -import { Registration } from '../../core/shared/registration.model'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$, diff --git a/src/app/external-log-in/resolvers/registration-data.resolver.ts b/src/app/external-log-in/resolvers/registration-data.resolver.ts index 23931c22f15..a41a4f3b33e 100644 --- a/src/app/external-log-in/resolvers/registration-data.resolver.ts +++ b/src/app/external-log-in/resolvers/registration-data.resolver.ts @@ -4,12 +4,12 @@ import { Resolve, RouterStateSnapshot, } from '@angular/router'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { Registration } from '@core/shared/registration.model'; import { Observable } from 'rxjs'; -import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { Registration } from '../../core/shared/registration.model'; import { hasValue } from '../../shared/empty.util'; @Injectable({ diff --git a/src/app/external-log-in/services/external-login.service.spec.ts b/src/app/external-log-in/services/external-login.service.spec.ts index debf843ddf5..1aee1113241 100644 --- a/src/app/external-log-in/services/external-login.service.spec.ts +++ b/src/app/external-log-in/services/external-login.service.spec.ts @@ -5,16 +5,16 @@ import { tick, } from '@angular/core/testing'; import { Router } from '@angular/router'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { RemoteData } from '@core/data/remote-data'; +import { NoContent } from '@core/shared/NoContent.model'; +import { Registration } from '@core/shared/registration.model'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateService } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { Registration } from '../../core/shared/registration.model'; import { RouterMock } from '../../shared/mocks/router.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { diff --git a/src/app/external-log-in/services/external-login.service.ts b/src/app/external-log-in/services/external-login.service.ts index a76e66a4977..396112512a0 100644 --- a/src/app/external-log-in/services/external-login.service.ts +++ b/src/app/external-log-in/services/external-login.service.ts @@ -1,5 +1,9 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { RemoteData } from '@core/data/remote-data'; +import { NoContent } from '@core/shared/NoContent.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { select, Store, @@ -14,10 +18,6 @@ import { AuthMethod } from 'src/app/core/auth/models/auth.method'; import { getAuthenticationMethods } from 'src/app/core/auth/selectors'; import { CoreState } from 'src/app/core/core-state.model'; -import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { NotificationsService } from '../../shared/notifications/notifications.service'; @Injectable({ diff --git a/src/app/external-login-page/external-login-page.component.spec.ts b/src/app/external-login-page/external-login-page.component.spec.ts index 6f5c792bb88..c81dbcb42da 100644 --- a/src/app/external-login-page/external-login-page.component.spec.ts +++ b/src/app/external-login-page/external-login-page.component.spec.ts @@ -4,13 +4,13 @@ import { TestBed, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { Registration } from '@core/shared/registration.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Registration } from '../core/shared/registration.model'; import { ExternalLogInComponent } from '../external-log-in/external-log-in/external-log-in.component'; import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; import { ExternalLoginPageComponent } from './external-login-page.component'; diff --git a/src/app/external-login-page/external-login-page.component.ts b/src/app/external-login-page/external-login-page.component.ts index d09e38472d8..cdd51d98238 100644 --- a/src/app/external-login-page/external-login-page.component.ts +++ b/src/app/external-login-page/external-login-page.component.ts @@ -4,6 +4,9 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; +import { RemoteData } from '@core/data/remote-data'; +import { Registration } from '@core/shared/registration.model'; import { TranslateModule } from '@ngx-translate/core'; import { first, @@ -12,9 +15,6 @@ import { tap, } from 'rxjs'; -import { AuthMethodType } from '../core/auth/models/auth.method-type'; -import { RemoteData } from '../core/data/remote-data'; -import { Registration } from '../core/shared/registration.model'; import { ExternalLogInComponent } from '../external-log-in/external-log-in/external-log-in.component'; import { AlertComponent } from '../shared/alert/alert.component'; import { AlertType } from '../shared/alert/alert-type'; diff --git a/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts index ccd47fb28e8..9393aa6a0de 100644 --- a/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts +++ b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts @@ -4,6 +4,8 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Registration } from '@core/shared/registration.model'; import { first, map, @@ -11,8 +13,6 @@ import { tap, } from 'rxjs'; -import { RemoteData } from '../core/data/remote-data'; -import { Registration } from '../core/shared/registration.model'; import { AlertComponent } from '../shared/alert/alert.component'; import { AlertType } from '../shared/alert/alert-type'; import { hasNoValue } from '../shared/empty.util'; diff --git a/src/app/external-login-review-account-info-page/helpers/review-account.guard.spec.ts b/src/app/external-login-review-account-info-page/helpers/review-account.guard.spec.ts index ccd08577d19..14d52527d03 100644 --- a/src/app/external-login-review-account-info-page/helpers/review-account.guard.spec.ts +++ b/src/app/external-login-review-account-info-page/helpers/review-account.guard.spec.ts @@ -10,15 +10,15 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthRegistrationType } from '@core/auth/models/auth.registration-type'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { Registration } from '@core/shared/registration.model'; import { Observable, of, } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; -import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; -import { Registration } from '../../core/shared/registration.model'; import { RouterMock } from '../../shared/mocks/router.mock'; import { createFailedRemoteDataObject$, diff --git a/src/app/external-login-review-account-info-page/helpers/review-account.guard.ts b/src/app/external-login-review-account-info-page/helpers/review-account.guard.ts index 7d175799c20..fe45cfd8916 100644 --- a/src/app/external-login-review-account-info-page/helpers/review-account.guard.ts +++ b/src/app/external-login-review-account-info-page/helpers/review-account.guard.ts @@ -5,6 +5,12 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthRegistrationType } from '@core/auth/models/auth.registration-type'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { Registration } from '@core/shared/registration.model'; import { catchError, mergeMap, @@ -13,12 +19,6 @@ import { tap, } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; -import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { Registration } from '../../core/shared/registration.model'; import { hasValue } from '../../shared/empty.util'; /** diff --git a/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts index e7e351fee81..99dcd7a9279 100644 --- a/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts +++ b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts @@ -8,6 +8,13 @@ import { } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { Router } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { RemoteData } from '@core/data/remote-data'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { NativeWindowService } from '@core/services/window.service'; +import { Registration } from '@core/shared/registration.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -20,13 +27,6 @@ import { Subscription, } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { HardRedirectService } from '../../core/services/hard-redirect.service'; -import { NativeWindowService } from '../../core/services/window.service'; -import { Registration } from '../../core/shared/registration.model'; import { ExternalLoginService } from '../../external-log-in/services/external-login.service'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; import { NativeWindowMockFactory } from '../../shared/mocks/mock-native-window-ref'; diff --git a/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts index a1f34dfe498..f82cb0108ad 100644 --- a/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts @@ -8,6 +8,17 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthRegistrationType } from '@core/auth/models/auth.registration-type'; +import { RemoteData } from '@core/data/remote-data'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; +import { Registration } from '@core/shared/registration.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -26,17 +37,6 @@ import { tap, } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; -import { RemoteData } from '../../core/data/remote-data'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { HardRedirectService } from '../../core/services/hard-redirect.service'; -import { - NativeWindowRef, - NativeWindowService, -} from '../../core/services/window.service'; -import { Registration } from '../../core/shared/registration.model'; import { ExternalLoginService } from '../../external-log-in/services/external-login.service'; import { AlertComponent } from '../../shared/alert/alert.component'; import { AlertType } from '../../shared/alert/alert-type'; diff --git a/src/app/footer/footer.component.spec.ts b/src/app/footer/footer.component.spec.ts index 8096cb90665..9eb0be8e0a9 100644 --- a/src/app/footer/footer.component.spec.ts +++ b/src/app/footer/footer.component.spec.ts @@ -7,13 +7,13 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { NotifyInfoService } from '@core/coar-notify/notify-info/notify-info.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../config/app-config.interface'; import { environment } from '../../environments/environment.test'; -import { NotifyInfoService } from '../core/coar-notify/notify-info/notify-info.service'; -import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; import { ActivatedRouteStub } from '../shared/testing/active-router.stub'; import { AuthorizationDataServiceStub } from '../shared/testing/authorization-service.stub'; import { FooterComponent } from './footer.component'; diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts index 17da24076ba..15a1d61889a 100644 --- a/src/app/footer/footer.component.ts +++ b/src/app/footer/footer.component.ts @@ -9,6 +9,9 @@ import { Optional, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { NotifyInfoService } from '@core/coar-notify/notify-info/notify-info.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, @@ -19,9 +22,6 @@ import { APP_CONFIG, AppConfig, } from '../../config/app-config.interface'; -import { NotifyInfoService } from '../core/coar-notify/notify-info/notify-info.service'; -import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { OrejimeService } from '../shared/cookies/orejime.service'; import { hasValue } from '../shared/empty.util'; diff --git a/src/app/forbidden/forbidden.component.ts b/src/app/forbidden/forbidden.component.ts index 26cf9b51b77..3218748594e 100644 --- a/src/app/forbidden/forbidden.component.ts +++ b/src/app/forbidden/forbidden.component.ts @@ -3,11 +3,10 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { ServerResponseService } from '@core/services/server-response.service'; import { TranslateModule } from '@ngx-translate/core'; -import { AuthService } from '../core/auth/auth.service'; -import { ServerResponseService } from '../core/services/server-response.service'; - /** * This component representing the `Forbidden` DSpace page. */ diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts index 04c35f416cc..130ce350243 100644 --- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts +++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts @@ -16,14 +16,14 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthenticateAction } from '@core/auth/auth.actions'; +import { CoreState } from '@core/core-state.model'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { Registration } from '@core/shared/registration.model'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthenticateAction } from '../../core/auth/auth.actions'; -import { CoreState } from '../../core/core-state.model'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { Registration } from '../../core/shared/registration.model'; import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts index 58892d0c12b..0b04b649bd5 100644 --- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts +++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts @@ -7,6 +7,16 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthenticateAction } from '@core/auth/auth.actions'; +import { CoreState } from '@core/core-state.model'; +import { RemoteData } from '@core/data/remote-data'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { Registration } from '@core/shared/registration.model'; import { Store } from '@ngrx/store'; import { TranslateModule, @@ -15,16 +25,6 @@ import { import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AuthenticateAction } from '../../core/auth/auth.actions'; -import { CoreState } from '../../core/core-state.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../core/shared/operators'; -import { Registration } from '../../core/shared/registration.model'; import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/header/header.component.spec.ts b/src/app/header/header.component.spec.ts index ca1e3c4db99..8a75c44c49b 100644 --- a/src/app/header/header.component.spec.ts +++ b/src/app/header/header.component.spec.ts @@ -8,10 +8,10 @@ import { ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; +import { LocaleService } from '@core/locale/locale.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { LocaleService } from '../core/locale/locale.service'; import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navbar.component'; import { ThemedAuthNavMenuComponent } from '../shared/auth-nav-menu/themed-auth-nav-menu.component'; import { HostWindowService } from '../shared/host-window.service'; diff --git a/src/app/health-page/health-page-routes.ts b/src/app/health-page/health-page-routes.ts index f87cf8e3d3d..92bf841374c 100644 --- a/src/app/health-page/health-page-routes.ts +++ b/src/app/health-page/health-page-routes.ts @@ -1,7 +1,7 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; +import { siteAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { siteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; import { HealthPageComponent } from './health-page.component'; export const ROUTES: Route[] = [ diff --git a/src/app/health-page/health-page.component.spec.ts b/src/app/health-page/health-page.component.spec.ts index 7a62471c787..e8994194db2 100644 --- a/src/app/health-page/health-page.component.spec.ts +++ b/src/app/health-page/health-page.component.spec.ts @@ -4,6 +4,7 @@ import { TestBed, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { RawRestResponse } from '@core/dspace-rest/raw-rest-response.model'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -11,7 +12,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RawRestResponse } from '../core/dspace-rest/raw-rest-response.model'; import { HealthInfoResponseObj, HealthResponseObj, diff --git a/src/app/health-page/health.service.ts b/src/app/health-page/health.service.ts index bbe8e3f562f..72b1b4e3e33 100644 --- a/src/app/health-page/health.service.ts +++ b/src/app/health-page/health.service.ts @@ -1,14 +1,13 @@ import { Injectable } from '@angular/core'; +import { DspaceRestService } from '@core/dspace-rest/dspace-rest.service'; +import { RawRestResponse } from '@core/dspace-rest/raw-rest-response.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { Observable } from 'rxjs'; import { map, switchMap, } from 'rxjs/operators'; -import { DspaceRestService } from '../core/dspace-rest/dspace-rest.service'; -import { RawRestResponse } from '../core/dspace-rest/raw-rest-response.model'; -import { HALEndpointService } from '../core/shared/hal-endpoint.service'; - @Injectable({ providedIn: 'root', }) diff --git a/src/app/home-page/home-coar/home-coar.component.ts b/src/app/home-page/home-coar/home-coar.component.ts index 8f92efdc4f9..f1831cc0bea 100644 --- a/src/app/home-page/home-coar/home-coar.component.ts +++ b/src/app/home-page/home-coar/home-coar.component.ts @@ -6,18 +6,18 @@ import { OnInit, PLATFORM_ID, } from '@angular/core'; +import { NotifyInfoService } from '@core/coar-notify/notify-info/notify-info.service'; +import { + LinkDefinition, + LinkHeadService, +} from '@core/services/link-head.service'; +import { ServerResponseService } from '@core/services/server-response.service'; import { of, Subscription, } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service'; -import { - LinkDefinition, - LinkHeadService, -} from '../../core/services/link-head.service'; -import { ServerResponseService } from '../../core/services/server-response.service'; import { isNotEmpty } from '../../shared/empty.util'; @Component({ diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts index f262581e595..4b099b58040 100644 --- a/src/app/home-page/home-page.component.ts +++ b/src/app/home-page/home-page.component.ts @@ -8,6 +8,7 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Site } from '@core/shared/site.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -16,7 +17,6 @@ import { AppConfig, } from 'src/config/app-config.interface'; -import { Site } from '../core/shared/site.model'; import { SuggestionsPopupComponent } from '../notifications/suggestions/popup/suggestions-popup.component'; import { ThemedConfigurationSearchPageComponent } from '../search-page/themed-configuration-search-page.component'; import { ThemedSearchFormComponent } from '../shared/search-form/themed-search-form.component'; diff --git a/src/app/home-page/home-page.resolver.ts b/src/app/home-page/home-page.resolver.ts index 76f27edbf14..dd8bdc2bc6c 100644 --- a/src/app/home-page/home-page.resolver.ts +++ b/src/app/home-page/home-page.resolver.ts @@ -4,12 +4,11 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { SiteDataService } from '@core/data/site-data.service'; +import { Site } from '@core/shared/site.model'; import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; -import { SiteDataService } from '../core/data/site-data.service'; -import { Site } from '../core/shared/site.model'; - export const homePageResolver: ResolveFn = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts index 2e9f565d8ba..a061de76b2d 100644 --- a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts +++ b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts @@ -3,17 +3,17 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../config/app-config.interface'; import { environment } from '../../../environments/environment'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { SearchService } from '../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model'; diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts index 1883a959b18..6e268d67618 100644 --- a/src/app/home-page/recent-item-list/recent-item-list.component.ts +++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts @@ -12,6 +12,19 @@ import { OnInit, PLATFORM_ID, } from '@angular/core'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { Item } from '@core/shared/item.model'; +import { toDSpaceObjectListRD } from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; @@ -20,19 +33,6 @@ import { AppConfig, } from '../../../config/app-config.interface'; import { environment } from '../../../environments/environment'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model'; -import { Item } from '../../core/shared/item.model'; -import { toDSpaceObjectListRD } from '../../core/shared/operators'; -import { SearchService } from '../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { fadeIn, fadeInOut, diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts index 3b397846ccb..d7c7a54987a 100644 --- a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts +++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts @@ -7,22 +7,22 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { Community } from '@core/shared/community.model'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment.test'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { GroupDataService } from '../../core/eperson/group-data.service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { LinkHeadService } from '../../core/services/link-head.service'; -import { Community } from '../../core/shared/community.model'; -import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; -import { PageInfo } from '../../core/shared/page-info.model'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { HostWindowService } from '../../shared/host-window.service'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service'; diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts index 609bb6a8700..9a09905581f 100644 --- a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts +++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts @@ -6,6 +6,15 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Community } from '@core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -18,15 +27,6 @@ import { AppConfig, } from 'src/config/app-config.interface'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { Community } from '../../core/shared/community.model'; import { fadeInOut } from '../../shared/animations/fade'; import { hasValue } from '../../shared/empty.util'; import { ErrorComponent } from '../../shared/error/error.component'; diff --git a/src/app/import-external-page/import-external-page-routes.ts b/src/app/import-external-page/import-external-page-routes.ts index 294d4160fa1..dfaf73be2aa 100644 --- a/src/app/import-external-page/import-external-page-routes.ts +++ b/src/app/import-external-page/import-external-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; import { ThemedSubmissionImportExternalComponent } from '../submission/import-external/themed-submission-import-external.component'; export const ROUTES: Route[] = [ diff --git a/src/app/import-external-page/import-external-page.component.spec.ts b/src/app/import-external-page/import-external-page.component.spec.ts index 60e17d288c1..205d0b62fe1 100644 --- a/src/app/import-external-page/import-external-page.component.spec.ts +++ b/src/app/import-external-page/import-external-page.component.spec.ts @@ -5,8 +5,8 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; -import { SearchConfigurationService } from '../core/shared/search/search-configuration.service'; import { getMockThemeService } from '../shared/mocks/theme-service.mock'; import { ActivatedRouteStub } from '../shared/testing/active-router.stub'; import { ThemeService } from '../shared/theme-support/theme.service'; diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts index c4a315a3775..4b05a374a51 100644 --- a/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts +++ b/src/app/info/accessibility-settings/accessibility-settings.component.spec.ts @@ -4,13 +4,13 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { AuthService } from '@core/auth/auth.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { ContextHelpDirective } from 'src/app/shared/context-help.directive'; import { AccessibilitySettingsService } from '../../accessibility/accessibility-settings.service'; import { getAccessibilitySettingsServiceStub } from '../../accessibility/accessibility-settings.service.stub'; -import { AuthService } from '../../core/auth/auth.service'; import { OrejimeService } from '../../shared/cookies/orejime.service'; import { OrejimeServiceStub } from '../../shared/cookies/orejime.service.stub'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.ts b/src/app/info/accessibility-settings/accessibility-settings.component.ts index 7dda13a2178..f3d10a2cdea 100644 --- a/src/app/info/accessibility-settings/accessibility-settings.component.ts +++ b/src/app/info/accessibility-settings/accessibility-settings.component.ts @@ -5,6 +5,7 @@ import { OnInit, } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { AuthService } from '@core/auth/auth.service'; import { TranslateModule, TranslateService, @@ -26,7 +27,6 @@ import { AccessibilitySettingsFormValues, AccessibilitySettingsService, } from '../../accessibility/accessibility-settings.service'; -import { AuthService } from '../../core/auth/auth.service'; import { AlertComponent } from '../../shared/alert/alert.component'; import { ContextHelpDirective } from '../../shared/context-help.directive'; import { OrejimeService } from '../../shared/cookies/orejime.service'; diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts index e4571bba931..58308412b76 100644 --- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts +++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts @@ -9,13 +9,13 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { LogOutAction } from '@core/auth/auth.actions'; +import { AuthService } from '@core/auth/auth.service'; +import { EndUserAgreementService } from '@core/end-user-agreement/end-user-agreement.service'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { LogOutAction } from '../../core/auth/auth.actions'; -import { AuthService } from '../../core/auth/auth.service'; -import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts index 3536cf9da16..01ae3b0db5b 100644 --- a/src/app/info/end-user-agreement/end-user-agreement.component.ts +++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts @@ -7,6 +7,9 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { LogOutAction } from '@core/auth/auth.actions'; +import { AuthService } from '@core/auth/auth.service'; +import { EndUserAgreementService } from '@core/end-user-agreement/end-user-agreement.service'; import { Store } from '@ngrx/store'; import { TranslateModule, @@ -20,9 +23,6 @@ import { } from 'rxjs/operators'; import { AppState } from '../../app.reducer'; -import { LogOutAction } from '../../core/auth/auth.actions'; -import { AuthService } from '../../core/auth/auth.service'; -import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { isNotEmpty } from '../../shared/empty.util'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts index 56275ad5a35..99bd395bb19 100644 --- a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts +++ b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts @@ -10,14 +10,14 @@ import { import { UntypedFormBuilder } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { FeedbackDataService } from '@core/feedback/feedback-data.service'; +import { Feedback } from '@core/feedback/models/feedback.model'; +import { RouteService } from '@core/services/route.service'; +import { NativeWindowService } from '@core/services/window.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../../core/auth/auth.service'; -import { FeedbackDataService } from '../../../core/feedback/feedback-data.service'; -import { Feedback } from '../../../core/feedback/models/feedback.model'; -import { RouteService } from '../../../core/services/route.service'; -import { NativeWindowService } from '../../../core/services/window.service'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref'; import { RouterMock } from '../../../shared/mocks/router.mock'; diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts index 7c27609b33f..9c8ec5b05a4 100644 --- a/src/app/info/feedback/feedback-form/feedback-form.component.ts +++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts @@ -11,6 +11,18 @@ import { Validators, } from '@angular/forms'; import { Router } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { RemoteData } from '@core/data/remote-data'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { FeedbackDataService } from '@core/feedback/feedback-data.service'; +import { RouteService } from '@core/services/route.service'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { TranslateModule, TranslateService, @@ -18,18 +30,6 @@ import { import { take } from 'rxjs/operators'; import { getHomePageRoute } from '../../../app-routing-paths'; -import { AuthService } from '../../../core/auth/auth.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { FeedbackDataService } from '../../../core/feedback/feedback-data.service'; -import { RouteService } from '../../../core/services/route.service'; -import { - NativeWindowRef, - NativeWindowService, -} from '../../../core/services/window.service'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import { URLCombiner } from '../../../core/url-combiner/url-combiner'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { ErrorComponent } from '../../../shared/error/error.component'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; diff --git a/src/app/info/info-routes.ts b/src/app/info/info-routes.ts index 4b7decb49c5..6fd86984c9d 100644 --- a/src/app/info/info-routes.ts +++ b/src/app/info/info-routes.ts @@ -2,11 +2,11 @@ import { Route, Routes, } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; +import { notifyInfoGuard } from '@core/coar-notify/notify-info/notify-info.guard'; +import { feedbackGuard } from '@core/feedback/feedback.guard'; import { environment } from '../../environments/environment'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { notifyInfoGuard } from '../core/coar-notify/notify-info/notify-info.guard'; -import { feedbackGuard } from '../core/feedback/feedback.guard'; import { hasValue } from '../shared/empty.util'; import { AccessibilitySettingsComponent } from './accessibility-settings/accessibility-settings.component'; import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component'; diff --git a/src/app/info/notify-info/notify-info.component.spec.ts b/src/app/info/notify-info/notify-info.component.spec.ts index ecd584cfb0d..7748b34bfdf 100644 --- a/src/app/info/notify-info/notify-info.component.spec.ts +++ b/src/app/info/notify-info/notify-info.component.spec.ts @@ -3,10 +3,10 @@ import { TestBed, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { NotifyInfoService } from '@core/coar-notify/notify-info/notify-info.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { NotifyInfoComponent } from './notify-info.component'; diff --git a/src/app/info/notify-info/notify-info.component.ts b/src/app/info/notify-info/notify-info.component.ts index 1989e56174d..2a5c4e46770 100644 --- a/src/app/info/notify-info/notify-info.component.ts +++ b/src/app/info/notify-info/notify-info.component.ts @@ -4,14 +4,13 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { NotifyInfoService } from '@core/coar-notify/notify-info/notify-info.service'; import { TranslateModule } from '@ngx-translate/core'; import { map, Observable, } from 'rxjs'; -import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service'; - @Component({ selector: 'ds-notify-info', templateUrl: './notify-info.component.html', diff --git a/src/app/init.service.spec.ts b/src/app/init.service.spec.ts index 1e22ae2113e..77e0b3b8094 100644 --- a/src/app/init.service.spec.ts +++ b/src/app/init.service.spec.ts @@ -12,6 +12,10 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { authReducer } from '@core/auth/auth.reducer'; +import { AuthService } from '@core/auth/auth.service'; +import { LocaleService } from '@core/locale/locale.service'; +import { RouteService } from '@core/services/route.service'; import { Store, StoreModule, @@ -28,10 +32,6 @@ import { AppComponent } from './app.component'; import { getMockLocaleService } from './app.component.spec'; import { storeModuleConfig } from './app.reducer'; import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service'; -import { authReducer } from './core/auth/auth.reducer'; -import { AuthService } from './core/auth/auth.service'; -import { LocaleService } from './core/locale/locale.service'; -import { RouteService } from './core/services/route.service'; import { CorrelationIdService } from './correlation-id/correlation-id.service'; import { InitService } from './init.service'; import { MenuService } from './shared/menu/menu.service'; @@ -46,9 +46,9 @@ import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider'; import objectContaining = jasmine.objectContaining; import createSpyObj = jasmine.createSpyObj; import SpyObj = jasmine.SpyObj; +import { HeadTagService } from '@core/metadata/head-tag.service'; import { getTestScheduler } from 'jasmine-marbles'; -import { HeadTagService } from './core/metadata/head-tag.service'; import { HeadTagServiceMock } from './shared/mocks/head-tag-service.mock'; let spy: SpyObj; diff --git a/src/app/init.service.ts b/src/app/init.service.ts index 37956bce6c4..5e56eb9ad27 100644 --- a/src/app/init.service.ts +++ b/src/app/init.service.ts @@ -13,6 +13,11 @@ import { TransferState, Type, } from '@angular/core'; +import { CheckAuthenticationTokenAction } from '@core/auth/auth.actions'; +import { isAuthenticationBlocking } from '@core/auth/selectors'; +import { LAZY_DATA_SERVICES } from '@core/data-services-map'; +import { LocaleService } from '@core/locale/locale.service'; +import { HeadTagService } from '@core/metadata/head-tag.service'; import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core'; import { select, @@ -34,11 +39,6 @@ import { import { environment } from '../environments/environment'; import { AppState } from './app.reducer'; import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service'; -import { CheckAuthenticationTokenAction } from './core/auth/auth.actions'; -import { isAuthenticationBlocking } from './core/auth/selectors'; -import { LAZY_DATA_SERVICES } from './core/data-services-map'; -import { LocaleService } from './core/locale/locale.service'; -import { HeadTagService } from './core/metadata/head-tag.service'; import { CorrelationIdService } from './correlation-id/correlation-id.service'; import { dsDynamicFormControlMapFn } from './shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn'; import { MenuService } from './shared/menu/menu.service'; diff --git a/src/app/item-page/alerts/item-alerts.component.spec.ts b/src/app/item-page/alerts/item-alerts.component.spec.ts index ef788c47ecb..e939db8d178 100644 --- a/src/app/item-page/alerts/item-alerts.component.spec.ts +++ b/src/app/item-page/alerts/item-alerts.component.spec.ts @@ -7,14 +7,14 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; +import { CorrectionTypeDataService } from '@core/submission/correctiontype-data.service'; +import { CorrectionType } from '@core/submission/models/correctiontype.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../core/shared/item.model'; -import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service'; -import { CorrectionType } from '../../core/submission/models/correctiontype.model'; import { DsoWithdrawnReinstateModalService, REQUEST_REINSTATE, diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts index 04e8c947676..d40c95dd6c6 100644 --- a/src/app/item-page/alerts/item-alerts.component.ts +++ b/src/app/item-page/alerts/item-alerts.component.ts @@ -6,6 +6,13 @@ import { SimpleChanges, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { CorrectionTypeDataService } from '@core/submission/correctiontype-data.service'; +import { CorrectionType } from '@core/submission/models/correctiontype.model'; import { TranslateModule } from '@ngx-translate/core'; import { combineLatest, @@ -14,13 +21,6 @@ import { } from 'rxjs'; import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Item } from '../../core/shared/item.model'; -import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service'; -import { CorrectionType } from '../../core/submission/models/correctiontype.model'; import { AlertComponent } from '../../shared/alert/alert.component'; import { AlertType } from '../../shared/alert/alert-type'; import { diff --git a/src/app/item-page/alerts/themed-item-alerts.component.ts b/src/app/item-page/alerts/themed-item-alerts.component.ts index 15d324af182..2d6c510c163 100644 --- a/src/app/item-page/alerts/themed-item-alerts.component.ts +++ b/src/app/item-page/alerts/themed-item-alerts.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../core/shared/item.model'; import { ThemedComponent } from '../../shared/theme-support/themed.component'; import { ItemAlertsComponent } from './item-alerts.component'; diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts index f3fadf6ab70..6f9a3f05e5c 100644 --- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts +++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts @@ -16,25 +16,25 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RestResponse } from '@core/cache/response.models'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ItemRequestDataService } from '@core/data/item-request-data.service'; +import { RequestService } from '@core/data/request.service'; +import { RequestEntry } from '@core/data/request-entry.model'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; +import { ItemRequest } from '@core/shared/item-request.model'; import { Store } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; -import { AuthService } from '../../../core/auth/auth.service'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RestResponse } from '../../../core/cache/response.models'; -import { BitstreamDataService } from '../../../core/data/bitstream-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { ItemRequestDataService } from '../../../core/data/item-request-data.service'; -import { RequestService } from '../../../core/data/request.service'; -import { RequestEntry } from '../../../core/data/request-entry.model'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { Item } from '../../../core/shared/item.model'; -import { ITEM } from '../../../core/shared/item.resource-type'; -import { ItemRequest } from '../../../core/shared/item-request.model'; import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock'; import { getMockRequestService } from '../../../shared/mocks/request.service.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts index bb7b809ad2c..303129a936a 100644 --- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts +++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts @@ -21,6 +21,21 @@ import { Router, RouterLink, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ItemRequestDataService } from '@core/data/item-request-data.service'; +import { ProofOfWorkCaptchaDataService } from '@core/data/proof-of-work-captcha-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Item } from '@core/shared/item.model'; +import { ItemRequest } from '@core/shared/item-request.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -42,21 +57,6 @@ import { getBitstreamDownloadRoute, getForbiddenRoute, } from '../../../app-routing-paths'; -import { AuthService } from '../../../core/auth/auth.service'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../core/data/bitstream-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { ItemRequestDataService } from '../../../core/data/item-request-data.service'; -import { ProofOfWorkCaptchaDataService } from '../../../core/data/proof-of-work-captcha-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { Item } from '../../../core/shared/item.model'; -import { ItemRequest } from '../../../core/shared/item-request.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { hasValue, diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts index 78c8c0b0a49..9a91eb655a2 100644 --- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts +++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts @@ -10,20 +10,20 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { BundleDataService } from '@core/data/bundle-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RequestService } from '@core/data/request.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Bundle } from '@core/shared/bundle.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { environment } from '../../../../environments/environment'; -import { AuthService } from '../../../core/auth/auth.service'; -import { BundleDataService } from '../../../core/data/bundle-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { RequestService } from '../../../core/data/request.service'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { Bundle } from '../../../core/shared/bundle.model'; -import { Item } from '../../../core/shared/item.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; import { DsoInputSuggestionsComponent } from '../../../shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts index e33077bd172..46d3f109e89 100644 --- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts +++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts @@ -10,6 +10,19 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BundleDataService } from '@core/data/bundle-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { Bundle } from '@core/shared/bundle.model'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -27,19 +40,6 @@ import { import { environment } from '../../../../environments/environment'; import { getBitstreamModuleRoute } from '../../../app-routing-paths'; -import { AuthService } from '../../../core/auth/auth.service'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { BundleDataService } from '../../../core/data/bundle-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { Bundle } from '../../../core/shared/bundle.model'; -import { Item } from '../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; import { hasValue, isEmpty, diff --git a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts index 254c44ad467..cc3a85f75cf 100644 --- a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts +++ b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts @@ -9,6 +9,13 @@ import { Data, Router, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { FieldUpdate } from '@core/data/object-updates/field-update.model'; +import { FieldUpdates } from '@core/data/object-updates/field-updates.model'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getAllSucceededRemoteData } from '@core/shared/operators'; import { TranslateService } from '@ngx-translate/core'; import { combineLatest as observableCombineLatest, @@ -23,13 +30,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../../environments/environment'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { FieldUpdate } from '../../../core/data/object-updates/field-update.model'; -import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { getAllSucceededRemoteData } from '../../../core/shared/operators'; import { hasValue } from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component'; diff --git a/src/app/item-page/edit-item-page/edit-item-operators.spec.ts b/src/app/item-page/edit-item-page/edit-item-operators.spec.ts index 777c09813db..6383fa3a8c0 100644 --- a/src/app/item-page/edit-item-page/edit-item-operators.spec.ts +++ b/src/app/item-page/edit-item-page/edit-item-operators.spec.ts @@ -1,7 +1,7 @@ +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; import { hot } from 'jasmine-marbles'; -import { RemoteData } from '../../core/data/remote-data'; -import { Item } from '../../core/shared/item.model'; import { isNotEmpty } from '../../shared/empty.util'; import { createFailedRemoteDataObject, diff --git a/src/app/item-page/edit-item-page/edit-item-operators.ts b/src/app/item-page/edit-item-page/edit-item-operators.ts index dea90d90f13..bbe9d0fb4a3 100644 --- a/src/app/item-page/edit-item-page/edit-item-operators.ts +++ b/src/app/item-page/edit-item-page/edit-item-operators.ts @@ -1,9 +1,8 @@ +import { RemoteData } from '@core/data/remote-data'; +import { getAllSucceededRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { first } from 'rxjs/operators'; -import { RemoteData } from '../../core/data/remote-data'; -import { getAllSucceededRemoteData } from '../../core/shared/operators'; - /** * Return first Observable of a RemoteData object that complies to the provided predicate * @param predicate diff --git a/src/app/item-page/edit-item-page/edit-item-page-routes.ts b/src/app/item-page/edit-item-page/edit-item-page-routes.ts index a7189f98881..681884cd638 100644 --- a/src/app/item-page/edit-item-page/edit-item-page-routes.ts +++ b/src/app/item-page/edit-item-page/edit-item-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component'; import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component'; import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component'; diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts b/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts index 144c9015f3f..ea7b0bc9d6d 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts @@ -16,6 +16,7 @@ import { RouterModule, RouterStateSnapshot, } from '@angular/router'; +import { Item } from '@core/shared/item.model'; import { TranslateLoader, TranslateModule, @@ -25,7 +26,6 @@ import { of, } from 'rxjs'; -import { Item } from '../../core/shared/item.model'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { EditItemPageComponent } from './edit-item-page.component'; diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.ts b/src/app/item-page/edit-item-page/edit-item-page.component.ts index e0fc5f577ee..12b51051dda 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.component.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.component.ts @@ -17,6 +17,8 @@ import { RouterLink, RouterOutlet, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -26,8 +28,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RemoteData } from '../../core/data/remote-data'; -import { Item } from '../../core/shared/item.model'; import { fadeIn, fadeInOut, diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts index 926afad490d..aea37f15114 100644 --- a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts +++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts @@ -4,12 +4,12 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component'; @Component({ diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts index 4db209cedf3..e929f9f60a4 100644 --- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts @@ -10,14 +10,14 @@ import { } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Bundle } from '@core/shared/bundle.model'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { Bundle } from '../../../core/shared/bundle.model'; -import { Item } from '../../../core/shared/item.model'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { getMockLinkService } from '../../../shared/mocks/link-service.mock'; import { diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts index a641f72ac2c..5634d63ac05 100644 --- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts +++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts @@ -5,6 +5,19 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Bundle } from '@core/shared/bundle.model'; +import { Item } from '@core/shared/item.model'; +import { + getFirstSucceededRemoteDataPayload, + getFirstSucceededRemoteDataWithNotEmptyPayload, +} from '@core/shared/operators'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import isEqual from 'lodash/isEqual'; @@ -22,19 +35,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../core/data/paginated-list.model'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { Bundle } from '../../../core/shared/bundle.model'; -import { Item } from '../../../core/shared/item.model'; -import { - getFirstSucceededRemoteDataPayload, - getFirstSucceededRemoteDataWithNotEmptyPayload, -} from '../../../core/shared/operators'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { AlertType } from '../../../shared/alert/alert-type'; import { diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts index 3e657f6471c..81193d96697 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts @@ -12,20 +12,20 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { BundleDataService } from '@core/data/bundle-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { FieldChangeType } from '@core/data/object-updates/field-change-type.model'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RequestService } from '@core/data/request.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Bundle } from '@core/shared/bundle.model'; +import { Item } from '@core/shared/item.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { BitstreamDataService } from '../../../core/data/bitstream-data.service'; -import { BundleDataService } from '../../../core/data/bundle-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { RequestService } from '../../../core/data/request.service'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { Bundle } from '../../../core/shared/bundle.model'; -import { Item } from '../../../core/shared/item.model'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { getMockRequestService } from '../../../shared/mocks/request.service.mock'; import { diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts index 27105b79727..79a17ce221b 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts @@ -14,6 +14,20 @@ import { Router, RouterLink, } from '@angular/router'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { BundleDataService } from '@core/data/bundle-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { Bundle } from '@core/shared/bundle.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -34,20 +48,6 @@ import { import { AlertComponent } from 'src/app/shared/alert/alert.component'; import { AlertType } from 'src/app/shared/alert/alert-type'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { BitstreamDataService } from '../../../core/data/bitstream-data.service'; -import { BundleDataService } from '../../../core/data/bundle-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { Bundle } from '../../../core/shared/bundle.model'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { hasValue, diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts index 490897b22a5..5972e64d38a 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts @@ -2,18 +2,18 @@ import { fakeAsync, tick, } from '@angular/core/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { BundleDataService } from '@core/data/bundle-data.service'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { ObjectUpdatesServiceStub } from '@core/data/object-updates/object-updates.service.stub'; +import { RequestService } from '@core/data/request.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { Bundle } from '@core/shared/bundle.model'; import { TranslateService } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../core/data/bitstream-data.service'; -import { BundleDataService } from '../../../core/data/bundle-data.service'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { ObjectUpdatesServiceStub } from '../../../core/data/object-updates/object-updates.service.stub'; -import { RequestService } from '../../../core/data/request.service'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; -import { Bundle } from '../../../core/shared/bundle.model'; import { LiveRegionService } from '../../../shared/live-region/live-region.service'; import { getLiveRegionServiceStub } from '../../../shared/live-region/live-region.service.stub'; import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock'; diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts index 2221e037fb8..62593d79ac7 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts @@ -1,4 +1,21 @@ import { Injectable } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { BundleDataService } from '@core/data/bundle-data.service'; +import { FieldChangeType } from '@core/data/object-updates/field-change-type.model'; +import { FieldUpdate } from '@core/data/object-updates/field-update.model'; +import { FieldUpdates } from '@core/data/object-updates/field-updates.model'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { Bundle } from '@core/shared/bundle.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateService } from '@ngx-translate/core'; import { MoveOperation } from 'fast-json-patch'; import { @@ -14,23 +31,6 @@ import { } from 'rxjs/operators'; import { getBitstreamDownloadRoute } from '../../../app-routing-paths'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../core/data/bitstream-data.service'; -import { BundleDataService } from '../../../core/data/bundle-data.service'; -import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model'; -import { FieldUpdate } from '../../../core/data/object-updates/field-update.model'; -import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; -import { Bundle } from '../../../core/shared/bundle.model'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; import { hasNoValue, hasValue, diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts index ff0567eb9f2..8997348069f 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts @@ -8,20 +8,20 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { BundleDataService } from '@core/data/bundle-data.service'; +import { FieldChangeType } from '@core/data/object-updates/field-change-type.model'; +import { FieldUpdate } from '@core/data/object-updates/field-update.model'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RequestService } from '@core/data/request.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Bundle } from '@core/shared/bundle.model'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of, Subject, } from 'rxjs'; -import { BundleDataService } from '../../../../core/data/bundle-data.service'; -import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model'; -import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model'; -import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { RequestService } from '../../../../core/data/request.service'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { Bundle } from '../../../../core/shared/bundle.model'; -import { Item } from '../../../../core/shared/item.model'; import { getMockRequestService } from '../../../../shared/mocks/request.service.mock'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes'; diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts index 027784df1bf..7b83d66d7c4 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts @@ -13,6 +13,20 @@ import { ViewContainerRef, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BundleDataService } from '@core/data/bundle-data.service'; +import { FieldChangeType } from '@core/data/object-updates/field-change-type.model'; +import { FieldUpdate } from '@core/data/object-updates/field-update.model'; +import { FieldUpdates } from '@core/data/object-updates/field-updates.model'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RequestService } from '@core/data/request.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Bundle } from '@core/shared/bundle.model'; +import { Item } from '@core/shared/item.model'; +import { + getAllSucceededRemoteData, + paginatedListToArray, +} from '@core/shared/operators'; import { NgbDropdownModule, NgbTooltipModule, @@ -35,20 +49,6 @@ import { PaginatedList } from 'src/app/core/data/paginated-list.model'; import { RemoteData } from 'src/app/core/data/remote-data'; import { Bitstream } from 'src/app/core/shared/bitstream.model'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { BundleDataService } from '../../../../core/data/bundle-data.service'; -import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model'; -import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model'; -import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model'; -import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { RequestService } from '../../../../core/data/request.service'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { Bundle } from '../../../../core/shared/bundle.model'; -import { Item } from '../../../../core/shared/item.model'; -import { - getAllSucceededRemoteData, - paginatedListToArray, -} from '../../../../core/shared/operators'; import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive'; import { hasNoValue, diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts index 5c8a896d531..7dc5436f9ee 100644 --- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts @@ -12,6 +12,18 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -19,18 +31,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { - SortDirection, - SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Collection } from '../../../core/shared/collection.model'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { ErrorComponent } from '../../../shared/error/error.component'; import { HostWindowService } from '../../../shared/host-window.service'; import { LoadingComponent } from '../../../shared/loading/loading.component'; diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts index c5fa717ceb8..c483e19b000 100644 --- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts +++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts @@ -9,6 +9,25 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { Item } from '@core/shared/item.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getAllSucceededRemoteData, + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getFirstSucceededRemoteDataPayload, + getRemoteDataPayload, + toDSpaceObjectListRD, +} from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -27,25 +46,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Collection } from '../../../core/shared/collection.model'; -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { Item } from '../../../core/shared/item.model'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { - getAllSucceededRemoteData, - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getFirstSucceededRemoteDataPayload, - getRemoteDataPayload, - toDSpaceObjectListRD, -} from '../../../core/shared/operators'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { fadeIn, fadeInOut, diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.spec.ts b/src/app/item-page/edit-item-page/item-curate/item-curate.component.spec.ts index 03de7fd659d..517d26358d3 100644 --- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.spec.ts @@ -8,11 +8,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { Item } from '../../../core/shared/item.model'; import { CurationFormComponent } from '../../../curation-form/curation-form.component'; import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; import { ItemCurateComponent } from './item-curate.component'; diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts index def02b0d3f3..582a37fceea 100644 --- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts +++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts @@ -4,6 +4,9 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { @@ -12,9 +15,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; import { CurationFormComponent } from '../../../curation-form/curation-form.component'; import { hasValue } from '../../../shared/empty.util'; diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts index a162808db1e..2d25ba59d2c 100644 --- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts @@ -12,6 +12,16 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { LinkService } from '@core/cache/builders/link.service'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RelationshipTypeDataService } from '@core/data/relationship-type-data.service'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -19,16 +29,6 @@ import { of, } from 'rxjs'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; -import { Relationship } from '../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model'; import { getMockThemeService } from '../../../shared/mocks/theme-service.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts index 0e394edb592..7d3962e3d5d 100644 --- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts +++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts @@ -11,6 +11,23 @@ import { Router, RouterLink, } from '@angular/router'; +import { LinkService } from '@core/cache/builders/link.service'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; import { NgbModal, NgbModalRef, @@ -35,23 +52,6 @@ import { take, } from 'rxjs/operators'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { Relationship } from '../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model'; -import { MetadataValue } from '../../../core/shared/metadata.models'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { hasValue, diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts index 9e23d51a0fd..4c5bc139e30 100644 --- a/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts @@ -10,15 +10,15 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RequestService } from '@core/data/request.service'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RequestService } from '../../../core/data/request.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; import { AuthorizedCollectionSelectorComponent } from '../../../shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component'; import { getMockRequestService } from '../../../shared/mocks/request.service.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts index 96cdad3e1cb..32946053961 100644 --- a/src/app/item-page/edit-item-page/item-move/item-move.component.ts +++ b/src/app/item-page/edit-item-page/item-move/item-move.component.ts @@ -9,6 +9,20 @@ import { Router, RouterLink, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { Collection } from '@core/shared/collection.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { Item } from '@core/shared/item.model'; +import { + getAllSucceededRemoteDataPayload, + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -20,20 +34,6 @@ import { switchMap, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { Item } from '../../../core/shared/item.model'; -import { - getAllSucceededRemoteDataPayload, - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; -import { SearchService } from '../../../core/shared/search/search.service'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { AuthorizedCollectionSelectorComponent } from '../../../shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; diff --git a/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts b/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts index a6f08ac95ce..097090c430e 100644 --- a/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts +++ b/src/app/item-page/edit-item-page/item-operation/itemOperation.model.ts @@ -1,4 +1,4 @@ -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; /** * Represents an item operation used on the edit item page with a key, an operation URL to which will be navigated diff --git a/src/app/item-page/edit-item-page/item-page-access-control.guard.ts b/src/app/item-page/edit-item-page/item-page-access-control.guard.ts index 4f8f938a7ae..960fe67ee32 100644 --- a/src/app/item-page/edit-item-page/item-page-access-control.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-access-control.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts b/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts index 43482d015b0..a197f309e14 100644 --- a/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts b/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts index ab975b5282f..534d3985c61 100644 --- a/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-curate.guard.ts b/src/app/item-page/edit-item-page/item-page-curate.guard.ts index fbbd6d86016..0a479f6e6db 100644 --- a/src/app/item-page/edit-item-page/item-page-curate.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-curate.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-delete.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-delete.guard.spec.ts index be4da975912..69e34e55157 100644 --- a/src/app/item-page/edit-item-page/item-page-delete.guard.spec.ts +++ b/src/app/item-page/edit-item-page/item-page-delete.guard.spec.ts @@ -3,6 +3,8 @@ import { Router, UrlTree, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Item } from '@core/shared/item.model'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; import { @@ -14,8 +16,6 @@ import { AuthorizationDataService } from 'src/app/core/data/feature-authorizatio import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { Item } from '../../core/shared/item.model'; import { getMockTranslateService } from '../../shared/mocks/translate.service.mock'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { itemPageDeleteGuard } from './item-page-delete.guard'; diff --git a/src/app/item-page/edit-item-page/item-page-delete.guard.ts b/src/app/item-page/edit-item-page/item-page-delete.guard.ts index 560fc2487c1..267be7bf7b6 100644 --- a/src/app/item-page/edit-item-page/item-page-delete.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-delete.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.spec.ts index 2aa38323f89..7a12868103f 100644 --- a/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.spec.ts +++ b/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.spec.ts @@ -3,6 +3,8 @@ import { Router, UrlTree, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Item } from '@core/shared/item.model'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; import { @@ -14,8 +16,6 @@ import { AuthorizationDataService } from 'src/app/core/data/feature-authorizatio import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { Item } from '../../core/shared/item.model'; import { getMockTranslateService } from '../../shared/mocks/translate.service.mock'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { itemPageEditAuthorizationsGuard } from './item-page-edit-authorizations.guard'; diff --git a/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.ts b/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.ts index 96fd1022f76..ddc787cc16d 100644 --- a/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-metadata.guard.ts b/src/app/item-page/edit-item-page/item-page-metadata.guard.ts index b68390e1974..a76ea8815a0 100644 --- a/src/app/item-page/edit-item-page/item-page-metadata.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-metadata.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-move.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-move.guard.spec.ts index 9041df50797..75f90490e89 100644 --- a/src/app/item-page/edit-item-page/item-page-move.guard.spec.ts +++ b/src/app/item-page/edit-item-page/item-page-move.guard.spec.ts @@ -3,6 +3,8 @@ import { Router, UrlTree, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Item } from '@core/shared/item.model'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; import { @@ -14,8 +16,6 @@ import { AuthorizationDataService } from 'src/app/core/data/feature-authorizatio import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { Item } from '../../core/shared/item.model'; import { getMockTranslateService } from '../../shared/mocks/translate.service.mock'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { itemPageMoveGuard } from './item-page-move.guard'; diff --git a/src/app/item-page/edit-item-page/item-page-move.guard.ts b/src/app/item-page/edit-item-page/item-page-move.guard.ts index b1fb6d966be..c311423011c 100644 --- a/src/app/item-page/edit-item-page/item-page-move.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-move.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-private.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-private.guard.spec.ts index 2b677d29f2e..fe0a4e40fe0 100644 --- a/src/app/item-page/edit-item-page/item-page-private.guard.spec.ts +++ b/src/app/item-page/edit-item-page/item-page-private.guard.spec.ts @@ -3,6 +3,8 @@ import { Router, UrlTree, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Item } from '@core/shared/item.model'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; import { @@ -14,8 +16,6 @@ import { AuthorizationDataService } from 'src/app/core/data/feature-authorizatio import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { Item } from '../../core/shared/item.model'; import { getMockTranslateService } from '../../shared/mocks/translate.service.mock'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { itemPagePrivateGuard } from './item-page-private.guard'; diff --git a/src/app/item-page/edit-item-page/item-page-private.guard.ts b/src/app/item-page/edit-item-page/item-page-private.guard.ts index 4dedabf6f97..4f793d128c6 100644 --- a/src/app/item-page/edit-item-page/item-page-private.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-private.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts b/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts index f9f13596fe4..8c6f88bc9df 100644 --- a/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts b/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts index 75fe30ec40b..34e88b18726 100644 --- a/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-relationships.guard.ts b/src/app/item-page/edit-item-page/item-page-relationships.guard.ts index 77b72e36062..6044baaca4a 100644 --- a/src/app/item-page/edit-item-page/item-page-relationships.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-relationships.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-status.guard.ts b/src/app/item-page/edit-item-page/item-page-status.guard.ts index e4d3aa2d219..2c629382e60 100644 --- a/src/app/item-page/edit-item-page/item-page-status.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-status.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSomeFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSomeFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-version-history.guard.ts b/src/app/item-page/edit-item-page/item-page-version-history.guard.ts index 36ff999b448..627c6e48431 100644 --- a/src/app/item-page/edit-item-page/item-page-version-history.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-version-history.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts b/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts index 2bd68fff335..30970a4d1e5 100644 --- a/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts +++ b/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts b/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts index ae42ab195c7..2b34a5a4b40 100644 --- a/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts @@ -12,13 +12,13 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { RestResponse } from '@core/cache/response.models'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Item } from '@core/shared/item.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RestResponse } from '../../../core/cache/response.models'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { Item } from '../../../core/shared/item.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject, diff --git a/src/app/item-page/edit-item-page/item-private/item-private.component.ts b/src/app/item-page/edit-item-page/item-private/item-private.component.ts index cd5ed953049..a3de604116e 100644 --- a/src/app/item-page/edit-item-page/item-private/item-private.component.ts +++ b/src/app/item-page/edit-item-page/item-private/item-private.component.ts @@ -4,15 +4,15 @@ import { Router, RouterLink, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { ModifyItemOverviewComponent } from '../modify-item-overview/modify-item-overview.component'; import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component'; diff --git a/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts b/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts index c50399abfbc..a9511b410a8 100644 --- a/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts @@ -12,12 +12,12 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Item } from '@core/shared/item.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { Item } from '../../../core/shared/item.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject, diff --git a/src/app/item-page/edit-item-page/item-public/item-public.component.ts b/src/app/item-page/edit-item-page/item-public/item-public.component.ts index 07574ef419e..47f79dc71bf 100644 --- a/src/app/item-page/edit-item-page/item-public/item-public.component.ts +++ b/src/app/item-page/edit-item-page/item-public/item-public.component.ts @@ -4,15 +4,15 @@ import { Router, RouterLink, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { ModifyItemOverviewComponent } from '../modify-item-overview/modify-item-overview.component'; import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component'; diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts index 677a3576feb..639293b4c53 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts @@ -12,13 +12,13 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { IdentifierDataService } from '@core/data/identifier-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Item } from '@core/shared/item.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { IdentifierDataService } from '../../../core/data/identifier-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { Item } from '../../../core/shared/item.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject, diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts index 8897627b5a0..0d88dc14d84 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts @@ -8,6 +8,11 @@ import { Router, RouterLink, } from '@angular/router'; +import { IdentifierDataService } from '@core/data/identifier-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -18,11 +23,6 @@ import { map, } from 'rxjs/operators'; -import { IdentifierDataService } from '../../../core/data/identifier-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { hasValue } from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model'; diff --git a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts index 62fabddd74b..7b1c0043ca8 100644 --- a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts @@ -12,12 +12,12 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Item } from '@core/shared/item.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { Item } from '../../../core/shared/item.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject, diff --git a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts index e409308b306..7c135a4ca46 100644 --- a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts +++ b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts @@ -4,15 +4,15 @@ import { Router, RouterLink, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { ModifyItemOverviewComponent } from '../modify-item-overview/modify-item-overview.component'; import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component'; diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts index bfd02bb89a6..7f90bed39a5 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts @@ -1,23 +1,23 @@ import { TestBed } from '@angular/core/testing'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { FieldChangeType } from '@core/data/object-updates/field-change-type.model'; +import { FieldUpdate } from '@core/data/object-updates/field-update.model'; +import { FieldUpdates } from '@core/data/object-updates/field-updates.model'; +import { + DeleteRelationship, + RelationshipIdentifiable, +} from '@core/data/object-updates/object-updates.reducer'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { v4 as uuidv4 } from 'uuid'; -import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model'; -import { FieldUpdate } from '../../../core/data/object-updates/field-update.model'; -import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model'; -import { - DeleteRelationship, - RelationshipIdentifiable, -} from '../../../core/data/object-updates/object-updates.reducer'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; -import { Relationship } from '../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createFailedRemoteDataObject, diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts index e66562fe19e..27a224809d3 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts @@ -1,4 +1,25 @@ import { Injectable } from '@angular/core'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { FieldChangeType } from '@core/data/object-updates/field-change-type.model'; +import { FieldUpdate } from '@core/data/object-updates/field-update.model'; +import { FieldUpdates } from '@core/data/object-updates/field-updates.model'; +import { + DeleteRelationship, + RelationshipIdentifiable, +} from '@core/data/object-updates/object-updates.reducer'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { @@ -16,27 +37,6 @@ import { toArray, } from 'rxjs/operators'; -import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model'; -import { FieldUpdate } from '../../../core/data/object-updates/field-update.model'; -import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model'; -import { - DeleteRelationship, - RelationshipIdentifiable, -} from '../../../core/data/object-updates/object-updates.reducer'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; -import { Relationship } from '../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; import { hasValue } from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts index a901ab04238..053c71fd230 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts @@ -5,12 +5,12 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { Item } from '../../../../core/shared/item.model'; -import { ItemType } from '../../../../core/shared/item-relationships/item-type.model'; -import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { EditItemRelationshipsService } from '../edit-item-relationships.service'; import { EditRelationshipListComponent } from '../edit-relationship-list/edit-relationship-list.component'; diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts index a81a940fe26..05ec0efa918 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts @@ -7,15 +7,15 @@ import { OnInit, Output, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; import { BehaviorSubject, Observable, Subscription, } from 'rxjs'; -import { Item } from '../../../../core/shared/item.model'; -import { ItemType } from '../../../../core/shared/item-relationships/item-type.model'; -import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; import { hasValue } from '../../../../shared/empty.util'; import { EditItemRelationshipsService } from '../edit-item-relationships.service'; import { EditRelationshipListComponent } from '../edit-relationship-list/edit-relationship-list.component'; diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts index 8dafa9338db..c9079b79da2 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts @@ -12,6 +12,25 @@ import { ActivatedRoute, RouterModule, } from '@angular/router'; +import { AuthRequestService } from '@core/auth/auth-request.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { FieldChangeType } from '@core/data/object-updates/field-change-type.model'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RelationshipTypeDataService } from '@core/data/relationship-type-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { CookieService } from '@core/services/cookie.service'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; @@ -23,25 +42,6 @@ import { import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment.test'; import { REQUEST } from '../../../../../express.tokens'; -import { AuthRequestService } from '../../../../core/auth/auth-request.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { ConfigurationDataService } from '../../../../core/data/configuration-data.service'; -import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model'; -import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; -import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { CookieService } from '../../../../core/services/cookie.service'; -import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; -import { LinkHeadService } from '../../../../core/services/link-head.service'; -import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ItemType } from '../../../../core/shared/item-relationships/item-type.model'; -import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; -import { XSRFService } from '../../../../core/xsrf/xsrf.service'; import { HostWindowService } from '../../../../shared/host-window.service'; import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service'; import { PaginationComponent } from '../../../../shared/pagination/pagination.component'; diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts index 78ec013f896..a6e539f1801 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts @@ -11,6 +11,29 @@ import { OnInit, Output, } from '@angular/core'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { FieldChangeType } from '@core/data/object-updates/field-change-type.model'; +import { FieldUpdate } from '@core/data/object-updates/field-update.model'; +import { FieldUpdates } from '@core/data/object-updates/field-updates.model'; +import { RelationshipIdentifiable } from '@core/data/object-updates/object-updates.reducer'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; +import { + getAllSucceededRemoteData, + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getFirstSucceededRemoteDataPayload, + getRemoteDataPayload, +} from '@core/shared/operators'; import { NgbModal, NgbModalRef, @@ -40,29 +63,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../config/app-config.interface'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { RequestParam } from '../../../../core/cache/models/request-param.model'; -import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model'; -import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model'; -import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model'; -import { RelationshipIdentifiable } from '../../../../core/data/object-updates/object-updates.reducer'; -import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ItemType } from '../../../../core/shared/item-relationships/item-type.model'; -import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; -import { - getAllSucceededRemoteData, - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getFirstSucceededRemoteDataPayload, - getRemoteDataPayload, -} from '../../../../core/shared/operators'; import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive'; import { hasNoValue, diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts index f1ab48b436d..4c60a220dfe 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts @@ -8,6 +8,11 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { FieldChangeType } from '@core/data/object-updates/field-change-type.model'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; import { NgbModal, NgbModalRef, @@ -15,11 +20,6 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model'; -import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { Item } from '../../../../core/shared/item.model'; -import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock'; import { ListableObjectComponentLoaderComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts index f585037a70f..c1397c04167 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts @@ -4,6 +4,19 @@ import { Input, OnChanges, } from '@angular/core'; +import { FieldChangeType } from '@core/data/object-updates/field-change-type.model'; +import { FieldUpdate } from '@core/data/object-updates/field-update.model'; +import { + DeleteRelationship, + RelationshipIdentifiable, +} from '@core/data/object-updates/object-updates.reducer'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { Item } from '@core/shared/item.model'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; import { NgbModal, NgbModalRef, @@ -21,19 +34,6 @@ import { take, } from 'rxjs/operators'; -import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model'; -import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model'; -import { - DeleteRelationship, - RelationshipIdentifiable, -} from '../../../../core/data/object-updates/object-updates.reducer'; -import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { Item } from '../../../../core/shared/item.model'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../../core/shared/operators'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive'; import { hasValue, diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts index d953318662d..f9290526f44 100644 --- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts @@ -12,25 +12,25 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RestResponse } from '@core/cache/response.models'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { FieldChangeType } from '@core/data/object-updates/field-change-type.model'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RelationshipTypeDataService } from '@core/data/relationship-type-data.service'; +import { RequestService } from '@core/data/request.service'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; import { TranslateModule } from '@ngx-translate/core'; import { combineLatest as observableCombineLatest, of, } from 'rxjs'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { RestResponse } from '../../../core/cache/response.models'; -import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service'; -import { RequestService } from '../../../core/data/request.service'; -import { Item } from '../../../core/shared/item.model'; -import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; -import { Relationship } from '../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { getMockThemeService } from '../../../shared/mocks/theme-service.mock'; import { diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts index 8b57276fab9..01fc4280f45 100644 --- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts +++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts @@ -10,6 +10,20 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RelationshipTypeDataService } from '@core/data/relationship-type-data.service'; +import { RequestService } from '@core/data/request.service'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -24,20 +38,6 @@ import { map, } from 'rxjs/operators'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service'; -import { RequestService } from '../../../core/data/request.service'; -import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; -import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { AlertType } from '../../../shared/alert/alert-type'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts index e463967d5fc..9f34d2db736 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts @@ -8,16 +8,16 @@ import { import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { IdentifierDataService } from '@core/data/identifier-data.service'; +import { OrcidAuthService } from '@core/orcid/orcid-auth.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Item } from '@core/shared/item.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { IdentifierDataService } from '../../../core/data/identifier-data.service'; -import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; -import { Item } from '../../../core/shared/item.model'; import { HostWindowService } from '../../../shared/host-window.service'; import { createSuccessfulRemoteDataObject, diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts index 3c37683df9e..a1af02cb284 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts @@ -12,6 +12,18 @@ import { ActivatedRoute, RouterLink, } from '@angular/router'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { IdentifierDataService } from '@core/data/identifier-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { OrcidAuthService } from '@core/orcid/orcid-auth.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Item } from '@core/shared/item.model'; +import { + getAllSucceededRemoteDataPayload, + getFirstCompletedRemoteData, +} from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -30,18 +42,6 @@ import { toArray, } from 'rxjs/operators'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { IdentifierDataService } from '../../../core/data/identifier-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; -import { Item } from '../../../core/shared/item.model'; -import { - getAllSucceededRemoteDataPayload, - getFirstCompletedRemoteData, -} from '../../../core/shared/operators'; import { fadeIn, fadeInOut, diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts index 3a1cc50084c..89307249f98 100644 --- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts @@ -9,10 +9,10 @@ import { } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Item } from '../../../core/shared/item.model'; import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; import { VarDirective } from '../../../shared/utils/var.directive'; import { ItemVersionsComponent } from '../../versions/item-versions.component'; diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts index a941332aef4..7435ff53b2a 100644 --- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts +++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts @@ -4,12 +4,12 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { AlertType } from '../../../shared/alert/alert-type'; import { VarDirective } from '../../../shared/utils/var.directive'; import { ItemVersionsComponent } from '../../versions/item-versions.component'; diff --git a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts index 0ea5129d8d6..de9da063b4e 100644 --- a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts @@ -12,12 +12,12 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Item } from '@core/shared/item.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { Item } from '../../../core/shared/item.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject, diff --git a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts index 9ad7e998465..33cd91f20ff 100644 --- a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts +++ b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts @@ -4,15 +4,15 @@ import { Router, RouterLink, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { ModifyItemOverviewComponent } from '../modify-item-overview/modify-item-overview.component'; import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component'; diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts index a722d07c9da..21b4b89d31a 100644 --- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts +++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts @@ -4,9 +4,9 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Item } from '../../../core/shared/item.model'; import { ModifyItemOverviewComponent } from './modify-item-overview.component'; let comp: ModifyItemOverviewComponent; diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts index bb8d68ecd2e..a489d03224b 100644 --- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts +++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts @@ -4,11 +4,10 @@ import { Input, OnChanges, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { MetadataMap } from '@core/shared/metadata.models'; import { TranslateModule } from '@ngx-translate/core'; -import { Item } from '../../../core/shared/item.model'; -import { MetadataMap } from '../../../core/shared/metadata.models'; - @Component({ selector: 'ds-modify-item-overview', templateUrl: './modify-item-overview.component.html', diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts index 1325beaf7b9..4f3793013d5 100644 --- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts +++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts @@ -15,13 +15,13 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createFailedRemoteDataObject, diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts index b3fdb3ed87f..556bf369e9a 100644 --- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts +++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts @@ -8,6 +8,10 @@ import { Router, RouterLink, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -18,10 +22,6 @@ import { map, } from 'rxjs/operators'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { getItemEditRoute, diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts index 99792448496..81b2030d72a 100644 --- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts +++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts @@ -7,13 +7,13 @@ import { TestBed, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../config/app-config.interface'; import { environment } from '../../../../environments/environment'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { Item } from '../../../core/shared/item.model'; import { getMockThemeService } from '../../../shared/mocks/theme-service.mock'; import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; import { ThemeService } from '../../../shared/theme-support/theme.service'; diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts index 1381751eb2b..11ef09676c5 100644 --- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts +++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts @@ -12,6 +12,9 @@ import { OnInit, Output, } from '@angular/core'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { Item } from '@core/shared/item.model'; +import { MetadataValue } from '@core/shared/metadata.models'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -23,9 +26,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../config/app-config.interface'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { Item } from '../../../core/shared/item.model'; -import { MetadataValue } from '../../../core/shared/metadata.models'; import { hasValue } from '../../../shared/empty.util'; import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; import { VarDirective } from '../../../shared/utils/var.directive'; diff --git a/src/app/item-page/field-components/collections/collections.component.spec.ts b/src/app/item-page/field-components/collections/collections.component.spec.ts index 13f94410a70..a376e23f2bb 100644 --- a/src/app/item-page/field-components/collections/collections.component.spec.ts +++ b/src/app/item-page/field-components/collections/collections.component.spec.ts @@ -9,19 +9,19 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; -import { TranslateModule } from '@ngx-translate/core'; - -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; import { buildPaginatedList, PaginatedList, -} from '../../../core/data/paginated-list.model'; -import { Collection } from '../../../core/shared/collection.model'; -import { Item } from '../../../core/shared/item.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; +} from '@core/data/paginated-list.model'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { TranslateModule } from '@ngx-translate/core'; + import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock'; import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock'; import { diff --git a/src/app/item-page/field-components/collections/collections.component.ts b/src/app/item-page/field-components/collections/collections.component.ts index 56e837a86fe..a595401784e 100644 --- a/src/app/item-page/field-components/collections/collections.component.ts +++ b/src/app/item-page/field-components/collections/collections.component.ts @@ -6,6 +6,18 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; +import { + getAllCompletedRemoteData, + getAllSucceededRemoteDataPayload, + getFirstSucceededRemoteDataPayload, + getPaginatedListPayload, +} from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -21,18 +33,6 @@ import { withLatestFrom, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { Collection } from '../../../core/shared/collection.model'; -import { Item } from '../../../core/shared/item.model'; -import { - getAllCompletedRemoteData, - getAllSucceededRemoteDataPayload, - getFirstSucceededRemoteDataPayload, - getPaginatedListPayload, -} from '../../../core/shared/operators'; import { hasValue } from '../../../shared/empty.util'; import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts index 4bbea37fd3d..1810f0790b1 100644 --- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts +++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts @@ -9,6 +9,7 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { MetadataValue } from '@core/shared/metadata.models'; import { TranslateLoader, TranslateModule, @@ -16,7 +17,6 @@ import { import { APP_CONFIG } from '../../../../config/app-config.interface'; import { environment } from '../../../../environments/environment'; -import { MetadataValue } from '../../../core/shared/metadata.models'; import { isNotEmpty } from '../../../shared/empty.util'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; import { MetadataUriValuesComponent } from './metadata-uri-values.component'; diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts index a583873d6ee..651f1dfe8e4 100644 --- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts +++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts @@ -3,9 +3,9 @@ import { Component, Input, } from '@angular/core'; +import { MetadataValue } from '@core/shared/metadata.models'; import { TranslateModule } from '@ngx-translate/core'; -import { MetadataValue } from '../../../core/shared/metadata.models'; import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { MetadataValuesComponent } from '../metadata-values/metadata-values.component'; diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts index 56701287336..acabd66d7ee 100644 --- a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts +++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts @@ -8,6 +8,7 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { MetadataValue } from '@core/shared/metadata.models'; import { TranslateLoader, TranslateModule, @@ -15,7 +16,6 @@ import { import { APP_CONFIG } from '../../../../config/app-config.interface'; import { environment } from '../../../../environments/environment'; -import { MetadataValue } from '../../../core/shared/metadata.models'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; import { MetadataValuesComponent } from './metadata-values.component'; diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts index be58645015f..c0185372195 100644 --- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts +++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts @@ -10,6 +10,9 @@ import { SimpleChanges, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { VALUE_LIST_BROWSE_DEFINITION } from '@core/shared/value-list-browse-definition.resource-type'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -17,9 +20,6 @@ import { AppConfig, } from '../../../../config/app-config.interface'; import { environment } from '../../../../environments/environment'; -import { BrowseDefinition } from '../../../core/shared/browse-definition.model'; -import { MetadataValue } from '../../../core/shared/metadata.models'; -import { VALUE_LIST_BROWSE_DEFINITION } from '../../../core/shared/value-list-browse-definition.resource-type'; import { hasValue } from '../../../shared/empty.util'; import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { MarkdownDirective } from '../../../shared/utils/markdown.directive'; diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts index 268af2f1724..57061a7702f 100644 --- a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts +++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts @@ -6,6 +6,10 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateLoader, @@ -15,10 +19,6 @@ import { of } from 'rxjs'; import { APP_CONFIG } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; import { ThemedFileDownloadLinkComponent } from '../../../../shared/file-download-link/themed-file-download-link.component'; import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock'; diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts index a1ef48ec7bc..f06ee452ff8 100644 --- a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts +++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts @@ -6,6 +6,13 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Item } from '@core/shared/item.model'; import { TranslateModule, TranslateService, @@ -20,13 +27,6 @@ import { AppConfig, } from 'src/config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { Item } from '../../../../core/shared/item.model'; import { hasValue, isEmpty, diff --git a/src/app/item-page/full/field-components/file-section/themed-full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/themed-full-file-section.component.ts index 3f0f3237edd..44aa09bbb8c 100644 --- a/src/app/item-page/full/field-components/file-section/themed-full-file-section.component.ts +++ b/src/app/item-page/full/field-components/file-section/themed-full-file-section.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../../core/shared/item.model'; import { ThemedComponent } from '../../../../shared/theme-support/themed.component'; import { FullFileSectionComponent } from './full-file-section.component'; diff --git a/src/app/item-page/full/full-item-page.component.spec.ts b/src/app/item-page/full/full-item-page.component.spec.ts index a03c5458d49..5216ea8113f 100644 --- a/src/app/item-page/full/full-item-page.component.spec.ts +++ b/src/app/item-page/full/full-item-page.component.spec.ts @@ -13,6 +13,15 @@ import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { NotifyInfoService } from '@core/coar-notify/notify-info/notify-info.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { SignpostingDataService } from '@core/data/signposting-data.service'; +import { HeadTagService } from '@core/metadata/head-tag.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { ServerResponseService } from '@core/services/server-response.service'; +import { Item } from '@core/shared/item.model'; import { TranslateLoader, TranslateModule, @@ -22,15 +31,6 @@ import { of, } from 'rxjs'; -import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { SignpostingDataService } from '../../core/data/signposting-data.service'; -import { HeadTagService } from '../../core/metadata/head-tag.service'; -import { LinkHeadService } from '../../core/services/link-head.service'; -import { ServerResponseService } from '../../core/services/server-response.service'; -import { Item } from '../../core/shared/item.model'; import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { HeadTagServiceMock } from '../../shared/mocks/head-tag-service.mock'; diff --git a/src/app/item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts index 6ebc9978d7c..9cb628f0985 100644 --- a/src/app/item-page/full/full-item-page.component.ts +++ b/src/app/item-page/full/full-item-page.component.ts @@ -17,6 +17,15 @@ import { Router, RouterLink, } from '@angular/router'; +import { NotifyInfoService } from '@core/coar-notify/notify-info/notify-info.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { SignpostingDataService } from '@core/data/signposting-data.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { ServerResponseService } from '@core/services/server-response.service'; +import { Item } from '@core/shared/item.model'; +import { MetadataMap } from '@core/shared/metadata.models'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -27,15 +36,6 @@ import { map, } from 'rxjs/operators'; -import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { SignpostingDataService } from '../../core/data/signposting-data.service'; -import { LinkHeadService } from '../../core/services/link-head.service'; -import { ServerResponseService } from '../../core/services/server-response.service'; -import { Item } from '../../core/shared/item.model'; -import { MetadataMap } from '../../core/shared/metadata.models'; import { fadeInOut } from '../../shared/animations/fade'; import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { hasValue } from '../../shared/empty.util'; diff --git a/src/app/item-page/item-page-administrator.guard.ts b/src/app/item-page/item-page-administrator.guard.ts index 831cd438316..1755299083c 100644 --- a/src/app/item-page/item-page-administrator.guard.ts +++ b/src/app/item-page/item-page-administrator.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { itemPageResolver } from './item-page.resolver'; /** diff --git a/src/app/item-page/item-page-routes.ts b/src/app/item-page/item-page-routes.ts index beb6a74857f..03019f74e58 100644 --- a/src/app/item-page/item-page-routes.ts +++ b/src/app/item-page/item-page-routes.ts @@ -1,9 +1,9 @@ import { Route } from '@angular/router'; +import { accessTokenResolver } from '@core/auth/access-token.resolver'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { itemBreadcrumbResolver } from '@core/breadcrumbs/item-breadcrumb.resolver'; import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths'; -import { accessTokenResolver } from '../core/auth/access-token.resolver'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; -import { itemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver'; import { MenuRoute } from '../shared/menu/menu-route.model'; import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver'; import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component'; diff --git a/src/app/item-page/item-page-routing-paths.ts b/src/app/item-page/item-page-routing-paths.ts index 983c2f517f4..c49c6e952d6 100644 --- a/src/app/item-page/item-page-routing-paths.ts +++ b/src/app/item-page/item-page-routing-paths.ts @@ -1,5 +1,6 @@ -import { Item } from '../core/shared/item.model'; -import { URLCombiner } from '../core/url-combiner/url-combiner'; +import { Item } from '@core/shared/item.model'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; + import { isNotEmpty } from '../shared/empty.util'; export const ITEM_MODULE_PATH = 'items'; diff --git a/src/app/item-page/item-page.resolver.spec.ts b/src/app/item-page/item-page.resolver.spec.ts index ab92a058f67..a03de604cc5 100644 --- a/src/app/item-page/item-page.resolver.spec.ts +++ b/src/app/item-page/item-page.resolver.spec.ts @@ -3,10 +3,10 @@ import { Router, RouterModule, } from '@angular/router'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { MetadataValueFilter } from '@core/shared/metadata.models'; import { first } from 'rxjs/operators'; -import { DSpaceObject } from '../core/shared/dspace-object.model'; -import { MetadataValueFilter } from '../core/shared/metadata.models'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { AuthServiceStub } from '../shared/testing/auth-service.stub'; import { itemPageResolver } from './item-page.resolver'; diff --git a/src/app/item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts index ef59bf00b8e..5d80ff93090 100644 --- a/src/app/item-page/item-page.resolver.ts +++ b/src/app/item-page/item-page.resolver.ts @@ -5,18 +5,18 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { ResolvedAction } from '@core/resolving/resolver.actions'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { AppState } from '../app.reducer'; -import { AuthService } from '../core/auth/auth.service'; -import { ItemDataService } from '../core/data/item-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { ResolvedAction } from '../core/resolving/resolver.actions'; -import { redirectOn4xx } from '../core/shared/authorized.operators'; -import { Item } from '../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { hasValue } from '../shared/empty.util'; import { getItemPageLinksToFollow } from './item.resolver'; import { getItemPageRoute } from './item-page-routing-paths'; diff --git a/src/app/item-page/item.resolver.ts b/src/app/item-page/item.resolver.ts index 1fb00d91659..5292c6eacec 100644 --- a/src/app/item-page/item.resolver.ts +++ b/src/app/item-page/item.resolver.ts @@ -4,16 +4,16 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { ResolvedAction } from '@core/resolving/resolver.actions'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { environment } from '../../environments/environment'; import { AppState } from '../app.reducer'; -import { ItemDataService } from '../core/data/item-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { ResolvedAction } from '../core/resolving/resolver.actions'; -import { Item } from '../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { followLink, FollowLinkConfig, diff --git a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts index b9e2a5683cf..d4aba9240a9 100644 --- a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts +++ b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts @@ -4,12 +4,12 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { MediaViewerItem } from '@core/shared/media-viewer-item.model'; import { NgxGalleryOptions } from '@kolkov/ngx-gallery'; import { of } from 'rxjs'; -import { AuthService } from '../../../core/auth/auth.service'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model'; import { MockBitstreamFormat1 } from '../../../shared/mocks/item.mock'; import { MediaViewerImageComponent } from './media-viewer-image.component'; diff --git a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts index ddc6c131d46..e763a6e599b 100644 --- a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts +++ b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts @@ -5,6 +5,8 @@ import { OnChanges, OnInit, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { MediaViewerItem } from '@core/shared/media-viewer-item.model'; import { NgxGalleryAnimation, NgxGalleryImage, @@ -13,8 +15,6 @@ import { } from '@kolkov/ngx-gallery'; import { Observable } from 'rxjs'; -import { AuthService } from '../../../core/auth/auth.service'; -import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model'; import { hasValue } from '../../../shared/empty.util'; /** diff --git a/src/app/item-page/media-viewer/media-viewer-image/themed-media-viewer-image.component.ts b/src/app/item-page/media-viewer/media-viewer-image/themed-media-viewer-image.component.ts index 42ce742051c..a73b5f278df 100644 --- a/src/app/item-page/media-viewer/media-viewer-image/themed-media-viewer-image.component.ts +++ b/src/app/item-page/media-viewer/media-viewer-image/themed-media-viewer-image.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { MediaViewerItem } from '@core/shared/media-viewer-item.model'; -import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model'; import { ThemedComponent } from '../../../shared/theme-support/themed.component'; import { MediaViewerImageComponent } from './media-viewer-image.component'; diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts index f97b11bc1d1..b8a032c9c9d 100644 --- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts +++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts @@ -6,14 +6,14 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { MediaViewerItem } from '@core/shared/media-viewer-item.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model'; import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { MockBitstreamFormat1 } from '../../../shared/mocks/item.mock'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts index f6ec739742f..ef79888da4e 100644 --- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts +++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts @@ -3,12 +3,12 @@ import { Component, Input, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { MediaViewerItem } from '@core/shared/media-viewer-item.model'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { Bitstream } from 'src/app/core/shared/bitstream.model'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { hasValue } from '../../../shared/empty.util'; import { CaptionInfo } from './caption-info'; diff --git a/src/app/item-page/media-viewer/media-viewer-video/themed-media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/themed-media-viewer-video.component.ts index 0a8d852add0..eab1169af99 100644 --- a/src/app/item-page/media-viewer/media-viewer-video/themed-media-viewer-video.component.ts +++ b/src/app/item-page/media-viewer/media-viewer-video/themed-media-viewer-video.component.ts @@ -2,9 +2,9 @@ import { Component, Input, } from '@angular/core'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { MediaViewerItem } from '@core/shared/media-viewer-item.model'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model'; import { ThemedComponent } from '../../../shared/theme-support/themed.component'; import { MediaViewerVideoComponent } from './media-viewer-video.component'; diff --git a/src/app/item-page/media-viewer/media-viewer.component.spec.ts b/src/app/item-page/media-viewer/media-viewer.component.spec.ts index ae39fc40397..087395969d3 100644 --- a/src/app/item-page/media-viewer/media-viewer.component.spec.ts +++ b/src/app/item-page/media-viewer/media-viewer.component.spec.ts @@ -10,18 +10,18 @@ import { import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { FileService } from '@core/shared/file.service'; +import { MediaViewerItem } from '@core/shared/media-viewer-item.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { BitstreamDataService } from '../../core/data/bitstream-data.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { FileService } from '../../core/shared/file.service'; -import { MediaViewerItem } from '../../core/shared/media-viewer-item.model'; import { MetadataFieldWrapperComponent } from '../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; import { MockBitstreamFormat1 } from '../../shared/mocks/item.mock'; diff --git a/src/app/item-page/media-viewer/media-viewer.component.ts b/src/app/item-page/media-viewer/media-viewer.component.ts index 0ce24b1c357..0b83964bd6a 100644 --- a/src/app/item-page/media-viewer/media-viewer.component.ts +++ b/src/app/item-page/media-viewer/media-viewer.component.ts @@ -7,6 +7,15 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { Item } from '@core/shared/item.model'; +import { ItemRequest } from '@core/shared/item-request.model'; +import { MediaViewerItem } from '@core/shared/media-viewer-item.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -20,15 +29,6 @@ import { import { MediaViewerConfig } from '../../../config/media-viewer-config.interface'; import { environment } from '../../../environments/environment'; -import { BitstreamDataService } from '../../core/data/bitstream-data.service'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { BitstreamFormat } from '../../core/shared/bitstream-format.model'; -import { Item } from '../../core/shared/item.model'; -import { ItemRequest } from '../../core/shared/item-request.model'; -import { MediaViewerItem } from '../../core/shared/media-viewer-item.model'; -import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; import { hasValue } from '../../shared/empty.util'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { followLink } from '../../shared/utils/follow-link-config.model'; diff --git a/src/app/item-page/media-viewer/themed-media-viewer.component.ts b/src/app/item-page/media-viewer/themed-media-viewer.component.ts index 2305b5b40ff..b3867db8006 100644 --- a/src/app/item-page/media-viewer/themed-media-viewer.component.ts +++ b/src/app/item-page/media-viewer/themed-media-viewer.component.ts @@ -2,9 +2,9 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; import { MediaViewerConfig } from '../../../config/media-viewer-config.interface'; -import { Item } from '../../core/shared/item.model'; import { ThemedComponent } from '../../shared/theme-support/themed.component'; import { MediaViewerComponent } from './media-viewer.component'; diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts b/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts index 93a9cbca462..02e08a13abb 100644 --- a/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts +++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts @@ -4,16 +4,16 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { BundleDataService } from '@core/data/bundle-data.service'; +import { Item } from '@core/shared/item.model'; +import { MetadataMap } from '@core/shared/metadata.models'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { BitstreamDataService } from '../../core/data/bitstream-data.service'; -import { BundleDataService } from '../../core/data/bundle-data.service'; -import { Item } from '../../core/shared/item.model'; -import { MetadataMap } from '../../core/shared/metadata.models'; import { HostWindowService } from '../../shared/host-window.service'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts index f082446db9f..2be86648882 100644 --- a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts +++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts @@ -14,6 +14,9 @@ import { DomSanitizer, SafeResourceUrl, } from '@angular/platform-browser'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { BundleDataService } from '@core/data/bundle-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, @@ -25,9 +28,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; -import { BitstreamDataService } from '../../core/data/bitstream-data.service'; -import { BundleDataService } from '../../core/data/bundle-data.service'; -import { Item } from '../../core/shared/item.model'; import { HostWindowService, WidthCategory, diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.service.ts b/src/app/item-page/mirador-viewer/mirador-viewer.service.ts index dc68075c4d9..e5ef8c7e619 100644 --- a/src/app/item-page/mirador-viewer/mirador-viewer.service.ts +++ b/src/app/item-page/mirador-viewer/mirador-viewer.service.ts @@ -2,6 +2,15 @@ import { Injectable, isDevMode, } from '@angular/core'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { BundleDataService } from '@core/data/bundle-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { Bundle } from '@core/shared/bundle.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { filter, @@ -11,15 +20,6 @@ import { switchMap, } from 'rxjs/operators'; -import { BitstreamDataService } from '../../core/data/bitstream-data.service'; -import { BundleDataService } from '../../core/data/bundle-data.service'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { BitstreamFormat } from '../../core/shared/bitstream-format.model'; -import { Bundle } from '../../core/shared/bundle.model'; -import { Item } from '../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { followLink, FollowLinkConfig, diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts index caaf3ff5bae..2f617467e4a 100644 --- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts +++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts @@ -11,6 +11,10 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { OrcidAuthService } from '@core/orcid/orcid-auth.service'; +import { ResearcherProfile } from '@core/profile/model/researcher-profile.model'; +import { NativeWindowService } from '@core/services/window.service'; +import { Item } from '@core/shared/item.model'; import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -20,10 +24,6 @@ import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service'; -import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model'; -import { NativeWindowService } from '../../../core/services/window.service'; -import { Item } from '../../../core/shared/item.model'; import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts index 8527c961af4..57799c79f2d 100644 --- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts +++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts @@ -9,6 +9,15 @@ import { Output, SimpleChanges, } from '@angular/core'; +import { RemoteData } from '@core/data/remote-data'; +import { OrcidAuthService } from '@core/orcid/orcid-auth.service'; +import { ResearcherProfile } from '@core/profile/model/researcher-profile.model'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -20,15 +29,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service'; -import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model'; -import { - NativeWindowRef, - NativeWindowService, -} from '../../../core/services/window.service'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { AlertType } from '../../../shared/alert/alert-type'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; diff --git a/src/app/item-page/orcid-page/orcid-page.component.spec.ts b/src/app/item-page/orcid-page/orcid-page.component.spec.ts index bbd8c41880e..9215cb590f6 100644 --- a/src/app/item-page/orcid-page/orcid-page.component.spec.ts +++ b/src/app/item-page/orcid-page/orcid-page.component.spec.ts @@ -12,6 +12,15 @@ import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { OrcidAuthService } from '@core/orcid/orcid-auth.service'; +import { OrcidHistoryDataService } from '@core/orcid/orcid-history-data.service'; +import { OrcidQueueDataService } from '@core/orcid/orcid-queue-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { ResearcherProfile } from '@core/profile/model/researcher-profile.model'; +import { ResearcherProfileDataService } from '@core/profile/researcher-profile-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateLoader, TranslateModule, @@ -20,15 +29,6 @@ import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { AuthService } from '../../core/auth/auth.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { OrcidAuthService } from '../../core/orcid/orcid-auth.service'; -import { OrcidHistoryDataService } from '../../core/orcid/orcid-history-data.service'; -import { OrcidQueueDataService } from '../../core/orcid/orcid-queue-data.service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model'; -import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; -import { Item } from '../../core/shared/item.model'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts index 762efb73806..47f0d013d63 100644 --- a/src/app/item-page/orcid-page/orcid-page.component.ts +++ b/src/app/item-page/orcid-page/orcid-page.component.ts @@ -14,6 +14,17 @@ import { Router, RouterLink, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { OrcidAuthService } from '@core/orcid/orcid-auth.service'; +import { ResearcherProfile } from '@core/profile/model/researcher-profile.model'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -25,17 +36,6 @@ import { take, } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { OrcidAuthService } from '../../core/orcid/orcid-auth.service'; -import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model'; -import { redirectOn4xx } from '../../core/shared/authorized.operators'; -import { Item } from '../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../core/shared/operators'; import { AlertComponent } from '../../shared/alert/alert.component'; import { AlertType } from '../../shared/alert/alert-type'; import { isNotEmpty } from '../../shared/empty.util'; diff --git a/src/app/item-page/orcid-page/orcid-page.guard.ts b/src/app/item-page/orcid-page/orcid-page.guard.ts index 2d9610bad4f..29d1f43fa8a 100644 --- a/src/app/item-page/orcid-page/orcid-page.guard.ts +++ b/src/app/item-page/orcid-page/orcid-page.guard.ts @@ -1,8 +1,8 @@ import { CanActivateFn } from '@angular/router'; +import { dsoPageSingleFeatureGuard } from '@core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { dsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { itemPageResolver } from '../item-page.resolver'; /** diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts index a32c7ef7a51..30e2d0ee182 100644 --- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts +++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts @@ -9,18 +9,18 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { OrcidQueue } from '@core/orcid/model/orcid-queue.model'; +import { OrcidAuthService } from '@core/orcid/orcid-auth.service'; +import { OrcidHistoryDataService } from '@core/orcid/orcid-history-data.service'; +import { OrcidQueueDataService } from '@core/orcid/orcid-queue-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Item } from '@core/shared/item.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model'; -import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service'; -import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service'; -import { OrcidQueueDataService } from '../../../core/orcid/orcid-queue-data.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { Item } from '../../../core/shared/item.model'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts index 10ba1a66a05..42a28677b87 100644 --- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts +++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts @@ -7,6 +7,16 @@ import { OnInit, SimpleChanges, } from '@angular/core'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { OrcidHistory } from '@core/orcid/model/orcid-history.model'; +import { OrcidQueue } from '@core/orcid/model/orcid-queue.model'; +import { OrcidAuthService } from '@core/orcid/orcid-auth.service'; +import { OrcidHistoryDataService } from '@core/orcid/orcid-history-data.service'; +import { OrcidQueueDataService } from '@core/orcid/orcid-queue-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -25,16 +35,6 @@ import { tap, } from 'rxjs/operators'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { OrcidHistory } from '../../../core/orcid/model/orcid-history.model'; -import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model'; -import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service'; -import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service'; -import { OrcidQueueDataService } from '../../../core/orcid/orcid-queue-data.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { AlertType } from '../../../shared/alert/alert-type'; import { hasValue } from '../../../shared/empty.util'; diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts index bef13782094..291b72dd9c9 100644 --- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts +++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts @@ -16,6 +16,9 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { ResearcherProfile } from '@core/profile/model/researcher-profile.model'; +import { ResearcherProfileDataService } from '@core/profile/researcher-profile-data.service'; +import { Item } from '@core/shared/item.model'; import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -25,9 +28,6 @@ import { Operation } from 'fast-json-patch'; import { getTestScheduler } from 'jasmine-marbles'; import { TestScheduler } from 'rxjs/testing'; -import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model'; -import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service'; -import { Item } from '../../../core/shared/item.model'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts index 5685627345e..389af030434 100644 --- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts +++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts @@ -11,6 +11,14 @@ import { FormsModule, UntypedFormGroup, } from '@angular/forms'; +import { RemoteData } from '@core/data/remote-data'; +import { ResearcherProfile } from '@core/profile/model/researcher-profile.model'; +import { ResearcherProfileDataService } from '@core/profile/researcher-profile-data.service'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -29,14 +37,6 @@ import { takeUntil, } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model'; -import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { AlertType } from '../../../shared/alert/alert-type'; import { hasValue } from '../../../shared/empty.util'; diff --git a/src/app/item-page/simple/access-by-token-notification/access-by-token-notification.component.spec.ts b/src/app/item-page/simple/access-by-token-notification/access-by-token-notification.component.spec.ts index 62b643ae793..15fcdbecc71 100644 --- a/src/app/item-page/simple/access-by-token-notification/access-by-token-notification.component.spec.ts +++ b/src/app/item-page/simple/access-by-token-notification/access-by-token-notification.component.spec.ts @@ -5,6 +5,11 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RequestService } from '@core/data/request.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { ItemRequest } from '@core/shared/item-request.model'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject } from 'rxjs'; @@ -12,11 +17,6 @@ import { map } from 'rxjs/operators'; import { SplitPipe } from 'src/app/shared/utils/split.pipe'; import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { RequestService } from '../../../core/data/request.service'; -import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; -import { ItemRequest } from '../../../core/shared/item-request.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub'; diff --git a/src/app/item-page/simple/access-by-token-notification/access-by-token-notification.component.ts b/src/app/item-page/simple/access-by-token-notification/access-by-token-notification.component.ts index 867cf51e18b..c77bb01396d 100644 --- a/src/app/item-page/simple/access-by-token-notification/access-by-token-notification.component.ts +++ b/src/app/item-page/simple/access-by-token-notification/access-by-token-notification.component.ts @@ -4,11 +4,11 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { ItemRequest } from '@core/shared/item-request.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { ItemRequest } from '../../../core/shared/item-request.model'; import { dateToString, stringToNgbDateStruct, diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts index f568e141adc..6fe69d4583c 100644 --- a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts +++ b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts @@ -7,6 +7,10 @@ import { import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateLoader, @@ -19,10 +23,6 @@ import { APP_CONFIG, APP_DATA_SERVICES_MAP, } from '../../../../../config/app-config.interface'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; -import { XSRFService } from '../../../../core/xsrf/xsrf.service'; import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock'; import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock'; diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.ts index 02b3ac7a3ba..d4f83a8a2c3 100644 --- a/src/app/item-page/simple/field-components/file-section/file-section.component.ts +++ b/src/app/item-page/simple/field-components/file-section/file-section.component.ts @@ -5,6 +5,13 @@ import { Input, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -15,13 +22,6 @@ import { AppConfig, } from 'src/config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { Item } from '../../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { hasValue } from '../../../../shared/empty.util'; import { ThemedFileDownloadLinkComponent } from '../../../../shared/file-download-link/themed-file-download-link.component'; import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component'; diff --git a/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts b/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts index 491ae9d2cbd..9e4e13ebb2e 100644 --- a/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts +++ b/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../../core/shared/item.model'; import { ThemedComponent } from '../../../../shared/theme-support/themed.component'; import { FileSectionComponent } from './file-section.component'; diff --git a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts index 2e17d09fc1c..3e448cabe99 100644 --- a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts @@ -8,6 +8,8 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; import { TranslateLoader, TranslateModule, @@ -15,8 +17,6 @@ import { import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { BrowseService } from '../../../../../core/browse/browse.service'; -import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub'; import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock'; diff --git a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts index 30bac0e3269..40725187841 100644 --- a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts @@ -3,8 +3,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../../../core/shared/item.model'; import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component'; import { ItemPageFieldComponent } from '../item-page-field.component'; diff --git a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts index a9dfe998bc6..b233ac1cf7d 100644 --- a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts @@ -8,6 +8,8 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; import { TranslateLoader, TranslateModule, @@ -15,8 +17,6 @@ import { import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { BrowseService } from '../../../../../core/browse/browse.service'; -import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub'; diff --git a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts index b2884198bc0..683203606b3 100644 --- a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts @@ -3,8 +3,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../../../core/shared/item.model'; import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component'; import { ItemPageFieldComponent } from '../item-page-field.component'; diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts index 264ae5ddbc9..72c2e829aa2 100644 --- a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts @@ -8,6 +8,8 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; import { TranslateLoader, TranslateModule, @@ -15,8 +17,6 @@ import { import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { BrowseService } from '../../../../../core/browse/browse.service'; -import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub'; diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts index 4aeacca73be..0afeec25149 100644 --- a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts @@ -3,8 +3,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../../../core/shared/item.model'; import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component'; import { ItemPageFieldComponent } from '../item-page-field.component'; diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts index a1ac655660a..cc396479097 100644 --- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts @@ -8,6 +8,8 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; import { TranslateLoader, TranslateModule, @@ -15,8 +17,6 @@ import { import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { BrowseService } from '../../../../../core/browse/browse.service'; -import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub'; diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts index 707fe0d928c..85b164cd48d 100644 --- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts @@ -3,8 +3,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../../../core/shared/item.model'; import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component'; import { ItemPageFieldComponent } from '../item-page-field.component'; diff --git a/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.spec.ts index b76b90ca47b..ddab149c3eb 100644 --- a/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.spec.ts @@ -7,6 +7,8 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; +import { ITEM } from '@core/shared/item.resource-type'; import { Store } from '@ngrx/store'; import { MockStore } from '@ngrx/store/testing'; import { @@ -19,8 +21,6 @@ import { APP_DATA_SERVICES_MAP, } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; -import { ITEM } from '../../../../../core/shared/item.resource-type'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock'; import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component'; diff --git a/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.ts index 232237fbc02..227e9ebe230 100644 --- a/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.ts @@ -3,9 +3,9 @@ import { Input, OnInit, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; import { TranslatePipe } from '@ngx-translate/core'; -import { Item } from '../../../../../core/shared/item.model'; import { hasValue, isNotEmpty, diff --git a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts index 18c02d95f65..e8e1b02117c 100644 --- a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts @@ -7,6 +7,8 @@ import { TestBed, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; import { TranslateLoader, TranslateModule, @@ -14,8 +16,6 @@ import { import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { BrowseService } from '../../../../../core/browse/browse.service'; -import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub'; import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock'; diff --git a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts index 48bbdee20ec..daa7a59a8ec 100644 --- a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts @@ -3,8 +3,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../../../core/shared/item.model'; import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component'; import { ImageField } from '../image-field'; import { ItemPageFieldComponent } from '../item-page-field.component'; diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts index 6d654effe74..2be9517ae56 100644 --- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts @@ -9,6 +9,14 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; +import { Item } from '@core/shared/item.model'; +import { MathService } from '@core/shared/math.service'; +import { + MetadataMap, + MetadataValue, +} from '@core/shared/metadata.models'; import { TranslateLoader, TranslateModule, @@ -16,14 +24,6 @@ import { import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment'; -import { BrowseService } from '../../../../core/browse/browse.service'; -import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; -import { Item } from '../../../../core/shared/item.model'; -import { MathService } from '../../../../core/shared/math.service'; -import { - MetadataMap, - MetadataValue, -} from '../../../../core/shared/metadata.models'; import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub'; diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts index fb923edbfcf..854acc40281 100644 --- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts @@ -3,6 +3,15 @@ import { Component, Input, } from '@angular/core'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getPaginatedListPayload, + getRemoteDataPayload, +} from '@core/shared/operators'; import intersectionWith from 'lodash/intersectionWith'; import { Observable } from 'rxjs'; import { @@ -11,15 +20,6 @@ import { take, } from 'rxjs/operators'; -import { BrowseService } from '../../../../core/browse/browse.service'; -import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; -import { BrowseDefinition } from '../../../../core/shared/browse-definition.model'; -import { Item } from '../../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getPaginatedListPayload, - getRemoteDataPayload, -} from '../../../../core/shared/operators'; import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component'; import { ImageField } from './image-field'; diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts index fb4c46a8a85..56a43e0c110 100644 --- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts @@ -3,11 +3,10 @@ import { Component, Input, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { Item } from '../../../../../core/shared/item.model'; - @Component({ selector: 'ds-base-item-page-title-field', templateUrl: './item-page-title-field.component.html', diff --git a/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts index c047ab1223e..d644237ccf5 100644 --- a/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../../../core/shared/item.model'; import { ThemedComponent } from '../../../../../shared/theme-support/themed.component'; import { ItemPageTitleFieldComponent } from './item-page-title-field.component'; diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts index 53edcab28ee..1921dd69e62 100644 --- a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts @@ -7,6 +7,8 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; import { TranslateLoader, TranslateModule, @@ -14,8 +16,6 @@ import { import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { BrowseService } from '../../../../../core/browse/browse.service'; -import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub'; import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock'; diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts index 1385659baf5..6923f0726e6 100644 --- a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../../../core/shared/item.model'; import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component'; import { ItemPageFieldComponent } from '../item-page-field.component'; diff --git a/src/app/item-page/simple/item-page.component.spec.ts b/src/app/item-page/simple/item-page.component.spec.ts index 0f3b4b72eb1..b8687ba4373 100644 --- a/src/app/item-page/simple/item-page.component.spec.ts +++ b/src/app/item-page/simple/item-page.component.spec.ts @@ -14,23 +14,23 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { NotifyInfoService } from '@core/coar-notify/notify-info/notify-info.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { SignpostingDataService } from '@core/data/signposting-data.service'; +import { SignpostingLink } from '@core/data/signposting-links.model'; +import { + LinkDefinition, + LinkHeadService, +} from '@core/services/link-head.service'; +import { ServerResponseService } from '@core/services/server-response.service'; +import { Item } from '@core/shared/item.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { SignpostingDataService } from '../../core/data/signposting-data.service'; -import { SignpostingLink } from '../../core/data/signposting-links.model'; -import { - LinkDefinition, - LinkHeadService, -} from '../../core/services/link-head.service'; -import { ServerResponseService } from '../../core/services/server-response.service'; -import { Item } from '../../core/shared/item.model'; import { ErrorComponent } from '../../shared/error/error.component'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts index 01917e71475..763dda9c038 100644 --- a/src/app/item-page/simple/item-page.component.ts +++ b/src/app/item-page/simple/item-page.component.ts @@ -14,6 +14,21 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { SignpostingDataService } from '@core/data/signposting-data.service'; +import { SignpostingLink } from '@core/data/signposting-links.model'; +import { + LinkDefinition, + LinkHeadService, +} from '@core/services/link-head.service'; +import { ServerResponseService } from '@core/services/server-response.service'; +import { Item } from '@core/shared/item.model'; +import { ItemRequest } from '@core/shared/item-request.model'; +import { getAllSucceededRemoteDataPayload } from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { combineLatest, @@ -27,21 +42,6 @@ import { } from 'rxjs/operators'; import { NotifyInfoService } from 'src/app/core/coar-notify/notify-info/notify-info.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { SignpostingDataService } from '../../core/data/signposting-data.service'; -import { SignpostingLink } from '../../core/data/signposting-links.model'; -import { - LinkDefinition, - LinkHeadService, -} from '../../core/services/link-head.service'; -import { ServerResponseService } from '../../core/services/server-response.service'; -import { Item } from '../../core/shared/item.model'; -import { ItemRequest } from '../../core/shared/item-request.model'; -import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { fadeInOut } from '../../shared/animations/fade'; import { hasValue, diff --git a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts index 49c486b16b2..ced2801405c 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts +++ b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts @@ -12,6 +12,26 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { VersionDataService } from '@core/data/version-data.service'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { RouteService } from '@core/services/route.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; +import { MetadataMap } from '@core/shared/metadata.models'; +import { SearchService } from '@core/shared/search/search.service'; +import { UUIDService } from '@core/shared/uuid.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { Store } from '@ngrx/store'; import { TranslateLoader, @@ -27,26 +47,6 @@ import { APP_DATA_SERVICES_MAP, } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment.test'; -import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; -import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service'; -import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service'; -import { ItemDataService } from '../../../../core/data/item-data.service'; -import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { VersionDataService } from '../../../../core/data/version-data.service'; -import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; -import { RouteService } from '../../../../core/services/route.service'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; -import { Item } from '../../../../core/shared/item.model'; -import { MetadataMap } from '../../../../core/shared/metadata.models'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { UUIDService } from '../../../../core/shared/uuid.service'; -import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service'; import { DsoEditMenuComponent } from '../../../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { mockTruncatableService } from '../../../../shared/mocks/mock-trucatable.service'; diff --git a/src/app/item-page/simple/item-types/publication/publication.component.ts b/src/app/item-page/simple/item-types/publication/publication.component.ts index b12527002e5..1de71e9a5bc 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.ts +++ b/src/app/item-page/simple/item-types/publication/publication.component.ts @@ -4,9 +4,9 @@ import { Component, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { DsoEditMenuComponent } from '../../../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts b/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts index a39b345bf05..f007a54597d 100644 --- a/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts +++ b/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts @@ -2,6 +2,8 @@ import { DefaultUrlSerializer, UrlTree, } from '@angular/router'; +import { RouteService } from '@core/services/route.service'; +import { Item } from '@core/shared/item.model'; import { Observable } from 'rxjs'; import { filter, @@ -9,9 +11,6 @@ import { take, } from 'rxjs/operators'; -import { RouteService } from '../../../../core/services/route.service'; -import { Item } from '../../../../core/shared/item.model'; - export const isIiifEnabled = (item: Item) => { return !!item.firstMetadataValue('dspace.iiif.enabled'); diff --git a/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts b/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts index 10b4c4bd327..9a9082d6d3e 100644 --- a/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts +++ b/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts @@ -1,4 +1,9 @@ import { InjectionToken } from '@angular/core'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { combineLatest as observableCombineLatest, Observable, @@ -12,11 +17,6 @@ import { switchMap, } from 'rxjs/operators'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Item } from '../../../../core/shared/item.model'; -import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { hasValue } from '../../../../shared/empty.util'; export const PAGINATED_RELATIONS_TO_ITEMS_OPERATOR = new InjectionToken<(thisId: string) => (source: Observable>>) => Observable>>>('paginatedRelationsToItems', { diff --git a/src/app/item-page/simple/item-types/shared/item.component.spec.ts b/src/app/item-page/simple/item-types/shared/item.component.spec.ts index 82a98a7f88e..b2f25a15a9f 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.spec.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.spec.ts @@ -13,6 +13,33 @@ import { import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { VersionDataService } from '@core/data/version-data.service'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { ResearcherProfileDataService } from '@core/profile/researcher-profile-data.service'; +import { RouteService } from '@core/services/route.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { UUIDService } from '@core/shared/uuid.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { Store } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; import { @@ -25,33 +52,6 @@ import { } from 'rxjs'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; -import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service'; -import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { ItemDataService } from '../../../../core/data/item-data.service'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { VersionDataService } from '../../../../core/data/version-data.service'; -import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; -import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service'; -import { RouteService } from '../../../../core/services/route.service'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; -import { Item } from '../../../../core/shared/item.model'; -import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; -import { PageInfo } from '../../../../core/shared/page-info.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { UUIDService } from '../../../../core/shared/uuid.service'; -import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service'; import { DsoEditMenuComponent } from '../../../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { isNotEmpty } from '../../../../shared/empty.util'; import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts index 9812f836122..66e0c49bee4 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.ts @@ -4,6 +4,9 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; +import { RouteService } from '@core/services/route.service'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { Observable } from 'rxjs'; import { map, @@ -11,9 +14,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../../../environments/environment'; -import { RouteService } from '../../../../core/services/route.service'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { getItemPageRoute } from '../../../item-page-routing-paths'; import { getDSpaceQuery, diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts index a7a491f61b1..59b970e24a7 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts @@ -12,6 +12,26 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { VersionDataService } from '@core/data/version-data.service'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { RouteService } from '@core/services/route.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; +import { MetadataMap } from '@core/shared/metadata.models'; +import { SearchService } from '@core/shared/search/search.service'; +import { UUIDService } from '@core/shared/uuid.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { Store } from '@ngrx/store'; import { TranslateLoader, @@ -26,26 +46,6 @@ import { ConfigurationDataServiceStub } from 'src/app/shared/testing/configurati import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment.test'; -import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; -import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service'; -import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service'; -import { ItemDataService } from '../../../../core/data/item-data.service'; -import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { VersionDataService } from '../../../../core/data/version-data.service'; -import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; -import { RouteService } from '../../../../core/services/route.service'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; -import { Item } from '../../../../core/shared/item.model'; -import { MetadataMap } from '../../../../core/shared/metadata.models'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { UUIDService } from '../../../../core/shared/uuid.service'; -import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service'; import { DsoEditMenuComponent } from '../../../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { mockTruncatableService } from '../../../../shared/mocks/mock-trucatable.service'; diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts index a5b7f396ce4..1085740a75c 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts @@ -4,10 +4,10 @@ import { Component, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { DsoEditMenuComponent } from '../../../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts index 52943c7238c..81e881490ae 100644 --- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts +++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts @@ -8,16 +8,16 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { ItemMetadataRepresentation } from '@core/shared/metadata-representation/item/item-metadata-representation.model'; +import { MetadatumRepresentation } from '@core/shared/metadata-representation/metadatum/metadatum-representation.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { BrowseDefinitionDataService } from '../../../core/browse/browse-definition-data.service'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { Item } from '../../../core/shared/item.model'; -import { MetadataValue } from '../../../core/shared/metadata.models'; -import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model'; -import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { MetadataRepresentationLoaderComponent } from '../../../shared/metadata-representation/metadata-representation-loader.component'; diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts index 33d981adcc7..c9493ab790e 100644 --- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts +++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts @@ -3,6 +3,15 @@ import { Component, Input, } from '@angular/core'; +import { BrowseService } from '@core/browse/browse.service'; +import { BrowseDefinitionDataService } from '@core/browse/browse-definition-data.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { MetadataService } from '@core/metadata/metadata.service'; +import { Item } from '@core/shared/item.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { MetadataRepresentation } from '@core/shared/metadata-representation/metadata-representation.model'; +import { MetadatumRepresentation } from '@core/shared/metadata-representation/metadatum/metadatum-representation.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, @@ -10,15 +19,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { BrowseService } from '../../../core/browse/browse.service'; -import { BrowseDefinitionDataService } from '../../../core/browse/browse-definition-data.service'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { MetadataService } from '../../../core/metadata/metadata.service'; -import { Item } from '../../../core/shared/item.model'; -import { MetadataValue } from '../../../core/shared/metadata.models'; -import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model'; -import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { MetadataRepresentationLoaderComponent } from '../../../shared/metadata-representation/metadata-representation-loader.component'; diff --git a/src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts index 72ffe9ea7d1..c0a5f8abfc1 100644 --- a/src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts +++ b/src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../core/shared/item.model'; import { ThemedComponent } from '../../../shared/theme-support/themed.component'; import { MetadataRepresentationListComponent } from './metadata-representation-list.component'; diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts index d1702385985..93b9900a404 100644 --- a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts +++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts @@ -8,17 +8,17 @@ import { Input, OnInit, } from '@angular/core'; +import { NotifyRequestsStatusDataService } from '@core/data/notify-services-status-data.service'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { filter, map, Observable, } from 'rxjs'; -import { NotifyRequestsStatusDataService } from '../../../../core/data/notify-services-status-data.service'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../../core/shared/operators'; import { hasValue } from '../../../../shared/empty.util'; import { NotifyRequestsStatus, diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts index 92a067c20a5..8651fa8f6a9 100644 --- a/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts +++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts @@ -1,15 +1,15 @@ // eslint-disable-next-line max-classes-per-file +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, inheritSerialization, } from 'cerialize'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { CacheableObject } from '../../../core/cache/cacheable-object.model'; -import { HALLink } from '../../../core/shared/hal-link.model'; -import { ResourceType } from '../../../core/shared/resource-type'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; import { NOTIFYREQUEST } from './notify-requests-status.resource-type'; import { RequestStatusEnum } from './notify-status.enum'; diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts index a450b0462bb..e55b4bc8eb6 100644 --- a/src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts +++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for the root endpoint diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts index 16141b0359b..9d4ce20895d 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts @@ -5,18 +5,18 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RequestService } from '@core/data/request.service'; +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; +import { QualityAssuranceSourceDataService } from '@core/notifications/qa/source/quality-assurance-source-data.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { SplitPipe } from 'src/app/shared/utils/split.pipe'; import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; -import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { RequestService } from '../../../core/data/request.service'; -import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; -import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service'; -import { HALEndpointService } from '../../../core/shared/hal-endpoint.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts index caae8a4b287..8a43d93705f 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts @@ -7,6 +7,14 @@ import { SimpleChanges, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; +import { QualityAssuranceSourceDataService } from '@core/notifications/qa/source/quality-assurance-source-data.service'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { @@ -15,14 +23,6 @@ import { } from 'rxjs/operators'; import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths'; -import { RequestParam } from '../../../core/cache/models/request-param.model'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; -import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { SplitPipe } from '../../../shared/utils/split.pipe'; @Component({ diff --git a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts index 6771665362e..8ccd94b00b8 100644 --- a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts +++ b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts @@ -6,9 +6,9 @@ import { } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Item } from '../../../../core/shared/item.model'; import { ThemedConfigurationSearchPageComponent } from '../../../../search-page/themed-configuration-search-page.component'; import { RelatedEntitiesSearchComponent } from './related-entities-search.component'; diff --git a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts index 824b3849245..7d216b52e7a 100644 --- a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts +++ b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts @@ -3,8 +3,8 @@ import { Input, OnInit, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../../core/shared/item.model'; import { ThemedConfigurationSearchPageComponent } from '../../../../search-page/themed-configuration-search-page.component'; import { isNotEmpty } from '../../../../shared/empty.util'; import { getFilterByRelation } from '../../../../shared/utils/relation-query.utils'; diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts index 9a00ea3e406..fe18e77d1ff 100644 --- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts +++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts @@ -9,11 +9,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { Item } from '@core/shared/item.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Item } from '../../../../core/shared/item.model'; import { RouterMock } from '../../../../shared/mocks/router.mock'; import { VarDirective } from '../../../../shared/utils/var.directive'; import { RelatedEntitiesSearchComponent } from '../related-entities-search/related-entities-search.component'; diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts index f0a82285376..b48328e5f0c 100644 --- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts +++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts @@ -8,12 +8,12 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { Item } from '@core/shared/item.model'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { Item } from '../../../../core/shared/item.model'; import { VarDirective } from '../../../../shared/utils/var.directive'; import { RelatedEntitiesSearchComponent } from '../related-entities-search/related-entities-search.component'; diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts index 085bf7ebf80..d21cfd951e7 100644 --- a/src/app/item-page/simple/related-items/related-items-component.ts +++ b/src/app/item-page/simple/related-items/related-items-component.ts @@ -11,6 +11,12 @@ import { OnInit, PLATFORM_ID, } from '@angular/core'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; @@ -18,12 +24,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../config/app-config.interface'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Item } from '../../../core/shared/item.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; diff --git a/src/app/item-page/simple/related-items/related-items.component.spec.ts b/src/app/item-page/simple/related-items/related-items.component.spec.ts index 229cf035052..bba695a28d3 100644 --- a/src/app/item-page/simple/related-items/related-items.component.spec.ts +++ b/src/app/item-page/simple/related-items/related-items.component.spec.ts @@ -8,12 +8,12 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../config/app-config.interface'; -import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { Item } from '../../../core/shared/item.model'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { getMockThemeService } from '../../../shared/mocks/theme-service.mock'; diff --git a/src/app/item-page/version-page/version-page/version-page.component.spec.ts b/src/app/item-page/version-page/version-page/version-page.component.spec.ts index 92526eb43b4..73214d99961 100644 --- a/src/app/item-page/version-page/version-page/version-page.component.spec.ts +++ b/src/app/item-page/version-page/version-page/version-page.component.spec.ts @@ -6,12 +6,12 @@ import { } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { VersionDataService } from '@core/data/version-data.service'; +import { Item } from '@core/shared/item.model'; +import { Version } from '@core/shared/version.model'; import { of } from 'rxjs'; -import { AuthService } from '../../../core/auth/auth.service'; -import { VersionDataService } from '../../../core/data/version-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { Version } from '../../../core/shared/version.model'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$, diff --git a/src/app/item-page/version-page/version-page/version-page.component.ts b/src/app/item-page/version-page/version-page/version-page.component.ts index 17193edffe8..70acbbe21db 100644 --- a/src/app/item-page/version-page/version-page/version-page.component.ts +++ b/src/app/item-page/version-page/version-page/version-page.component.ts @@ -6,6 +6,16 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { RemoteData } from '@core/data/remote-data'; +import { VersionDataService } from '@core/data/version-data.service'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { Version } from '@core/shared/version.model'; import { Observable } from 'rxjs'; import { map, @@ -13,16 +23,6 @@ import { } from 'rxjs/operators'; import { getPageNotFoundRoute } from '../../../app-routing-paths'; -import { AuthService } from '../../../core/auth/auth.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { VersionDataService } from '../../../core/data/version-data.service'; -import { redirectOn4xx } from '../../../core/shared/authorized.operators'; -import { Item } from '../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; -import { Version } from '../../../core/shared/version.model'; import { getItemPageRoute } from '../../item-page-routing-paths'; @Component({ diff --git a/src/app/item-page/version-page/version.resolver.ts b/src/app/item-page/version-page/version.resolver.ts index 0364d4ac0df..019e61ed696 100644 --- a/src/app/item-page/version-page/version.resolver.ts +++ b/src/app/item-page/version-page/version.resolver.ts @@ -4,15 +4,15 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { VersionDataService } from '@core/data/version-data.service'; +import { ResolvedAction } from '@core/resolving/resolver.actions'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { Version } from '@core/shared/version.model'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { AppState } from '../../app.reducer'; -import { RemoteData } from '../../core/data/remote-data'; -import { VersionDataService } from '../../core/data/version-data.service'; -import { ResolvedAction } from '../../core/resolving/resolver.actions'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { Version } from '../../core/shared/version.model'; import { followLink, FollowLinkConfig, diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.spec.ts b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.spec.ts index 40c26929895..dae60aaac1a 100644 --- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.spec.ts +++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.spec.ts @@ -17,21 +17,21 @@ import { ActivatedRoute, RouterModule, } from '@angular/router'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { VersionDataService } from '@core/data/version-data.service'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { Item } from '@core/shared/item.model'; +import { Version } from '@core/shared/version.model'; +import { VersionHistory } from '@core/shared/version-history.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { EMPTY, of, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { VersionDataService } from '../../../core/data/version-data.service'; -import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { Version } from '../../../core/shared/version.model'; -import { VersionHistory } from '../../../core/shared/version-history.model'; -import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; -import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts index 6d1b8f8e9fd..04a173daa90 100644 --- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts +++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts @@ -13,6 +13,22 @@ import { Router, RouterLink, } from '@angular/router'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { VersionDataService } from '@core/data/version-data.service'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { Version } from '@core/shared/version.model'; +import { VersionHistory } from '@core/shared/version-history.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -32,22 +48,6 @@ import { tap, } from 'rxjs/operators'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { VersionDataService } from '../../../core/data/version-data.service'; -import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; -import { Version } from '../../../core/shared/version.model'; -import { VersionHistory } from '../../../core/shared/version-history.model'; -import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; -import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; -import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { diff --git a/src/app/item-page/versions/item-versions-shared.service.spec.ts b/src/app/item-page/versions/item-versions-shared.service.spec.ts index 15ead8f6b57..40c4b8c2791 100644 --- a/src/app/item-page/versions/item-versions-shared.service.spec.ts +++ b/src/app/item-page/versions/item-versions-shared.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { VersionDataService } from '@core/data/version-data.service'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { Version } from '@core/shared/version.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { TranslateService } from '@ngx-translate/core'; -import { AuthService } from '../../core/auth/auth.service'; -import { VersionDataService } from '../../core/data/version-data.service'; -import { VersionHistoryDataService } from '../../core/data/version-history-data.service'; -import { Version } from '../../core/shared/version.model'; -import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service'; -import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { createFailedRemoteDataObject, diff --git a/src/app/item-page/versions/item-versions-shared.service.ts b/src/app/item-page/versions/item-versions-shared.service.ts index dd35434d62c..7fb10508e98 100644 --- a/src/app/item-page/versions/item-versions-shared.service.ts +++ b/src/app/item-page/versions/item-versions-shared.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { RemoteData } from '@core/data/remote-data'; +import { Version } from '@core/shared/version.model'; import { TranslateService } from '@ngx-translate/core'; -import { RemoteData } from '../../core/data/remote-data'; -import { Version } from '../../core/shared/version.model'; import { NotificationsService } from '../../shared/notifications/notifications.service'; @Injectable({ diff --git a/src/app/item-page/versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts index f72547882a8..6523dde382c 100644 --- a/src/app/item-page/versions/item-versions.component.spec.ts +++ b/src/app/item-page/versions/item-versions.component.spec.ts @@ -21,25 +21,25 @@ import { ActivatedRoute, RouterModule, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ItemDataService } from '@core/data/item-data.service'; +import { VersionDataService } from '@core/data/version-data.service'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Item } from '@core/shared/item.model'; +import { Version } from '@core/shared/version.model'; +import { VersionHistory } from '@core/shared/version-history.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { EMPTY, of, } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { VersionDataService } from '../../core/data/version-data.service'; -import { VersionHistoryDataService } from '../../core/data/version-history-data.service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { Item } from '../../core/shared/item.model'; -import { Version } from '../../core/shared/version.model'; -import { VersionHistory } from '../../core/shared/version-history.model'; -import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service'; -import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; import { AlertComponent } from '../../shared/alert/alert.component'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts index daddb5e3a13..c85ddf73e45 100644 --- a/src/app/item-page/versions/item-versions.component.ts +++ b/src/app/item-page/versions/item-versions.component.ts @@ -10,6 +10,24 @@ import { OnInit, } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { VersionDataService } from '@core/data/version-data.service'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Item } from '@core/shared/item.model'; +import { + getAllSucceededRemoteData, + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getFirstSucceededRemoteDataPayload, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { Version } from '@core/shared/version.model'; +import { VersionHistory } from '@core/shared/version-history.model'; import { TranslateModule, TranslateService, @@ -26,24 +44,6 @@ import { take, } from 'rxjs/operators'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { VersionDataService } from '../../core/data/version-data.service'; -import { VersionHistoryDataService } from '../../core/data/version-history-data.service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { Item } from '../../core/shared/item.model'; -import { - getAllSucceededRemoteData, - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getFirstSucceededRemoteDataPayload, - getRemoteDataPayload, -} from '../../core/shared/operators'; -import { Version } from '../../core/shared/version.model'; -import { VersionHistory } from '../../core/shared/version-history.model'; import { AlertComponent } from '../../shared/alert/alert.component'; import { AlertType } from '../../shared/alert/alert-type'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts b/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts index fd3c5096359..50e5ccad61f 100644 --- a/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts +++ b/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts @@ -7,14 +7,14 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { Item } from '@core/shared/item.model'; +import { Version } from '@core/shared/version.model'; +import { VersionHistory } from '@core/shared/version-history.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { take } from 'rxjs/operators'; -import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { Version } from '../../../core/shared/version.model'; -import { VersionHistory } from '../../../core/shared/version-history.model'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { createPaginatedList } from '../../../shared/testing/utils.test'; import { ItemVersionsNoticeComponent } from './item-versions-notice.component'; diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.ts b/src/app/item-page/versions/notice/item-versions-notice.component.ts index 2f506718977..4ceef96b7f8 100644 --- a/src/app/item-page/versions/notice/item-versions-notice.component.ts +++ b/src/app/item-page/versions/notice/item-versions-notice.component.ts @@ -4,6 +4,16 @@ import { Input, OnInit, } from '@angular/core'; +import { RemoteData } from '@core/data/remote-data'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { Item } from '@core/shared/item.model'; +import { + getAllSucceededRemoteData, + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { Version } from '@core/shared/version.model'; +import { VersionHistory } from '@core/shared/version-history.model'; import { TranslateModule } from '@ngx-translate/core'; import { EMPTY, @@ -16,16 +26,6 @@ import { switchMap, } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { - getAllSucceededRemoteData, - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; -import { Version } from '../../../core/shared/version.model'; -import { VersionHistory } from '../../../core/shared/version-history.model'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { AlertType } from '../../../shared/alert/alert-type'; import { diff --git a/src/app/login-page/login-page-routes.ts b/src/app/login-page/login-page-routes.ts index 661c9f9858a..c24698d84c5 100644 --- a/src/app/login-page/login-page-routes.ts +++ b/src/app/login-page/login-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedLoginPageComponent } from './themed-login-page.component'; export const ROUTES: Route[] = [ diff --git a/src/app/login-page/login-page.component.spec.ts b/src/app/login-page/login-page.component.spec.ts index 94416492f31..7314dd6077a 100644 --- a/src/app/login-page/login-page.component.spec.ts +++ b/src/app/login-page/login-page.component.spec.ts @@ -5,14 +5,14 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { Store } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../config/app-config.interface'; -import { AuthService } from '../core/auth/auth.service'; -import { XSRFService } from '../core/xsrf/xsrf.service'; import { AuthServiceMock } from '../shared/mocks/auth.service.mock'; import { ActivatedRouteStub } from '../shared/testing/active-router.stub'; import { LoginPageComponent } from './login-page.component'; diff --git a/src/app/login-page/login-page.component.ts b/src/app/login-page/login-page.component.ts index 2138c8efb33..b57b0e2e6e1 100644 --- a/src/app/login-page/login-page.component.ts +++ b/src/app/login-page/login-page.component.ts @@ -4,6 +4,14 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { + AddAuthenticationMessageAction, + AuthenticatedAction, + AuthenticationSuccessAction, + ResetAuthenticationMessagesAction, +} from '@core/auth/auth.actions'; +import { AuthTokenInfo } from '@core/auth/models/auth-token-info.model'; +import { isAuthenticated } from '@core/auth/selectors'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -16,14 +24,6 @@ import { } from 'rxjs/operators'; import { AppState } from '../app.reducer'; -import { - AddAuthenticationMessageAction, - AuthenticatedAction, - AuthenticationSuccessAction, - ResetAuthenticationMessagesAction, -} from '../core/auth/auth.actions'; -import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model'; -import { isAuthenticated } from '../core/auth/selectors'; import { hasValue, isNotEmpty, diff --git a/src/app/logout-page/logout-page-routes.ts b/src/app/logout-page/logout-page-routes.ts index ad6478d642e..603d8c8849a 100644 --- a/src/app/logout-page/logout-page-routes.ts +++ b/src/app/logout-page/logout-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; import { ThemedLogoutPageComponent } from './themed-logout-page.component'; export const ROUTES: Route[] = [ diff --git a/src/app/lookup-by-id/lookup-guard.spec.ts b/src/app/lookup-by-id/lookup-guard.spec.ts index b3a5ad6ccdc..047756071cf 100644 --- a/src/app/lookup-by-id/lookup-guard.spec.ts +++ b/src/app/lookup-by-id/lookup-guard.spec.ts @@ -1,6 +1,6 @@ +import { IdentifierType } from '@core/data/request.models'; import { of } from 'rxjs'; -import { IdentifierType } from '../core/data/request.models'; import { lookupGuard } from './lookup-guard'; describe('lookupGuard', () => { diff --git a/src/app/lookup-by-id/lookup-guard.ts b/src/app/lookup-by-id/lookup-guard.ts index 25813d28ff5..60424c511ba 100644 --- a/src/app/lookup-by-id/lookup-guard.ts +++ b/src/app/lookup-by-id/lookup-guard.ts @@ -4,14 +4,13 @@ import { CanActivateFn, RouterStateSnapshot, } from '@angular/router'; +import { DsoRedirectService } from '@core/data/dso-redirect.service'; +import { RemoteData } from '@core/data/remote-data'; +import { IdentifierType } from '@core/data/request.models'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { DsoRedirectService } from '../core/data/dso-redirect.service'; -import { RemoteData } from '../core/data/remote-data'; -import { IdentifierType } from '../core/data/request.models'; -import { DSpaceObject } from '../core/shared/dspace-object.model'; - interface LookupParams { type: IdentifierType; id: string; diff --git a/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts b/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts index 3740e6fa57f..06cae9ebff6 100644 --- a/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts +++ b/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts @@ -11,6 +11,12 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -23,12 +29,6 @@ import { import { Observable } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { CollectionDataService } from '../../core/data/collection-data.service'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Collection } from '../../core/shared/collection.model'; -import { Community } from '../../core/shared/community.model'; import { CollectionDropdownComponent } from '../../shared/collection-dropdown/collection-dropdown.component'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; import { diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts index 098e1f51cc6..025e250680b 100644 --- a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts +++ b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts @@ -1,3 +1,8 @@ +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { Context } from '@core/shared/context.model'; import { cold, hot, @@ -5,11 +10,6 @@ import { import { of } from 'rxjs'; import { environment } from '../../environments/environment.test'; -import { - SortDirection, - SortOptions, -} from '../core/cache/models/sort-options.model'; -import { Context } from '../core/shared/context.model'; import { getMockRemoteDataBuildService } from '../shared/mocks/remote-data-build.service.mock'; import { RoleServiceMock } from '../shared/mocks/role-service.mock'; import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model'; diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.ts b/src/app/my-dspace-page/my-dspace-configuration.service.ts index 9a7f3764046..1918594dca2 100644 --- a/src/app/my-dspace-page/my-dspace-configuration.service.ts +++ b/src/app/my-dspace-page/my-dspace-configuration.service.ts @@ -4,6 +4,19 @@ import { InjectionToken, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { RequestService } from '@core/data/request.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { RoleService } from '@core/roles/role.service'; +import { RouteService } from '@core/services/route.service'; +import { Context } from '@core/shared/context.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { combineLatest, Observable, @@ -17,19 +30,6 @@ import { APP_CONFIG, AppConfig, } from '../../config/app-config.interface'; -import { LinkService } from '../core/cache/builders/link.service'; -import { RemoteDataBuildService } from '../core/cache/builders/remote-data-build.service'; -import { - SortDirection, - SortOptions, -} from '../core/cache/models/sort-options.model'; -import { RequestService } from '../core/data/request.service'; -import { PaginationService } from '../core/pagination/pagination.service'; -import { RoleService } from '../core/roles/role.service'; -import { RouteService } from '../core/services/route.service'; -import { Context } from '../core/shared/context.model'; -import { HALEndpointService } from '../core/shared/hal-endpoint.service'; -import { SearchConfigurationService } from '../core/shared/search/search-configuration.service'; import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model'; import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model'; import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type'; diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts index 4b5563836c5..1cd4769e201 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts @@ -12,13 +12,13 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { ResourceType } from '@core/shared/resource-type'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; -import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { ResourceType } from '../../../core/shared/resource-type'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { RouterStub } from '../../../shared/testing/router.stub'; import { diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts index f5f3f4f314c..9514a209aa0 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts @@ -5,6 +5,11 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -19,11 +24,6 @@ import { take, } from 'rxjs/operators'; -import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { hasValue } from '../../../shared/empty.util'; import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component'; diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts index d698f02f427..2cf10f129a3 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts @@ -11,14 +11,14 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { ResourceType } from '@core/shared/resource-type'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; -import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { ResourceType } from '../../../core/shared/resource-type'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { createPaginatedList, diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts index 4c5ac8e7f36..cf3eacd7eb2 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts @@ -4,6 +4,11 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; import { NgbDropdownModule, NgbModal, @@ -20,11 +25,6 @@ import { take, } from 'rxjs/operators'; -import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { ThemedCreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component'; import { hasValue } from '../../../shared/empty.util'; diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts index ad2ef073d84..6bb0158cf96 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts @@ -11,6 +11,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { DragService } from '@core/drag.service'; +import { CookieService } from '@core/services/cookie.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { NgbModal, NgbModule, @@ -21,11 +26,6 @@ import { } from '@ngx-translate/core'; import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to'; -import { AuthService } from '../../core/auth/auth.service'; -import { EntityTypeDataService } from '../../core/data/entity-type-data.service'; -import { DragService } from '../../core/drag.service'; -import { CookieService } from '../../core/services/cookie.service'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; import { HostWindowService } from '../../shared/host-window.service'; import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock'; import { HttpXsrfTokenExtractorMock } from '../../shared/mocks/http-xsrf-token-extractor.mock'; diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts index 7d014b93936..db66680125a 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts @@ -9,14 +9,14 @@ import { ViewChild, } from '@angular/core'; import { Router } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; import { first } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; import { hasValue } from '../../shared/empty.util'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { SearchResult } from '../../shared/search/models/search-result.model'; diff --git a/src/app/my-dspace-page/my-dspace-page-routes.ts b/src/app/my-dspace-page/my-dspace-page-routes.ts index 1e92bd7bb3d..56a87800ff2 100644 --- a/src/app/my-dspace-page/my-dspace-page-routes.ts +++ b/src/app/my-dspace-page/my-dspace-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { myDSpaceGuard } from './my-dspace.guard'; import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component'; diff --git a/src/app/my-dspace-page/my-dspace-page.component.spec.ts b/src/app/my-dspace-page/my-dspace-page.component.spec.ts index bc0ea5e88cc..c60f0261ecb 100644 --- a/src/app/my-dspace-page/my-dspace-page.component.spec.ts +++ b/src/app/my-dspace-page/my-dspace-page.component.spec.ts @@ -8,14 +8,14 @@ import { } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { RoleService } from '@core/roles/role.service'; +import { Context } from '@core/shared/context.model'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { RoleService } from '../core/roles/role.service'; -import { Context } from '../core/shared/context.model'; -import { SearchService } from '../core/shared/search/search.service'; import { getMockThemeService } from '../shared/mocks/theme-service.mock'; import { RoleDirective } from '../shared/roles/role.directive'; import { ThemedSearchComponent } from '../shared/search/themed-search.component'; diff --git a/src/app/my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts index 0e2598e201e..3978a21034c 100644 --- a/src/app/my-dspace-page/my-dspace-page.component.ts +++ b/src/app/my-dspace-page/my-dspace-page.component.ts @@ -5,15 +5,15 @@ import { Inject, OnInit, } from '@angular/core'; +import { MyDSpaceResponseParsingService } from '@core/data/mydspace-response-parsing.service'; +import { MyDSpaceRequest } from '@core/data/request.models'; +import { RoleType } from '@core/roles/role-types'; +import { Context } from '@core/shared/context.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; -import { MyDSpaceResponseParsingService } from '../core/data/mydspace-response-parsing.service'; -import { MyDSpaceRequest } from '../core/data/request.models'; -import { RoleType } from '../core/roles/role-types'; -import { Context } from '../core/shared/context.model'; -import { SearchService } from '../core/shared/search/search.service'; -import { ViewMode } from '../core/shared/view-mode.model'; import { SuggestionsNotificationComponent } from '../notifications/suggestions/notification/suggestions-notification.component'; import { RoleDirective } from '../shared/roles/role.directive'; import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model'; diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts index c709e6ff0ba..e8a72619b8f 100644 --- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts +++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts @@ -2,11 +2,11 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { QualityAssuranceSourceDataService } from '@core/notifications/qa/source/quality-assurance-source-data.service'; import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model'; import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils'; import { createPaginatedList } from 'src/app/shared/testing/utils.test'; -import { QualityAssuranceSourceDataService } from '../../core/notifications/qa/source/quality-assurance-source-data.service'; import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications.component'; describe('MyDspaceQaEventsNotificationsComponent', () => { diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts index d9a22478845..02f06622581 100644 --- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts +++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts @@ -5,6 +5,12 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { QualityAssuranceSourceDataService } from '@core/notifications/qa/source/quality-assurance-source-data.service'; +import { + getFirstCompletedRemoteData, + getPaginatedListPayload, + getRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, @@ -14,12 +20,6 @@ import { import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model'; import { getNotificatioQualityAssuranceRoute } from '../../admin/admin-routing-paths'; -import { QualityAssuranceSourceDataService } from '../../core/notifications/qa/source/quality-assurance-source-data.service'; -import { - getFirstCompletedRemoteData, - getPaginatedListPayload, - getRemoteDataPayload, -} from '../../core/shared/operators'; @Component({ selector: 'ds-my-dspace-qa-events-notifications', diff --git a/src/app/navbar/navbar.component.spec.ts b/src/app/navbar/navbar.component.spec.ts index 05213015055..b7b0075b932 100644 --- a/src/app/navbar/navbar.component.spec.ts +++ b/src/app/navbar/navbar.component.spec.ts @@ -11,6 +11,15 @@ import { ReactiveFormsModule } from '@angular/forms'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { authReducer } from '@core/auth/auth.reducer'; +import { AuthTokenInfo } from '@core/auth/models/auth-token-info.model'; +import { BrowseService } from '@core/browse/browse.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { FlatBrowseDefinition } from '@core/shared/flat-browse-definition.model'; +import { HierarchicalBrowseDefinition } from '@core/shared/hierarchical-browse-definition.model'; +import { Item } from '@core/shared/item.model'; +import { ValueListBrowseDefinition } from '@core/shared/value-list-browse-definition.model'; import { Store, StoreModule, @@ -24,15 +33,6 @@ import { storeModuleConfig, } from '../app.reducer'; import { BrowseByDataType } from '../browse-by/browse-by-switcher/browse-by-data-type'; -import { authReducer } from '../core/auth/auth.reducer'; -import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model'; -import { BrowseService } from '../core/browse/browse.service'; -import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; -import { buildPaginatedList } from '../core/data/paginated-list.model'; -import { FlatBrowseDefinition } from '../core/shared/flat-browse-definition.model'; -import { HierarchicalBrowseDefinition } from '../core/shared/hierarchical-browse-definition.model'; -import { Item } from '../core/shared/item.model'; -import { ValueListBrowseDefinition } from '../core/shared/value-list-browse-definition.model'; import { HostWindowService } from '../shared/host-window.service'; import { MenuService } from '../shared/menu/menu.service'; import { getMockThemeService } from '../shared/mocks/theme-service.mock'; diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts index db5ee65fc4a..ae1c6ac11ae 100644 --- a/src/app/navbar/navbar.component.ts +++ b/src/app/navbar/navbar.component.ts @@ -9,6 +9,9 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { isAuthenticated } from '@core/auth/selectors'; +import { BrowseService } from '@core/browse/browse.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { select, @@ -18,9 +21,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { AppState } from '../app.reducer'; -import { isAuthenticated } from '../core/auth/selectors'; -import { BrowseService } from '../core/browse/browse.service'; -import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; import { slideMobileNav } from '../shared/animations/slide'; import { ThemedUserMenuComponent } from '../shared/auth-nav-menu/user-menu/themed-user-menu.component'; import { diff --git a/src/app/notifications/notifications-state.service.ts b/src/app/notifications/notifications-state.service.ts index d140e4e80af..371fd91c745 100644 --- a/src/app/notifications/notifications-state.service.ts +++ b/src/app/notifications/notifications-state.service.ts @@ -1,4 +1,6 @@ import { Injectable } from '@angular/core'; +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; +import { QualityAssuranceTopicObject } from '@core/notifications/qa/models/quality-assurance-topic.model'; import { select, Store, @@ -6,8 +8,6 @@ import { import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { QualityAssuranceSourceObject } from '../core/notifications/qa/models/quality-assurance-source.model'; -import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model'; import { SuggestionNotificationsState } from './notifications.reducer'; import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions'; import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.actions'; diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts index ab441be4a0d..b1ac6a31e31 100644 --- a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts +++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts @@ -4,10 +4,10 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; import { EPerson } from 'src/app/core/eperson/models/eperson.model'; import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils'; -import { EPersonDataService } from './../../../../core/eperson/eperson-data.service'; import { EPersonDataComponent } from './ePerson-data.component'; describe('EPersonDataComponent', () => { diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts index 36b9a606d84..9834cede119 100644 --- a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts +++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts @@ -3,14 +3,13 @@ import { Component, Input, } from '@angular/core'; -import { Observable } from 'rxjs'; - -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; import { getFirstCompletedRemoteData, getRemoteDataPayload, -} from '../../../../core/shared/operators'; +} from '@core/shared/operators'; +import { Observable } from 'rxjs'; @Component({ selector: 'ds-eperson-data', diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts index 8190ed225c6..d3a1e2b0f5b 100644 --- a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts +++ b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts @@ -10,6 +10,16 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { QualityAssuranceEventDataService } from '@core/notifications/qa/events/quality-assurance-event-data.service'; +import { QualityAssuranceEventObject } from '@core/notifications/qa/models/quality-assurance-event.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -24,16 +34,6 @@ import { TestScheduler } from 'rxjs/testing'; import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; import { ItemDataService } from 'src/app/core/data/item-data.service'; -import { - SortDirection, - SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { QualityAssuranceEventDataService } from '../../../core/notifications/qa/events/quality-assurance-event-data.service'; -import { QualityAssuranceEventObject } from '../../../core/notifications/qa/models/quality-assurance-event.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { PageInfo } from '../../../core/shared/page-info.model'; import { getMockQualityAssuranceEventRestService, ItemMockPid8, diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts index ab382594ccd..380a6e22b2d 100644 --- a/src/app/notifications/qa/events/quality-assurance-events.component.ts +++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts @@ -8,6 +8,29 @@ import { ActivatedRoute, RouterLink, } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { ItemDataService } from '@core/data/item-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { QualityAssuranceEventDataService } from '@core/notifications/qa/events/quality-assurance-event-data.service'; +import { + QualityAssuranceEventObject, + SourceQualityAssuranceEventMessageObject, +} from '@core/notifications/qa/models/quality-assurance-event.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Item } from '@core/shared/item.model'; +import { Metadata } from '@core/shared/metadata.utils'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { NgbModal, NgbTooltipModule, @@ -36,29 +59,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../../environments/environment'; -import { - SortDirection, - SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { QualityAssuranceEventDataService } from '../../../core/notifications/qa/events/quality-assurance-event-data.service'; -import { - QualityAssuranceEventObject, - SourceQualityAssuranceEventMessageObject, -} from '../../../core/notifications/qa/models/quality-assurance-event.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { Item } from '../../../core/shared/item.model'; -import { Metadata } from '../../../core/shared/metadata.utils'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts index 0bd7ba2f93a..bc826b1d60a 100644 --- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts +++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts @@ -10,14 +10,14 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { Item } from '../../../core/shared/item.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { SearchService } from '../../../core/shared/search/search.service'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts index ff7c9b53fa4..584dc62b4c3 100644 --- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts +++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts @@ -8,6 +8,16 @@ import { } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterLink } from '@angular/router'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { + QualityAssuranceEventObject, + SourceQualityAssuranceEventMessageObject, +} from '@core/notifications/qa/models/quality-assurance-event.model'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -16,16 +26,6 @@ import { Subscription, } from 'rxjs'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { - QualityAssuranceEventObject, - SourceQualityAssuranceEventMessageObject, -} from '../../../core/notifications/qa/models/quality-assurance-event.model'; -import { Context } from '../../../core/shared/context.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { diff --git a/src/app/notifications/qa/source/quality-assurance-source.actions.ts b/src/app/notifications/qa/source/quality-assurance-source.actions.ts index 0493b035abc..31d23d2711b 100644 --- a/src/app/notifications/qa/source/quality-assurance-source.actions.ts +++ b/src/app/notifications/qa/source/quality-assurance-source.actions.ts @@ -1,7 +1,7 @@ /* eslint-disable max-classes-per-file */ +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; import { Action } from '@ngrx/store'; -import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; import { type } from '../../../shared/ngrx/type'; /** diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts index 302d7680769..25dd45fa7eb 100644 --- a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts +++ b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts @@ -10,11 +10,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { PaginationService } from '../../../core/pagination/pagination.service'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { getMockNotificationsStateService, diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.ts b/src/app/notifications/qa/source/quality-assurance-source.component.ts index eb0fa02bf03..921186f0ff1 100644 --- a/src/app/notifications/qa/source/quality-assurance-source.component.ts +++ b/src/app/notifications/qa/source/quality-assurance-source.component.ts @@ -13,6 +13,9 @@ import { Router, RouterLink, } from '@angular/router'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; +import { PaginationService } from '@core/pagination/pagination.service'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, @@ -24,9 +27,6 @@ import { take, } from 'rxjs/operators'; -import { SortOptions } from '../../../core/cache/models/sort-options.model'; -import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; import { QualityAssuranceSourcePageParams } from '../../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { hasValue } from '../../../shared/empty.util'; diff --git a/src/app/notifications/qa/source/quality-assurance-source.effects.ts b/src/app/notifications/qa/source/quality-assurance-source.effects.ts index 7e0585e3a84..59a55480338 100644 --- a/src/app/notifications/qa/source/quality-assurance-source.effects.ts +++ b/src/app/notifications/qa/source/quality-assurance-source.effects.ts @@ -1,4 +1,7 @@ import { Injectable } from '@angular/core'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; +import { QualityAssuranceSourceDataService } from '@core/notifications/qa/source/quality-assurance-source-data.service'; import { Actions, createEffect, @@ -15,9 +18,6 @@ import { withLatestFrom, } from 'rxjs/operators'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; -import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { AddSourceAction, diff --git a/src/app/notifications/qa/source/quality-assurance-source.reducer.ts b/src/app/notifications/qa/source/quality-assurance-source.reducer.ts index 2c81462c8d6..eb518a24602 100644 --- a/src/app/notifications/qa/source/quality-assurance-source.reducer.ts +++ b/src/app/notifications/qa/source/quality-assurance-source.reducer.ts @@ -1,4 +1,5 @@ -import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; + import { QualityAssuranceSourceActions, QualityAssuranceSourceActionTypes, diff --git a/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts index 97e148080c7..4636e1eac68 100644 --- a/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts +++ b/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts @@ -1,15 +1,15 @@ import { TestBed } from '@angular/core/testing'; -import { cold } from 'jasmine-marbles'; -import { of } from 'rxjs'; - import { SortDirection, SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service'; -import { PageInfo } from '../../../core/shared/page-info.model'; +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { QualityAssuranceSourceDataService } from '@core/notifications/qa/source/quality-assurance-source-data.service'; +import { PageInfo } from '@core/shared/page-info.model'; +import { cold } from 'jasmine-marbles'; +import { of } from 'rxjs'; + import { getMockQualityAssuranceSourceRestService, qualityAssuranceSourceObjectMoreAbstract, diff --git a/src/app/notifications/qa/source/quality-assurance-source.service.ts b/src/app/notifications/qa/source/quality-assurance-source.service.ts index d8686bcee2c..907fc11bb8b 100644 --- a/src/app/notifications/qa/source/quality-assurance-source.service.ts +++ b/src/app/notifications/qa/source/quality-assurance-source.service.ts @@ -1,17 +1,16 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - import { SortDirection, SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model'; -import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; +import { QualityAssuranceSourceDataService } from '@core/notifications/qa/source/quality-assurance-source-data.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; /** * The service handling all Quality Assurance source requests to the REST service. diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts b/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts index 670fd7b52ad..869d58c7c5d 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts @@ -1,7 +1,7 @@ /* eslint-disable max-classes-per-file */ +import { QualityAssuranceTopicObject } from '@core/notifications/qa/models/quality-assurance-topic.model'; import { Action } from '@ngrx/store'; -import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model'; import { type } from '../../../shared/ngrx/type'; /** diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts index c24e8c73a50..366752d3cb8 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts @@ -11,12 +11,12 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; import { ItemDataService } from 'src/app/core/data/item-data.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts index 1b8bb8c34ac..a4bfdb4b264 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts @@ -13,6 +13,15 @@ import { Router, RouterLink, } from '@angular/router'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { ItemDataService } from '@core/data/item-data.service'; +import { QualityAssuranceTopicObject } from '@core/notifications/qa/models/quality-assurance-topic.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, @@ -26,15 +35,6 @@ import { } from 'rxjs/operators'; import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths'; -import { SortOptions } from '../../../core/cache/models/sort-options.model'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { Item } from '../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { QualityAssuranceTopicsPageParams } from '../../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service'; import { AlertComponent } from '../../../shared/alert/alert.component'; diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts b/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts index 3fd4aa5dfee..66da1c2b587 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts @@ -1,4 +1,7 @@ import { Injectable } from '@angular/core'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { QualityAssuranceTopicObject } from '@core/notifications/qa/models/quality-assurance-topic.model'; +import { QualityAssuranceTopicDataService } from '@core/notifications/qa/topics/quality-assurance-topic-data.service'; import { Actions, createEffect, @@ -15,9 +18,6 @@ import { withLatestFrom, } from 'rxjs/operators'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model'; -import { QualityAssuranceTopicDataService } from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { AddTopicsAction, diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts index f1a644a53bf..2b70b620f6d 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts @@ -1,4 +1,5 @@ -import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model'; +import { QualityAssuranceTopicObject } from '@core/notifications/qa/models/quality-assurance-topic.model'; + import { QualityAssuranceTopicActionTypes, QualityAssuranceTopicsActions, diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts index 42da310756f..8b555530f55 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts @@ -1,16 +1,16 @@ import { TestBed } from '@angular/core/testing'; -import { cold } from 'jasmine-marbles'; -import { of } from 'rxjs'; - -import { RequestParam } from '../../../core/cache/models/request-param.model'; +import { RequestParam } from '@core/cache/models/request-param.model'; import { SortDirection, SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { QualityAssuranceTopicDataService } from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service'; -import { PageInfo } from '../../../core/shared/page-info.model'; +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { QualityAssuranceTopicDataService } from '@core/notifications/qa/topics/quality-assurance-topic-data.service'; +import { PageInfo } from '@core/shared/page-info.model'; +import { cold } from 'jasmine-marbles'; +import { of } from 'rxjs'; + import { getMockQualityAssuranceTopicRestService, qualityAssuranceTopicObjectMoreAbstract, diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.service.ts b/src/app/notifications/qa/topics/quality-assurance-topics.service.ts index f7f7103746b..8570e7970e3 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.service.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.service.ts @@ -1,18 +1,18 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - -import { RequestParam } from '../../../core/cache/models/request-param.model'; +import { RequestParam } from '@core/cache/models/request-param.model'; import { SortDirection, SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model'; -import { QualityAssuranceTopicDataService } from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { QualityAssuranceTopicObject } from '@core/notifications/qa/models/quality-assurance-topic.model'; +import { QualityAssuranceTopicDataService } from '@core/notifications/qa/topics/quality-assurance-topic-data.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; + import { hasValue } from '../../../shared/empty.util'; /** diff --git a/src/app/notifications/selectors.ts b/src/app/notifications/selectors.ts index 10090d21dc1..eba94a8d2d1 100644 --- a/src/app/notifications/selectors.ts +++ b/src/app/notifications/selectors.ts @@ -1,11 +1,11 @@ +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; +import { QualityAssuranceTopicObject } from '@core/notifications/qa/models/quality-assurance-topic.model'; import { createFeatureSelector, createSelector, MemoizedSelector, } from '@ngrx/store'; -import { QualityAssuranceSourceObject } from '../core/notifications/qa/models/quality-assurance-source.model'; -import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model'; import { subStateSelector } from '../shared/selector.util'; import { suggestionNotificationsSelector, diff --git a/src/app/notifications/suggestions/actions/suggestion-actions.component.ts b/src/app/notifications/suggestions/actions/suggestion-actions.component.ts index d52db2b5575..d29d7a0c0a8 100644 --- a/src/app/notifications/suggestions/actions/suggestion-actions.component.ts +++ b/src/app/notifications/suggestions/actions/suggestion-actions.component.ts @@ -5,6 +5,9 @@ import { Input, Output, } from '@angular/core'; +import { Suggestion } from '@core/notifications/suggestions/models/suggestion.model'; +import { Collection } from '@core/shared/collection.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; import { NgbDropdownModule, NgbModal, @@ -12,9 +15,6 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { take } from 'rxjs/operators'; -import { Suggestion } from '../../../core/notifications/suggestions/models/suggestion.model'; -import { Collection } from '../../../core/shared/collection.model'; -import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { ThemedCreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component'; import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component'; diff --git a/src/app/notifications/suggestions/list-element/suggestion-approve-and-import.ts b/src/app/notifications/suggestions/list-element/suggestion-approve-and-import.ts index d0d20d6d80c..f690e308c2c 100644 --- a/src/app/notifications/suggestions/list-element/suggestion-approve-and-import.ts +++ b/src/app/notifications/suggestions/list-element/suggestion-approve-and-import.ts @@ -1,4 +1,4 @@ -import { Suggestion } from '../../../core/notifications/suggestions/models/suggestion.model'; +import { Suggestion } from '@core/notifications/suggestions/models/suggestion.model'; /** * A simple interface to unite a specific suggestion and the id of the chosen collection diff --git a/src/app/notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component.ts b/src/app/notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component.ts index 5b2b895d4a8..c54ef3a3fd5 100644 --- a/src/app/notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component.ts +++ b/src/app/notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component.ts @@ -3,9 +3,9 @@ import { Component, Input, } from '@angular/core'; +import { SuggestionEvidences } from '@core/notifications/suggestions/models/suggestion.model'; import { TranslateModule } from '@ngx-translate/core'; -import { SuggestionEvidences } from '../../../../core/notifications/suggestions/models/suggestion.model'; import { fadeIn } from '../../../../shared/animations/fade'; import { ObjectKeysPipe } from '../../../../shared/utils/object-keys-pipe'; diff --git a/src/app/notifications/suggestions/list-element/suggestion-list-element.component.spec.ts b/src/app/notifications/suggestions/list-element/suggestion-list-element.component.spec.ts index c51ec3b37d3..d0c0516201a 100644 --- a/src/app/notifications/suggestions/list-element/suggestion-list-element.component.spec.ts +++ b/src/app/notifications/suggestions/list-element/suggestion-list-element.component.spec.ts @@ -4,12 +4,12 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { Item } from '@core/shared/item.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; import { TestScheduler } from 'rxjs/testing'; -import { Item } from '../../../core/shared/item.model'; import { mockSuggestionPublicationOne } from '../../../shared/mocks/publication-claim.mock'; import { ItemSearchResultListElementComponent } from '../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component'; import { SuggestionActionsComponent } from '../actions/suggestion-actions.component'; diff --git a/src/app/notifications/suggestions/list-element/suggestion-list-element.component.ts b/src/app/notifications/suggestions/list-element/suggestion-list-element.component.ts index c8bd7f3e3e7..4e9e2fcb3b5 100644 --- a/src/app/notifications/suggestions/list-element/suggestion-list-element.component.ts +++ b/src/app/notifications/suggestions/list-element/suggestion-list-element.component.ts @@ -6,10 +6,10 @@ import { OnInit, Output, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { Suggestion } from 'src/app/core/notifications/suggestions/models/suggestion.model'; -import { Item } from '../../../core/shared/item.model'; import { fadeIn } from '../../../shared/animations/fade'; import { isNotEmpty } from '../../../shared/empty.util'; import { ItemSearchResultListElementComponent } from '../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component'; diff --git a/src/app/notifications/suggestions/notification/suggestions-notification.component.ts b/src/app/notifications/suggestions/notification/suggestions-notification.component.ts index ba97498af40..8bbf1bb6b57 100644 --- a/src/app/notifications/suggestions/notification/suggestions-notification.component.ts +++ b/src/app/notifications/suggestions/notification/suggestions-notification.component.ts @@ -4,10 +4,10 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model'; import { SuggestionsService } from '../suggestions.service'; import { SuggestionTargetsStateService } from '../targets/suggestion-targets.state.service'; diff --git a/src/app/notifications/suggestions/popup/suggestions-popup.component.ts b/src/app/notifications/suggestions/popup/suggestions-popup.component.ts index 276b6821f7a..6a6a12a0d7e 100644 --- a/src/app/notifications/suggestions/popup/suggestions-popup.component.ts +++ b/src/app/notifications/suggestions/popup/suggestions-popup.component.ts @@ -6,6 +6,7 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; import { TranslateModule } from '@ngx-translate/core'; import { combineLatest, @@ -19,7 +20,6 @@ import { takeUntil, } from 'rxjs/operators'; -import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model'; import { fromTopEnter } from '../../../shared/animations/fromTop'; import { isNotEmpty } from '../../../shared/empty.util'; import { SuggestionsService } from '../suggestions.service'; diff --git a/src/app/notifications/suggestions/sources/suggestion-sources.component.spec.ts b/src/app/notifications/suggestions/sources/suggestion-sources.component.spec.ts index 4b33a904e89..df533ecf7ed 100644 --- a/src/app/notifications/suggestions/sources/suggestion-sources.component.spec.ts +++ b/src/app/notifications/suggestions/sources/suggestion-sources.component.spec.ts @@ -8,21 +8,21 @@ import { provideRouter, Router, } from '@angular/router'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { SuggestionSource } from '@core/notifications/suggestions/models/suggestion-source.model'; +import { SuggestionSourceDataService } from '@core/notifications/suggestions/source/suggestion-source-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { SuggestionSource } from '../../../core/notifications/suggestions/models/suggestion-source.model'; -import { SuggestionSourceDataService } from '../../../core/notifications/suggestions/source/suggestion-source-data.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { PageInfo } from '../../../core/shared/page-info.model'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; diff --git a/src/app/notifications/suggestions/sources/suggestion-sources.component.ts b/src/app/notifications/suggestions/sources/suggestion-sources.component.ts index 512f9254429..d926f6c59a6 100644 --- a/src/app/notifications/suggestions/sources/suggestion-sources.component.ts +++ b/src/app/notifications/suggestions/sources/suggestion-sources.component.ts @@ -5,6 +5,12 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { SuggestionSource } from '@core/notifications/suggestions/models/suggestion-source.model'; +import { SuggestionSourceDataService } from '@core/notifications/suggestions/source/suggestion-source-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslatePipe } from '@ngx-translate/core'; import { BehaviorSubject, @@ -17,12 +23,6 @@ import { tap, } from 'rxjs/operators'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { SuggestionSource } from '../../../core/notifications/suggestions/models/suggestion-source.model'; -import { SuggestionSourceDataService } from '../../../core/notifications/suggestions/source/suggestion-source-data.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; import { diff --git a/src/app/notifications/suggestions/suggestions.service.spec.ts b/src/app/notifications/suggestions/suggestions.service.spec.ts index 1ba23f642a5..1a00215dc39 100644 --- a/src/app/notifications/suggestions/suggestions.service.spec.ts +++ b/src/app/notifications/suggestions/suggestions.service.spec.ts @@ -1,19 +1,19 @@ +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; +import { SuggestionDataService } from '@core/notifications/suggestions/suggestion-data.service'; +import { SuggestionTargetDataService } from '@core/notifications/suggestions/target/suggestion-target-data.service'; +import { ResearcherProfile } from '@core/profile/model/researcher-profile.model'; +import { ResearcherProfileDataService } from '@core/profile/researcher-profile-data.service'; +import { ResourceType } from '@core/shared/resource-type'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model'; -import { SuggestionDataService } from '../../core/notifications/suggestions/suggestion-data.service'; -import { SuggestionTargetDataService } from '../../core/notifications/suggestions/target/suggestion-target-data.service'; -import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model'; -import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; -import { ResourceType } from '../../core/shared/resource-type'; -import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; import { mockSuggestionPublicationOne } from '../../shared/mocks/publication-claim.mock'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { followLink } from '../../shared/utils/follow-link-config.model'; diff --git a/src/app/notifications/suggestions/suggestions.service.ts b/src/app/notifications/suggestions/suggestions.service.ts index b27789b67a6..ab8325a643b 100644 --- a/src/app/notifications/suggestions/suggestions.service.ts +++ b/src/app/notifications/suggestions/suggestions.service.ts @@ -1,4 +1,26 @@ import { Injectable } from '@angular/core'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Suggestion } from '@core/notifications/suggestions/models/suggestion.model'; +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; +import { SuggestionDataService } from '@core/notifications/suggestions/suggestion-data.service'; +import { SuggestionTargetDataService } from '@core/notifications/suggestions/target/suggestion-target-data.service'; +import { ResearcherProfile } from '@core/profile/model/researcher-profile.model'; +import { ResearcherProfileDataService } from '@core/profile/researcher-profile-data.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFinishedRemoteData, + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, + getFirstSucceededRemoteListPayload, +} from '@core/shared/operators'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { TranslateService } from '@ngx-translate/core'; import { forkJoin, @@ -14,28 +36,6 @@ import { import { SuggestionConfig } from '../../../config/suggestion-config.interfaces'; import { environment } from '../../../environments/environment'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Suggestion } from '../../core/notifications/suggestions/models/suggestion.model'; -import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model'; -import { SuggestionDataService } from '../../core/notifications/suggestions/suggestion-data.service'; -import { SuggestionTargetDataService } from '../../core/notifications/suggestions/target/suggestion-target-data.service'; -import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model'; -import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { - getFinishedRemoteData, - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, - getFirstSucceededRemoteListPayload, -} from '../../core/shared/operators'; -import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; -import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; import { hasNoValue, hasValue, diff --git a/src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.ts index f9e0f8b2de4..16ffa3011c2 100644 --- a/src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.ts +++ b/src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.ts @@ -10,6 +10,8 @@ import { Router, RouterLink, } from '@angular/router'; +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; +import { PaginationService } from '@core/pagination/pagination.service'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, @@ -20,8 +22,6 @@ import { take, } from 'rxjs/operators'; -import { SuggestionTarget } from '../../../../core/notifications/suggestions/models/suggestion-target.model'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; import { hasValue } from '../../../../shared/empty.util'; import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component'; import { PaginationComponent } from '../../../../shared/pagination/pagination.component'; diff --git a/src/app/notifications/suggestions/targets/selectors.ts b/src/app/notifications/suggestions/targets/selectors.ts index 67f1bed0357..e4d9aa862c9 100644 --- a/src/app/notifications/suggestions/targets/selectors.ts +++ b/src/app/notifications/suggestions/targets/selectors.ts @@ -1,10 +1,10 @@ +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; import { createFeatureSelector, createSelector, MemoizedSelector, } from '@ngrx/store'; -import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model'; import { subStateSelector } from '../../../submission/selectors'; import { suggestionNotificationsSelector, diff --git a/src/app/notifications/suggestions/targets/suggestion-targets.actions.ts b/src/app/notifications/suggestions/targets/suggestion-targets.actions.ts index 8992944273b..18ac57ee639 100644 --- a/src/app/notifications/suggestions/targets/suggestion-targets.actions.ts +++ b/src/app/notifications/suggestions/targets/suggestion-targets.actions.ts @@ -1,7 +1,7 @@ /* eslint-disable max-classes-per-file */ +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; import { Action } from '@ngrx/store'; -import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model'; import { type } from '../../../shared/ngrx/type'; /** diff --git a/src/app/notifications/suggestions/targets/suggestion-targets.effects.ts b/src/app/notifications/suggestions/targets/suggestion-targets.effects.ts index d53dab1e511..59ca86d7173 100644 --- a/src/app/notifications/suggestions/targets/suggestion-targets.effects.ts +++ b/src/app/notifications/suggestions/targets/suggestion-targets.effects.ts @@ -1,4 +1,10 @@ import { Injectable } from '@angular/core'; +import { + AuthActionTypes, + RetrieveAuthenticatedEpersonSuccessAction, +} from '@core/auth/auth.actions'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; import { Actions, createEffect, @@ -18,12 +24,6 @@ import { RemoteData } from 'src/app/core/data/remote-data'; import { ConfigurationProperty } from 'src/app/core/shared/configuration-property.model'; import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; -import { - AuthActionTypes, - RetrieveAuthenticatedEpersonSuccessAction, -} from '../../../core/auth/auth.actions'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { SuggestionsService } from '../suggestions.service'; import { diff --git a/src/app/notifications/suggestions/targets/suggestion-targets.reducer.ts b/src/app/notifications/suggestions/targets/suggestion-targets.reducer.ts index c71f149675e..2c6f3e44fe4 100644 --- a/src/app/notifications/suggestions/targets/suggestion-targets.reducer.ts +++ b/src/app/notifications/suggestions/targets/suggestion-targets.reducer.ts @@ -1,4 +1,5 @@ -import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model'; +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; + import { SuggestionTargetActionTypes, SuggestionTargetsActions, diff --git a/src/app/notifications/suggestions/targets/suggestion-targets.state.service.ts b/src/app/notifications/suggestions/targets/suggestion-targets.state.service.ts index c70929078fb..7e7ab0ef824 100644 --- a/src/app/notifications/suggestions/targets/suggestion-targets.state.service.ts +++ b/src/app/notifications/suggestions/targets/suggestion-targets.state.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; import { select, Store, @@ -6,7 +7,6 @@ import { import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { SuggestionTarget } from '../../../core/notifications/suggestions/models/suggestion-target.model'; import { SuggestionNotificationsState } from '../../notifications.reducer'; import { getCurrentUserSuggestionTargetsSelector, diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.ts b/src/app/page-internal-server-error/page-internal-server-error.component.ts index ab0ddede58a..3cf5ad6bb9b 100644 --- a/src/app/page-internal-server-error/page-internal-server-error.component.ts +++ b/src/app/page-internal-server-error/page-internal-server-error.component.ts @@ -2,10 +2,9 @@ import { ChangeDetectionStrategy, Component, } from '@angular/core'; +import { ServerResponseService } from '@core/services/server-response.service'; import { TranslateModule } from '@ngx-translate/core'; -import { ServerResponseService } from '../core/services/server-response.service'; - /** * This component representing the `PageInternalServer` DSpace page. */ diff --git a/src/app/pagenotfound/pagenotfound.component.ts b/src/app/pagenotfound/pagenotfound.component.ts index e69884b2a15..41c29a0c143 100644 --- a/src/app/pagenotfound/pagenotfound.component.ts +++ b/src/app/pagenotfound/pagenotfound.component.ts @@ -4,11 +4,10 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { ServerResponseService } from '@core/services/server-response.service'; import { TranslateModule } from '@ngx-translate/core'; -import { AuthService } from '../core/auth/auth.service'; -import { ServerResponseService } from '../core/services/server-response.service'; - /** * This component representing the `PageNotFound` DSpace page. */ diff --git a/src/app/process-page/detail/process-detail.component.spec.ts b/src/app/process-page/detail/process-detail.component.spec.ts index 0b331873639..56dec788db9 100644 --- a/src/app/process-page/detail/process-detail.component.spec.ts +++ b/src/app/process-page/detail/process-detail.component.spec.ts @@ -18,16 +18,16 @@ import { RouterModule, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { Bitstream } from '@core/shared/bitstream.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../core/data/bitstream-data.service'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { ProcessDataService } from '../../core/data/processes/process-data.service'; -import { Bitstream } from '../../core/shared/bitstream.model'; import { ThemedFileDownloadLinkComponent } from '../../shared/file-download-link/themed-file-download-link.component'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts index 537578ebc84..8c1de834ea8 100644 --- a/src/app/process-page/detail/process-detail.component.ts +++ b/src/app/process-page/detail/process-detail.component.ts @@ -17,6 +17,22 @@ import { Router, RouterLink, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { + getAllSucceededRemoteDataPayload, + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { NgbModal, NgbModalRef, @@ -40,22 +56,6 @@ import { tap, } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../core/data/bitstream-data.service'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { ProcessDataService } from '../../core/data/processes/process-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { redirectOn4xx } from '../../core/shared/authorized.operators'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { - getAllSucceededRemoteDataPayload, - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../core/shared/operators'; -import { URLCombiner } from '../../core/url-combiner/url-combiner'; import { AlertType } from '../../shared/alert/alert-type'; import { hasValue } from '../../shared/empty.util'; import { ThemedFileDownloadLinkComponent } from '../../shared/file-download-link/themed-file-download-link.component'; diff --git a/src/app/process-page/form/process-form.component.spec.ts b/src/app/process-page/form/process-form.component.spec.ts index 889d27e98b7..8889a3dadcf 100644 --- a/src/app/process-page/form/process-form.component.spec.ts +++ b/src/app/process-page/form/process-form.component.spec.ts @@ -9,14 +9,14 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { RequestService } from '@core/data/request.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ScriptDataService } from '../../core/data/processes/script-data.service'; -import { RequestService } from '../../core/data/request.service'; import { RouterMock } from '../../shared/mocks/router.mock'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/process-page/form/process-form.component.ts b/src/app/process-page/form/process-form.component.ts index 6e60d1b9db8..223cef4eb62 100644 --- a/src/app/process-page/form/process-form.component.ts +++ b/src/app/process-page/form/process-form.component.ts @@ -13,14 +13,14 @@ import { Router, RouterLink, } from '@angular/router'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { ScriptDataService } from '../../core/data/processes/script-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { isEmpty } from '../../shared/empty.util'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { getProcessListRoute } from '../process-page-routing.paths'; diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts index 7b095926fbb..eb6882af8db 100644 --- a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts +++ b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts @@ -12,13 +12,13 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { ScriptDataService } from '../../../core/data/processes/script-data.service'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts index bad9394b3f8..13c9fc59de0 100644 --- a/src/app/process-page/form/scripts-select/scripts-select.component.ts +++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts @@ -17,6 +17,13 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; @@ -29,13 +36,6 @@ import { tap, } from 'rxjs/operators'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { ScriptDataService } from '../../../core/data/processes/script-data.service'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; import { hasValue } from '../../../shared/empty.util'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { Script } from '../../scripts/script.model'; diff --git a/src/app/process-page/new/new-process.component.spec.ts b/src/app/process-page/new/new-process.component.spec.ts index faffefc7cc9..d09a323567c 100644 --- a/src/app/process-page/new/new-process.component.spec.ts +++ b/src/app/process-page/new/new-process.component.spec.ts @@ -6,16 +6,16 @@ import { } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { RequestService } from '@core/data/request.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { LinkService } from '../../core/cache/builders/link.service'; -import { ProcessDataService } from '../../core/data/processes/process-data.service'; -import { ScriptDataService } from '../../core/data/processes/script-data.service'; -import { RequestService } from '../../core/data/request.service'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; diff --git a/src/app/process-page/new/new-process.component.ts b/src/app/process-page/new/new-process.component.ts index 868ec5dd0c9..5f2d72644de 100644 --- a/src/app/process-page/new/new-process.component.ts +++ b/src/app/process-page/new/new-process.component.ts @@ -4,15 +4,15 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map, switchMap, } from 'rxjs/operators'; -import { LinkService } from '../../core/cache/builders/link.service'; -import { ProcessDataService } from '../../core/data/processes/process-data.service'; -import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; import { followLink } from '../../shared/utils/follow-link-config.model'; import { HasValuePipe } from '../../shared/utils/has-value.pipe'; import { VarDirective } from '../../shared/utils/var.directive'; diff --git a/src/app/process-page/overview/process-bulk-delete.service.ts b/src/app/process-page/overview/process-bulk-delete.service.ts index 790bec080f9..a6255fe0e07 100644 --- a/src/app/process-page/overview/process-bulk-delete.service.ts +++ b/src/app/process-page/overview/process-bulk-delete.service.ts @@ -1,4 +1,7 @@ import { Injectable } from '@angular/core'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, @@ -11,9 +14,6 @@ import { tap, } from 'rxjs/operators'; -import { ProcessDataService } from '../../core/data/processes/process-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { isNotEmpty } from '../../shared/empty.util'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { Process } from '../processes/process.model'; diff --git a/src/app/process-page/overview/process-overview.component.spec.ts b/src/app/process-page/overview/process-overview.component.spec.ts index f31a782b5ed..f664dc7e2e6 100644 --- a/src/app/process-page/overview/process-overview.component.spec.ts +++ b/src/app/process-page/overview/process-overview.component.spec.ts @@ -9,11 +9,11 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject } from 'rxjs'; -import { ProcessDataService } from '../../core/data/processes/process-data.service'; import { PaginationComponent } from '../../shared/pagination/pagination.component'; import { VarDirective } from '../../shared/utils/var.directive'; import { ProcessBulkDeleteService } from './process-bulk-delete.service'; diff --git a/src/app/process-page/overview/process-overview.service.ts b/src/app/process-page/overview/process-overview.service.ts index fc573d51604..c154d8c3f3a 100644 --- a/src/app/process-page/overview/process-overview.service.ts +++ b/src/app/process-page/overview/process-overview.service.ts @@ -1,16 +1,16 @@ import { DatePipe } from '@angular/common'; import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; - -import { RequestParam } from '../../core/cache/models/request-param.model'; +import { RequestParam } from '@core/cache/models/request-param.model'; import { SortDirection, SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { ProcessDataService } from '../../core/data/processes/process-data.service'; -import { RemoteData } from '../../core/data/remote-data'; +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Observable } from 'rxjs'; + import { hasValue } from '../../shared/empty.util'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { Process } from '../processes/process.model'; diff --git a/src/app/process-page/overview/table/process-overview-table.component.spec.ts b/src/app/process-page/overview/table/process-overview-table.component.spec.ts index c704b2b3ea1..935db48569b 100644 --- a/src/app/process-page/overview/table/process-overview-table.component.spec.ts +++ b/src/app/process-page/overview/table/process-overview-table.component.spec.ts @@ -6,6 +6,12 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { RouteService } from '@core/services/route.service'; import { NgbCollapse, NgbModal, @@ -17,12 +23,6 @@ import { import { BehaviorSubject } from 'rxjs'; import { take } from 'rxjs/operators'; -import { AuthService } from '../../../core/auth/auth.service'; -import { ProcessDataService } from '../../../core/data/processes/process-data.service'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { RouteService } from '../../../core/services/route.service'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { AuthServiceMock } from '../../../shared/mocks/auth.service.mock'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; diff --git a/src/app/process-page/overview/table/process-overview-table.component.ts b/src/app/process-page/overview/table/process-overview-table.component.ts index bcb4a59bb91..8e0123df1b3 100644 --- a/src/app/process-page/overview/table/process-overview-table.component.ts +++ b/src/app/process-page/overview/table/process-overview-table.component.ts @@ -15,6 +15,19 @@ import { Router, RouterLink, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { RouteService } from '@core/services/route.service'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { + getAllCompletedRemoteData, + getFirstCompletedRemoteData, +} from '@core/shared/operators'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -36,19 +49,6 @@ import { } from 'rxjs/operators'; import { PaginationService } from 'src/app/core/pagination/pagination.service'; -import { AuthService } from '../../../core/auth/auth.service'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { RouteService } from '../../../core/services/route.service'; -import { redirectOn4xx } from '../../../core/shared/authorized.operators'; -import { - getAllCompletedRemoteData, - getFirstCompletedRemoteData, -} from '../../../core/shared/operators'; import { hasValue, isNotEmpty, diff --git a/src/app/process-page/process-breadcrumb.resolver.spec.ts b/src/app/process-page/process-breadcrumb.resolver.spec.ts index ce579e715fc..715e5d11946 100644 --- a/src/app/process-page/process-breadcrumb.resolver.spec.ts +++ b/src/app/process-page/process-breadcrumb.resolver.spec.ts @@ -1,4 +1,5 @@ -import { ProcessDataService } from '../core/data/processes/process-data.service'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; + import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { processBreadcrumbResolver } from './process-breadcrumb.resolver'; import { Process } from './processes/process.model'; diff --git a/src/app/process-page/process-breadcrumb.resolver.ts b/src/app/process-page/process-breadcrumb.resolver.ts index 95596cfe2fe..e25ebffef35 100644 --- a/src/app/process-page/process-breadcrumb.resolver.ts +++ b/src/app/process-page/process-breadcrumb.resolver.ts @@ -4,13 +4,13 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model'; -import { ProcessDataService } from '../core/data/processes/process-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { followLink } from '../shared/utils/follow-link-config.model'; import { ProcessBreadcrumbsService } from './process-breadcrumbs.service'; import { Process } from './processes/process.model'; diff --git a/src/app/process-page/process-breadcrumbs.service.ts b/src/app/process-page/process-breadcrumbs.service.ts index e4024d50087..fb6b52bae54 100644 --- a/src/app/process-page/process-breadcrumbs.service.ts +++ b/src/app/process-page/process-breadcrumbs.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; +import { BreadcrumbsProviderService } from '@core/breadcrumbs/breadcrumbsProviderService'; import { Observable, of, } from 'rxjs'; import { Breadcrumb } from '../breadcrumbs/breadcrumb/breadcrumb.model'; -import { BreadcrumbsProviderService } from '../core/breadcrumbs/breadcrumbsProviderService'; import { hasValue } from '../shared/empty.util'; import { Process } from './processes/process.model'; diff --git a/src/app/process-page/process-page-routes.ts b/src/app/process-page/process-page-routes.ts index 3d41376a44d..cbc524104a9 100644 --- a/src/app/process-page/process-page-routes.ts +++ b/src/app/process-page/process-page-routes.ts @@ -1,7 +1,7 @@ import { Route } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ProcessDetailComponent } from './detail/process-detail.component'; import { NewProcessComponent } from './new/new-process.component'; import { ProcessOverviewComponent } from './overview/process-overview.component'; diff --git a/src/app/process-page/process-page-routing.paths.ts b/src/app/process-page/process-page-routing.paths.ts index 781bf9a51c0..631e5ea4042 100644 --- a/src/app/process-page/process-page-routing.paths.ts +++ b/src/app/process-page/process-page-routing.paths.ts @@ -1,4 +1,4 @@ -import { URLCombiner } from '../core/url-combiner/url-combiner'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; export const PROCESS_MODULE_PATH = 'processes'; diff --git a/src/app/process-page/process-page.resolver.ts b/src/app/process-page/process-page.resolver.ts index 3a074ce2250..83abfdf1f43 100644 --- a/src/app/process-page/process-page.resolver.ts +++ b/src/app/process-page/process-page.resolver.ts @@ -4,11 +4,11 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { ProcessDataService } from '@core/data/processes/process-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; -import { ProcessDataService } from '../core/data/processes/process-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { followLink } from '../shared/utils/follow-link-config.model'; import { Process } from './processes/process.model'; diff --git a/src/app/process-page/processes/filetypes.model.ts b/src/app/process-page/processes/filetypes.model.ts index 02e29b23238..7bc7e298084 100644 --- a/src/app/process-page/processes/filetypes.model.ts +++ b/src/app/process-page/processes/filetypes.model.ts @@ -1,8 +1,8 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize } from 'cerialize'; -import { typedObject } from '../../core/cache/builders/build-decorators'; -import { ResourceType } from '../../core/shared/resource-type'; -import { excludeFromEquals } from '../../core/utilities/equals.decorators'; import { FILETYPES } from './filetypes.resource-type'; /** diff --git a/src/app/process-page/processes/filetypes.resource-type.ts b/src/app/process-page/processes/filetypes.resource-type.ts index 29f9636208d..9bc9b493ef0 100644 --- a/src/app/process-page/processes/filetypes.resource-type.ts +++ b/src/app/process-page/processes/filetypes.resource-type.ts @@ -3,6 +3,6 @@ * * Needs to be in a separate file to prevent circular dependencies in webpack. */ -import { ResourceType } from '../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; export const FILETYPES = new ResourceType('filetypes'); diff --git a/src/app/process-page/processes/process.model.ts b/src/app/process-page/processes/process.model.ts index 60407f3e12e..cab91ed001e 100644 --- a/src/app/process-page/processes/process.model.ts +++ b/src/app/process-page/processes/process.model.ts @@ -1,3 +1,16 @@ +import { + link, + typedObject, +} from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { BITSTREAM } from '@core/shared/bitstream.resource-type'; +import { HALLink } from '@core/shared/hal-link.model'; +import { PROCESS_OUTPUT_TYPE } from '@core/shared/process-output.resource-type'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, autoserializeAs, @@ -5,19 +18,6 @@ import { } from 'cerialize'; import { Observable } from 'rxjs'; -import { - link, - typedObject, -} from '../../core/cache/builders/build-decorators'; -import { CacheableObject } from '../../core/cache/cacheable-object.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { BITSTREAM } from '../../core/shared/bitstream.resource-type'; -import { HALLink } from '../../core/shared/hal-link.model'; -import { PROCESS_OUTPUT_TYPE } from '../../core/shared/process-output.resource-type'; -import { ResourceType } from '../../core/shared/resource-type'; -import { excludeFromEquals } from '../../core/utilities/equals.decorators'; import { Script } from '../scripts/script.model'; import { SCRIPT } from '../scripts/script.resource-type'; import { Filetypes } from './filetypes.model'; diff --git a/src/app/process-page/processes/process.resource-type.ts b/src/app/process-page/processes/process.resource-type.ts index 47617ed4f42..6360339baed 100644 --- a/src/app/process-page/processes/process.resource-type.ts +++ b/src/app/process-page/processes/process.resource-type.ts @@ -4,6 +4,6 @@ * Needs to be in a separate file to prevent circular * dependencies in webpack. */ -import { ResourceType } from '../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; export const PROCESS = new ResourceType('process'); diff --git a/src/app/process-page/scripts/script.model.ts b/src/app/process-page/scripts/script.model.ts index 3cd934336af..57365108cfb 100644 --- a/src/app/process-page/scripts/script.model.ts +++ b/src/app/process-page/scripts/script.model.ts @@ -1,13 +1,13 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, } from 'cerialize'; -import { typedObject } from '../../core/cache/builders/build-decorators'; -import { CacheableObject } from '../../core/cache/cacheable-object.model'; -import { HALLink } from '../../core/shared/hal-link.model'; -import { ResourceType } from '../../core/shared/resource-type'; -import { excludeFromEquals } from '../../core/utilities/equals.decorators'; import { SCRIPT } from './script.resource-type'; import { ScriptParameter } from './script-parameter.model'; diff --git a/src/app/process-page/scripts/script.resource-type.ts b/src/app/process-page/scripts/script.resource-type.ts index 2b8c106191a..482aa541a65 100644 --- a/src/app/process-page/scripts/script.resource-type.ts +++ b/src/app/process-page/scripts/script.resource-type.ts @@ -4,6 +4,6 @@ * Needs to be in a separate file to prevent circular * dependencies in webpack. */ -import { ResourceType } from '../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; export const SCRIPT = new ResourceType('script'); diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts index 9d515e1abba..79a376121e2 100644 --- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts +++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts @@ -9,11 +9,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { Item } from '@core/shared/item.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Item } from '../../core/shared/item.model'; import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model'; import { ListableObjectComponentLoaderComponent } from '../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts index 5d1dcf67f21..324a7a22f4f 100644 --- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts +++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts @@ -10,17 +10,17 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject } from 'rxjs'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { Item } from '../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { DSOSelectorModalWrapperComponent } from '../../shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component'; diff --git a/src/app/profile-page/profile-claim/profile-claim.service.spec.ts b/src/app/profile-page/profile-claim/profile-claim.service.spec.ts index 360b9797499..9f52972da59 100644 --- a/src/app/profile-page/profile-claim/profile-claim.service.spec.ts +++ b/src/app/profile-page/profile-claim/profile-claim.service.spec.ts @@ -1,3 +1,6 @@ +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; import { cold, getTestScheduler, @@ -5,9 +8,6 @@ import { import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { Item } from '../../core/shared/item.model'; -import { SearchService } from '../../core/shared/search/search.service'; import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model'; import { createNoContentRemoteDataObject, diff --git a/src/app/profile-page/profile-claim/profile-claim.service.ts b/src/app/profile-page/profile-claim/profile-claim.service.ts index dc04007dfa0..362dc4b118e 100644 --- a/src/app/profile-page/profile-claim/profile-claim.service.ts +++ b/src/app/profile-page/profile-claim/profile-claim.service.ts @@ -1,15 +1,15 @@ import { Injectable } from '@angular/core'; +import { RemoteData } from '@core/data/remote-data'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; import { Observable, of, } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RemoteData } from '../../core/data/remote-data'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { SearchService } from '../../core/shared/search/search.service'; import { isEmpty, isNotEmpty, diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts index 68a4bfdfa6d..5d5f7e533a1 100644 --- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts +++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts @@ -8,6 +8,9 @@ import { waitForAsync, } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; import { TranslateModule, TranslateService, @@ -15,9 +18,6 @@ import { import cloneDeep from 'lodash/cloneDeep'; import { of } from 'rxjs'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; import { FormBuilderService } from '../../shared/form/builder/form-builder.service'; import { FormComponent } from '../../shared/form/form.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts index 13dca64f8a1..f7c000b3277 100644 --- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts +++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts @@ -5,6 +5,12 @@ import { OnInit, } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { DynamicFormControlModel, DynamicFormValueControlModel, @@ -16,12 +22,6 @@ import cloneDeep from 'lodash/cloneDeep'; import { LangConfig } from '../../../config/lang-config.interface'; import { environment } from '../../../environments/environment'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../core/shared/operators'; import { hasValue, isNotEmpty, diff --git a/src/app/profile-page/profile-page-metadata-form/themed-profile-page-metadata-form.component.ts b/src/app/profile-page/profile-page-metadata-form/themed-profile-page-metadata-form.component.ts index c1de6a83a04..ace90cbea44 100644 --- a/src/app/profile-page/profile-page-metadata-form/themed-profile-page-metadata-form.component.ts +++ b/src/app/profile-page/profile-page-metadata-form/themed-profile-page-metadata-form.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { EPerson } from '@core/eperson/models/eperson.model'; -import { EPerson } from '../../core/eperson/models/eperson.model'; import { ThemedComponent } from '../../shared/theme-support/themed.component'; import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form.component'; diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts index bf76cf1b2c1..42a17d6f3eb 100644 --- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts +++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts @@ -6,14 +6,14 @@ import { } from '@angular/core/testing'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { ResearcherProfile } from '@core/profile/model/researcher-profile.model'; +import { ResearcherProfileDataService } from '@core/profile/researcher-profile-data.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model'; -import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { createFailedRemoteDataObject$, diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts index 07f6dc02759..22a819a6908 100644 --- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts +++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts @@ -5,6 +5,16 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { RemoteData } from '@core/data/remote-data'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { ResearcherProfile } from '@core/profile/model/researcher-profile.model'; +import { ResearcherProfileDataService } from '@core/profile/researcher-profile-data.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -20,16 +30,6 @@ import { tap, } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model'; -import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../core/shared/operators'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component'; import { isNotEmpty } from '../../shared/empty.util'; diff --git a/src/app/profile-page/profile-page-routes.ts b/src/app/profile-page/profile-page-routes.ts index a4e8d6925fb..71a2563ab1a 100644 --- a/src/app/profile-page/profile-page-routes.ts +++ b/src/app/profile-page/profile-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedProfilePageComponent } from './themed-profile-page.component'; export const ROUTES: Route[] = [ diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts index d73d632130b..4345a6885bd 100644 --- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts +++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts @@ -8,11 +8,11 @@ import { } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { RestResponse } from '@core/cache/response.models'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RestResponse } from '../../core/cache/response.models'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; import { AlertComponent } from '../../shared/alert/alert.component'; import { FormBuilderService } from '../../shared/form/builder/form-builder.service'; import { FormComponent } from '../../shared/form/form.component'; diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts index 11f57d535b8..0b501b2ba0b 100644 --- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts +++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts @@ -8,6 +8,7 @@ import { Output, } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; import { DynamicFormControlModel, DynamicFormService, @@ -20,7 +21,6 @@ import { import { Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; import { debounceTimeWorkaround as debounceTime } from '../../core/shared/operators'; import { AlertComponent } from '../../shared/alert/alert.component'; import { diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts index 315310934a2..06f7217c85e 100644 --- a/src/app/profile-page/profile-page.component.spec.ts +++ b/src/app/profile-page/profile-page.component.spec.ts @@ -8,6 +8,15 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterModule } from '@angular/router'; +import { authReducer } from '@core/auth/auth.reducer'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthTokenInfo } from '@core/auth/models/auth-token-info.model'; +import { RestResponse } from '@core/cache/response.models'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; import { StoreModule } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; @@ -21,15 +30,6 @@ import { } from 'rxjs'; import { storeModuleConfig } from '../app.reducer'; -import { authReducer } from '../core/auth/auth.reducer'; -import { AuthService } from '../core/auth/auth.service'; -import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model'; -import { RestResponse } from '../core/cache/response.models'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; -import { EPersonDataService } from '../core/eperson/eperson-data.service'; -import { EPerson } from '../core/eperson/models/eperson.model'; -import { ConfigurationProperty } from '../core/shared/configuration-property.model'; import { SuggestionsNotificationComponent } from '../notifications/suggestions/notification/suggestions-notification.component'; import { ErrorComponent } from '../shared/error/error.component'; import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component'; diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts index 9b887ca4731..caee4e0501e 100644 --- a/src/app/profile-page/profile-page.component.ts +++ b/src/app/profile-page/profile-page.component.ts @@ -8,6 +8,24 @@ import { ViewChild, } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Group } from '@core/eperson/models/group.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { + getAllCompletedRemoteData, + getAllSucceededRemoteData, + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -23,24 +41,6 @@ import { tap, } from 'rxjs/operators'; -import { AuthService } from '../core/auth/auth.service'; -import { DSONameService } from '../core/breadcrumbs/dso-name.service'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../core/data/feature-authorization/feature-id'; -import { PaginatedList } from '../core/data/paginated-list.model'; -import { RemoteData } from '../core/data/remote-data'; -import { EPersonDataService } from '../core/eperson/eperson-data.service'; -import { EPerson } from '../core/eperson/models/eperson.model'; -import { Group } from '../core/eperson/models/group.model'; -import { PaginationService } from '../core/pagination/pagination.service'; -import { ConfigurationProperty } from '../core/shared/configuration-property.model'; -import { - getAllCompletedRemoteData, - getAllSucceededRemoteData, - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../core/shared/operators'; import { SuggestionsNotificationComponent } from '../notifications/suggestions/notification/suggestions-notification.component'; import { AlertComponent } from '../shared/alert/alert.component'; import { diff --git a/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts b/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts index c9cbb5ab0d6..0dd451df123 100644 --- a/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts +++ b/src/app/quality-assurance-notifications-pages/notifications-pages-routes.ts @@ -1,8 +1,8 @@ import { Route } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; +import { sourcesBreadcrumbResolver } from '@core/breadcrumbs/sources-breadcrumb.resolver'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { sourcesBreadcrumbResolver } from '../core/breadcrumbs/sources-breadcrumb.resolver'; import { NOTIFICATIONS_RECITER_SUGGESTION_PATH, QUALITY_ASSURANCE_EDIT_PATH, diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts index dd9ae36476e..ca3d9302489 100644 --- a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts +++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts @@ -5,6 +5,8 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -12,8 +14,6 @@ import { APP_CONFIG, AppConfig, } from '../../../config/app-config.interface'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { QualityAssuranceSourceObject } from '../../core/notifications/qa/models/quality-assurance-source.model'; import { QualityAssuranceSourceService } from '../../notifications/qa/source/quality-assurance-source.service'; /** diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts index 163ef017f52..2ceda275614 100644 --- a/src/app/register-email-form/register-email-form.component.spec.ts +++ b/src/app/register-email-form/register-email-form.component.spec.ts @@ -15,15 +15,15 @@ import { import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { RestResponse } from '@core/cache/response.models'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { GoogleRecaptchaService } from '@core/google-recaptcha/google-recaptcha.service'; +import { CookieService } from '@core/services/cookie.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RestResponse } from '../core/cache/response.models'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; -import { GoogleRecaptchaService } from '../core/google-recaptcha/google-recaptcha.service'; -import { CookieService } from '../core/services/cookie.service'; -import { ConfigurationProperty } from '../core/shared/configuration-property.model'; import { AlertComponent } from '../shared/alert/alert.component'; import { GoogleRecaptchaComponent } from '../shared/google-recaptcha/google-recaptcha.component'; import { CookieServiceMock } from '../shared/mocks/cookie.service.mock'; diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts index 62c6a3a6570..5654bfc9574 100644 --- a/src/app/register-email-form/register-email-form.component.ts +++ b/src/app/register-email-form/register-email-form.component.ts @@ -17,6 +17,20 @@ import { Validators, } from '@angular/forms'; import { Router } from '@angular/router'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { RemoteData } from '@core/data/remote-data'; +import { + CAPTCHA_NAME, + GoogleRecaptchaService, +} from '@core/google-recaptcha/google-recaptcha.service'; +import { CookieService } from '@core/services/cookie.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { + getAllSucceededRemoteDataPayload, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { Registration } from '@core/shared/registration.model'; import { TranslateModule, TranslateService, @@ -35,20 +49,6 @@ import { take, } from 'rxjs/operators'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; -import { RemoteData } from '../core/data/remote-data'; -import { - CAPTCHA_NAME, - GoogleRecaptchaService, -} from '../core/google-recaptcha/google-recaptcha.service'; -import { CookieService } from '../core/services/cookie.service'; -import { ConfigurationProperty } from '../core/shared/configuration-property.model'; -import { - getAllSucceededRemoteDataPayload, - getFirstSucceededRemoteDataPayload, -} from '../core/shared/operators'; -import { Registration } from '../core/shared/registration.model'; import { AlertComponent } from '../shared/alert/alert.component'; import { AlertType } from '../shared/alert/alert-type'; import { BtnDisabledDirective } from '../shared/btn-disabled.directive'; diff --git a/src/app/register-email-form/register-email-form.module.ts b/src/app/register-email-form/register-email-form.module.ts deleted file mode 100644 index 38a5a03361a..00000000000 --- a/src/app/register-email-form/register-email-form.module.ts +++ /dev/null @@ -1,9 +0,0 @@ - -import { RegisterEmailFormComponent } from './register-email-form.component'; -import { ThemedRegisterEmailFormComponent } from './themed-registry-email-form.component'; - -const DECLARATIONS = [ - RegisterEmailFormComponent, - ThemedRegisterEmailFormComponent, -]; - diff --git a/src/app/register-email-form/registration.resolver.spec.ts b/src/app/register-email-form/registration.resolver.spec.ts index 0d70c7d50f7..57856624085 100644 --- a/src/app/register-email-form/registration.resolver.spec.ts +++ b/src/app/register-email-form/registration.resolver.spec.ts @@ -1,7 +1,7 @@ +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { Registration } from '@core/shared/registration.model'; import { first } from 'rxjs/operators'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; -import { Registration } from '../core/shared/registration.model'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { registrationResolver } from './registration.resolver'; diff --git a/src/app/register-email-form/registration.resolver.ts b/src/app/register-email-form/registration.resolver.ts index 787fd84e612..4c3bf84de76 100644 --- a/src/app/register-email-form/registration.resolver.ts +++ b/src/app/register-email-form/registration.resolver.ts @@ -4,13 +4,12 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { Registration } from '@core/shared/registration.model'; import { Observable } from 'rxjs'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; -import { RemoteData } from '../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; -import { Registration } from '../core/shared/registration.model'; - export const registrationResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, diff --git a/src/app/register-page/create-profile/create-profile.component.spec.ts b/src/app/register-page/create-profile/create-profile.component.spec.ts index ef650c4691b..61d7384ca93 100644 --- a/src/app/register-page/create-profile/create-profile.component.spec.ts +++ b/src/app/register-page/create-profile/create-profile.component.spec.ts @@ -15,19 +15,19 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthenticateAction } from '@core/auth/auth.actions'; +import { CoreState } from '@core/core-state.model'; +import { + END_USER_AGREEMENT_METADATA_FIELD, + EndUserAgreementService, +} from '@core/end-user-agreement/end-user-agreement.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Registration } from '@core/shared/registration.model'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthenticateAction } from '../../core/auth/auth.actions'; -import { CoreState } from '../../core/core-state.model'; -import { - END_USER_AGREEMENT_METADATA_FIELD, - EndUserAgreementService, -} from '../../core/end-user-agreement/end-user-agreement.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { Registration } from '../../core/shared/registration.model'; import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts index f73fdab1d12..b34a2560310 100644 --- a/src/app/register-page/create-profile/create-profile.component.ts +++ b/src/app/register-page/create-profile/create-profile.component.ts @@ -14,6 +14,20 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthenticateAction } from '@core/auth/auth.actions'; +import { CoreState } from '@core/core-state.model'; +import { RemoteData } from '@core/data/remote-data'; +import { + END_USER_AGREEMENT_METADATA_FIELD, + EndUserAgreementService, +} from '@core/end-user-agreement/end-user-agreement.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { Registration } from '@core/shared/registration.model'; import { Store } from '@ngrx/store'; import { TranslateModule, @@ -24,20 +38,6 @@ import { map } from 'rxjs/operators'; import { LangConfig } from '../../../config/lang-config.interface'; import { environment } from '../../../environments/environment'; -import { AuthenticateAction } from '../../core/auth/auth.actions'; -import { CoreState } from '../../core/core-state.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { - END_USER_AGREEMENT_METADATA_FIELD, - EndUserAgreementService, -} from '../../core/end-user-agreement/end-user-agreement.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../core/shared/operators'; -import { Registration } from '../../core/shared/registration.model'; import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { isEmpty } from '../../shared/empty.util'; diff --git a/src/app/register-page/register-page-routes.ts b/src/app/register-page/register-page-routes.ts index e7ca386aac8..8fefa58cca4 100644 --- a/src/app/register-page/register-page-routes.ts +++ b/src/app/register-page/register-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { endUserAgreementCookieGuard } from '@core/end-user-agreement/end-user-agreement-cookie.guard'; -import { endUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard'; import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component'; import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component'; import { registrationGuard } from './registration.guard'; diff --git a/src/app/register-page/registration.guard.spec.ts b/src/app/register-page/registration.guard.spec.ts index be0162bc7df..d2a26800bff 100644 --- a/src/app/register-page/registration.guard.spec.ts +++ b/src/app/register-page/registration.guard.spec.ts @@ -3,12 +3,12 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Registration } from '@core/shared/registration.model'; import { of } from 'rxjs'; -import { AuthService } from '../core/auth/auth.service'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; -import { RemoteData } from '../core/data/remote-data'; -import { Registration } from '../core/shared/registration.model'; import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, diff --git a/src/app/register-page/registration.guard.ts b/src/app/register-page/registration.guard.ts index a37e052717b..896c5d2297d 100644 --- a/src/app/register-page/registration.guard.ts +++ b/src/app/register-page/registration.guard.ts @@ -5,14 +5,13 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AuthService } from '../core/auth/auth.service'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; -import { redirectOn4xx } from '../core/shared/authorized.operators'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; - /** * A guard responsible for redirecting to 4xx pages upon retrieving a Registration object * The guard also adds the resulting RemoteData object to the route's data for further usage in components diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts index e83d70c27e9..5e1f4df6ab3 100644 --- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts +++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts @@ -9,19 +9,19 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { ItemRequestDataService } from '@core/data/item-request-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Item } from '@core/shared/item.model'; +import { ItemRequest } from '@core/shared/item-request.model'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { ItemRequestDataService } from '../../core/data/item-request-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { Item } from '../../core/shared/item.model'; -import { ItemRequest } from '../../core/shared/item-request.model'; import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts index 18f23690de3..8b64f6517cf 100644 --- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts +++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts @@ -7,6 +7,19 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { ItemRequestDataService } from '@core/data/item-request-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { Item } from '@core/shared/item.model'; +import { ItemRequest } from '@core/shared/item-request.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -20,19 +33,6 @@ import { switchMap, } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { ItemRequestDataService } from '../../core/data/item-request-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { redirectOn4xx } from '../../core/shared/authorized.operators'; -import { Item } from '../../core/shared/item.model'; -import { ItemRequest } from '../../core/shared/item-request.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../core/shared/operators'; import { isNotEmpty } from '../../shared/empty.util'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts index 919702911b2..a9ee79bc095 100644 --- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts @@ -12,14 +12,14 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Item } from '@core/shared/item.model'; +import { ItemRequest } from '@core/shared/item-request.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { Item } from '../../core/shared/item.model'; -import { ItemRequest } from '../../core/shared/item-request.model'; import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; import { createSuccessfulRemoteDataObject, diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts index 7d5a39315fd..0b109d19f77 100644 --- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts @@ -8,6 +8,17 @@ import { Router, RouterLink, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { Item } from '@core/shared/item.model'; +import { ItemRequest } from '@core/shared/item-request.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { @@ -15,17 +26,6 @@ import { switchMap, } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { redirectOn4xx } from '../../core/shared/authorized.operators'; -import { Item } from '../../core/shared/item.model'; -import { ItemRequest } from '../../core/shared/item-request.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../core/shared/operators'; import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { VarDirective } from '../../shared/utils/var.directive'; diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts b/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts index a1a3ebcf4e7..b43bcbfdcfc 100644 --- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts +++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts @@ -9,20 +9,20 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { ItemRequestDataService } from '@core/data/item-request-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { Item } from '@core/shared/item.model'; +import { ItemRequest } from '@core/shared/item-request.model'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { ItemRequestDataService } from '../../core/data/item-request-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { HardRedirectService } from '../../core/services/hard-redirect.service'; -import { Item } from '../../core/shared/item.model'; -import { ItemRequest } from '../../core/shared/item-request.model'; import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts index bea4c453f32..63ed4f23b78 100644 --- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts +++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts @@ -9,6 +9,17 @@ import { Router, RouterLink, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { ItemRequestDataService } from '@core/data/item-request-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { ItemRequest } from '@core/shared/item-request.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { TranslatePipe, TranslateService, @@ -20,17 +31,6 @@ import { tap, } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; -import { ItemRequestDataService } from '../../core/data/item-request-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { HardRedirectService } from '../../core/services/hard-redirect.service'; -import { redirectOn4xx } from '../../core/shared/authorized.operators'; -import { ItemRequest } from '../../core/shared/item-request.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../core/shared/operators'; -import { URLCombiner } from '../../core/url-combiner/url-combiner'; import { getItemModuleRoute } from '../../item-page/item-page-routing-paths'; import { hasValue } from '../../shared/empty.util'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; diff --git a/src/app/request-copy/request-copy-routing-paths.ts b/src/app/request-copy/request-copy-routing-paths.ts index 2518e34fc28..d01adfb648a 100644 --- a/src/app/request-copy/request-copy-routing-paths.ts +++ b/src/app/request-copy/request-copy-routing-paths.ts @@ -1,5 +1,6 @@ +import { URLCombiner } from '@core/url-combiner/url-combiner'; + import { getRequestCopyModulePath } from '../app-routing-paths'; -import { URLCombiner } from '../core/url-combiner/url-combiner'; export function getRequestCopyRoute(token: string) { return new URLCombiner(getRequestCopyModulePath(), token).toString(); diff --git a/src/app/request-copy/request-copy.resolver.ts b/src/app/request-copy/request-copy.resolver.ts index b91e1b7d8cc..134f2e508d2 100644 --- a/src/app/request-copy/request-copy.resolver.ts +++ b/src/app/request-copy/request-copy.resolver.ts @@ -4,13 +4,12 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { ItemRequestDataService } from '@core/data/item-request-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { ItemRequest } from '@core/shared/item-request.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; -import { ItemRequestDataService } from '../core/data/item-request-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { ItemRequest } from '../core/shared/item-request.model'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; - export const requestCopyResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts index 9c33116b6c0..0b2cfa25c90 100644 --- a/src/app/root/root.component.ts +++ b/src/app/root/root.component.ts @@ -12,6 +12,10 @@ import { Router, RouterOutlet, } from '@angular/router'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -32,10 +36,6 @@ import { environment } from '../../environments/environment'; import { ThemedAdminSidebarComponent } from '../admin/admin-sidebar/themed-admin-sidebar.component'; import { getPageInternalServerErrorRoute } from '../app-routing-paths'; import { ThemedBreadcrumbsComponent } from '../breadcrumbs/themed-breadcrumbs.component'; -import { - NativeWindowRef, - NativeWindowService, -} from '../core/services/window.service'; import { ThemedFooterComponent } from '../footer/themed-footer.component'; import { ThemedHeaderNavbarWrapperComponent } from '../header-nav-wrapper/themed-header-navbar-wrapper.component'; import { slideSidebarPadding } from '../shared/animations/slide'; diff --git a/src/app/search-navbar/search-navbar.component.spec.ts b/src/app/search-navbar/search-navbar.component.spec.ts index 3d383cbcef3..dae4b3e2de4 100644 --- a/src/app/search-navbar/search-navbar.component.spec.ts +++ b/src/app/search-navbar/search-navbar.component.spec.ts @@ -16,12 +16,12 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { SearchService } from '@core/shared/search/search.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; -import { SearchService } from '../core/shared/search/search.service'; import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; import { SearchNavbarComponent } from './search-navbar.component'; diff --git a/src/app/search-navbar/search-navbar.component.ts b/src/app/search-navbar/search-navbar.component.ts index ca90d477bf7..e73bc15b8a7 100644 --- a/src/app/search-navbar/search-navbar.component.ts +++ b/src/app/search-navbar/search-navbar.component.ts @@ -9,9 +9,9 @@ import { UntypedFormBuilder, } from '@angular/forms'; import { Router } from '@angular/router'; +import { SearchService } from '@core/shared/search/search.service'; import { TranslateModule } from '@ngx-translate/core'; -import { SearchService } from '../core/shared/search/search.service'; import { expandSearchInput } from '../shared/animations/slide'; import { BrowserOnlyPipe } from '../shared/utils/browser-only.pipe'; import { ClickOutsideDirective } from '../shared/utils/click-outside.directive'; diff --git a/src/app/search-page/configuration-search-page.component.spec.ts b/src/app/search-page/configuration-search-page.component.spec.ts index f3931a2016f..a63364b9c1c 100644 --- a/src/app/search-page/configuration-search-page.component.spec.ts +++ b/src/app/search-page/configuration-search-page.component.spec.ts @@ -8,10 +8,10 @@ import { waitForAsync, } from '@angular/core/testing'; import { Router } from '@angular/router'; +import { RouteService } from '@core/services/route.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { of } from 'rxjs'; -import { RouteService } from '../core/services/route.service'; -import { SearchConfigurationService } from '../core/shared/search/search-configuration.service'; import { configureSearchComponentTestingModule } from '../shared/search/search.component.spec'; import { ConfigurationSearchPageComponent } from './configuration-search-page.component'; import createSpy = jasmine.createSpy; diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts index 5458d9a1b4e..61664532550 100644 --- a/src/app/search-page/configuration-search-page.component.ts +++ b/src/app/search-page/configuration-search-page.component.ts @@ -9,15 +9,15 @@ import { PLATFORM_ID, } from '@angular/core'; import { Router } from '@angular/router'; +import { RouteService } from '@core/services/route.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG, AppConfig, } from '../../config/app-config.interface'; -import { RouteService } from '../core/services/route.service'; -import { SearchService } from '../core/shared/search/search.service'; -import { SearchConfigurationService } from '../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-configuration.service'; import { pushInOut } from '../shared/animations/push'; import { HostWindowService } from '../shared/host-window.service'; diff --git a/src/app/search-page/search-page-routes.ts b/src/app/search-page/search-page-routes.ts index 329c09d185a..d44df404761 100644 --- a/src/app/search-page/search-page-routes.ts +++ b/src/app/search-page/search-page-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { configurationSearchPageGuard } from './configuration-search-page.guard'; import { ThemedConfigurationSearchPageComponent } from './themed-configuration-search-page.component'; import { ThemedSearchPageComponent } from './themed-search-page.component'; diff --git a/src/app/search-page/search-page.component.ts b/src/app/search-page/search-page.component.ts index f9ae3c60c95..0e20317e4cd 100644 --- a/src/app/search-page/search-page.component.ts +++ b/src/app/search-page/search-page.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; -import { SearchConfigurationService } from '../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-configuration.service'; import { ThemedSearchComponent } from '../shared/search/themed-search.component'; diff --git a/src/app/search-page/themed-configuration-search-page.component.ts b/src/app/search-page/themed-configuration-search-page.component.ts index a455ddf5fe8..ab3fab6e563 100644 --- a/src/app/search-page/themed-configuration-search-page.component.ts +++ b/src/app/search-page/themed-configuration-search-page.component.ts @@ -2,9 +2,9 @@ import { Component, Input, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Context } from '../core/shared/context.model'; -import { ViewMode } from '../core/shared/view-mode.model'; import { CollectionElementLinkType } from '../shared/object-collection/collection-element-link.type'; import { SelectionConfig } from '../shared/search/search-results/search-results.component'; import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model'; diff --git a/src/app/shared/abstract-component-loader/abstract-component-loader.component.ts b/src/app/shared/abstract-component-loader/abstract-component-loader.component.ts index e188725e475..c1a5336a566 100644 --- a/src/app/shared/abstract-component-loader/abstract-component-loader.component.ts +++ b/src/app/shared/abstract-component-loader/abstract-component-loader.component.ts @@ -8,9 +8,9 @@ import { ViewChild, ViewContainerRef, } from '@angular/core'; +import { GenericConstructor } from '@core/shared/generic-constructor'; import { Subscription } from 'rxjs'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts index 35289122889..889198e1554 100644 --- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts +++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts @@ -9,10 +9,10 @@ import { FormsModule, NgForm, } from '@angular/forms'; +import { AccessesConditionOption } from '@core/config/models/config-accesses-conditions-options.model'; import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { dateToISOFormat } from '../../date.util'; import { ToDatePipe } from './to-date.pipe'; diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts index e835fc50e43..1c1e6bcb666 100644 --- a/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts +++ b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts @@ -6,6 +6,8 @@ import { TestBed, } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; +import { BulkAccessConfigDataService } from '@core/config/bulk-access-config-data.service'; +import { Item } from '@core/shared/item.model'; import { NgbDatepickerModule, NgbModal, @@ -15,8 +17,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { UiSwitchModule } from 'ngx-ui-switch'; import { of } from 'rxjs'; -import { BulkAccessConfigDataService } from '../../core/config/bulk-access-config-data.service'; -import { Item } from '../../core/shared/item.model'; import { SelectableListService } from '../object-list/selectable-list/selectable-list.service'; import { AccessControlFormContainerComponent } from './access-control-form-container.component'; import { createAccessControlInitialFormState } from './access-control-form-container-intial-state'; diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.ts index 102c370022b..38526fbd257 100644 --- a/src/app/shared/access-control-form-container/access-control-form-container.component.ts +++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts @@ -7,6 +7,12 @@ import { ViewChild, } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { BulkAccessConfigDataService } from '@core/config/bulk-access-config-data.service'; +import { BulkAccessConditionOptions } from '@core/config/models/bulk-access-condition-options.model'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { UiSwitchModule } from 'ngx-ui-switch'; @@ -20,12 +26,6 @@ import { take, } from 'rxjs/operators'; -import { BulkAccessConfigDataService } from '../../core/config/bulk-access-config-data.service'; -import { BulkAccessConditionOptions } from '../../core/config/models/bulk-access-condition-options.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { Item } from '../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { AlertComponent } from '../alert/alert.component'; import { AlertType } from '../alert/alert-type'; import { BtnDisabledDirective } from '../btn-disabled.directive'; diff --git a/src/app/shared/access-control-form-container/bulk-access-control.service.spec.ts b/src/app/shared/access-control-form-container/bulk-access-control.service.spec.ts index 9539e63e397..3f23164455a 100644 --- a/src/app/shared/access-control-form-container/bulk-access-control.service.spec.ts +++ b/src/app/shared/access-control-form-container/bulk-access-control.service.spec.ts @@ -1,8 +1,8 @@ import { TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; import { TranslateModule } from '@ngx-translate/core'; -import { ScriptDataService } from '../../core/data/processes/script-data.service'; import { Process } from '../../process-page/processes/process.model'; import { ProcessParameter } from '../../process-page/processes/process-parameter.model'; import { NotificationsService } from '../notifications/notifications.service'; diff --git a/src/app/shared/access-control-form-container/bulk-access-control.service.ts b/src/app/shared/access-control-form-container/bulk-access-control.service.ts index f3c284e3580..07d389fd593 100644 --- a/src/app/shared/access-control-form-container/bulk-access-control.service.ts +++ b/src/app/shared/access-control-form-container/bulk-access-control.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { ScriptDataService } from '../../core/data/processes/script-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths'; import { Process } from '../../process-page/processes/process.model'; import { ProcessParameter } from '../../process-page/processes/process-parameter.model'; diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts index 5415b5748bc..dc1bf38d01c 100644 --- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts +++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts @@ -7,6 +7,13 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Item } from '@core/shared/item.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { @@ -14,13 +21,6 @@ import { of, } from 'rxjs'; -import { BitstreamDataService } from '../../../core/data/bitstream-data.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { Item } from '../../../core/shared/item.model'; import { ObjectCollectionComponent } from '../../object-collection/object-collection.component'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { PaginationServiceStub } from '../../testing/pagination-service.stub'; diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts index d22d44e85bb..4b9c13dbdd3 100644 --- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts +++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts @@ -5,6 +5,9 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Item } from '@core/shared/item.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -17,9 +20,6 @@ import { RemoteData } from 'src/app/core/data/remote-data'; import { Bitstream } from 'src/app/core/shared/bitstream.model'; import { Context } from 'src/app/core/shared/context.model'; -import { BitstreamDataService } from '../../../core/data/bitstream-data.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { Item } from '../../../core/shared/item.model'; import { ObjectCollectionComponent } from '../../object-collection/object-collection.component'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts index 539de03b09b..5d3c1d0267c 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts @@ -11,6 +11,13 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; +import { + authReducer, + AuthState, +} from '@core/auth/auth.reducer'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthTokenInfo } from '@core/auth/models/auth-token-info.model'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { Store, @@ -21,13 +28,6 @@ import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; import { AppState } from '../../app.reducer'; -import { - authReducer, - AuthState, -} from '../../core/auth/auth.reducer'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; -import { XSRFService } from '../../core/xsrf/xsrf.service'; import { HostWindowService } from '../host-window.service'; import { ActivatedRouteStub } from '../testing/active-router.stub'; import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe'; diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts index 6622093a24e..ee180d0a3f3 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts @@ -10,6 +10,16 @@ import { RouterLink, RouterLinkActive, } from '@angular/router'; +import { + AuthService, + LOGIN_ROUTE, + LOGOUT_ROUTE, +} from '@core/auth/auth.service'; +import { + isAuthenticated, + isAuthenticationLoading, +} from '@core/auth/selectors'; +import { EPerson } from '@core/eperson/models/eperson.model'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { RouterReducerState } from '@ngrx/router-store'; import { @@ -31,16 +41,6 @@ import { AppState, routerStateSelector, } from '../../app.reducer'; -import { - AuthService, - LOGIN_ROUTE, - LOGOUT_ROUTE, -} from '../../core/auth/auth.service'; -import { - isAuthenticated, - isAuthenticationLoading, -} from '../../core/auth/selectors'; -import { EPerson } from '../../core/eperson/models/eperson.model'; import { fadeInOut, fadeOut, diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts index f0758ce1c24..38aa35b70ee 100644 --- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts +++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts @@ -10,6 +10,13 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { + authReducer, + AuthState, +} from '@core/auth/auth.reducer'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthTokenInfo } from '@core/auth/models/auth-token-info.model'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { Store, StoreModule, @@ -23,13 +30,6 @@ import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; import { AppState } from '../../../app.reducer'; -import { - authReducer, - AuthState, -} from '../../../core/auth/auth.reducer'; -import { AuthService } from '../../../core/auth/auth.service'; -import { AuthTokenInfo } from '../../../core/auth/models/auth-token-info.model'; -import { XSRFService } from '../../../core/xsrf/xsrf.service'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; import { ActivatedRouteStub } from '../../testing/active-router.stub'; import { EPersonMock } from '../../testing/eperson.mock'; diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts index 7b16ac53739..6c1fdec091e 100644 --- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts +++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts @@ -13,6 +13,10 @@ import { RouterLink, RouterLinkActive, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { isAuthenticationLoading } from '@core/auth/selectors'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; import { select, Store, @@ -25,10 +29,6 @@ import { getProfileModuleRoute, getSubscriptionsModuleRoute, } from '../../../app-routing-paths'; -import { AuthService } from '../../../core/auth/auth.service'; -import { isAuthenticationLoading } from '../../../core/auth/selectors'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; import { MYDSPACE_ROUTE } from '../../../my-dspace-page/my-dspace-page.component'; import { ThemedLoadingComponent } from '../../loading/themed-loading.component'; import { LogOutComponent } from '../../log-out/log-out.component'; diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts index 8b93151611b..ecf6118f6bb 100644 --- a/src/app/shared/browse-by/browse-by.component.spec.ts +++ b/src/app/shared/browse-by/browse-by.component.spec.ts @@ -11,6 +11,22 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { RouteService } from '@core/services/route.service'; +import { BrowseEntry } from '@core/shared/browse-entry.model'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { ITEM } from '@core/shared/item.resource-type'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -18,22 +34,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { GroupDataService } from '../../core/eperson/group-data.service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { LinkHeadService } from '../../core/services/link-head.service'; -import { RouteService } from '../../core/services/route.service'; -import { BrowseEntry } from '../../core/shared/browse-entry.model'; -import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; -import { ITEM } from '../../core/shared/item.resource-type'; -import { PageInfo } from '../../core/shared/page-info.model'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { HostWindowService } from '../host-window.service'; import { getMockThemeService } from '../mocks/theme-service.mock'; import { TranslateLoaderMock } from '../mocks/translate-loader.mock'; diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts index 6938168ca4c..61534941a6b 100644 --- a/src/app/shared/browse-by/browse-by.component.ts +++ b/src/app/shared/browse-by/browse-by.component.ts @@ -9,6 +9,15 @@ import { OnInit, Output, } from '@angular/core'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { RouteService } from '@core/services/route.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule, TranslateService, @@ -21,15 +30,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { RouteService } from '../../core/services/route.service'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { fadeIn, fadeInOut, diff --git a/src/app/shared/browse-by/themed-browse-by.component.ts b/src/app/shared/browse-by/themed-browse-by.component.ts index 130d5f51c5a..60b6294f7d3 100644 --- a/src/app/shared/browse-by/themed-browse-by.component.ts +++ b/src/app/shared/browse-by/themed-browse-by.component.ts @@ -4,14 +4,14 @@ import { Input, Output, } from '@angular/core'; -import { Observable } from 'rxjs'; - import { SortDirection, SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; +} from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Observable } from 'rxjs'; + import { ListableObject } from '../object-collection/shared/listable-object.model'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; import { StartsWithType } from '../starts-with/starts-with-type'; diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts index d43b4086d60..539a6b90288 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts @@ -9,6 +9,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateLoader, TranslateModule, @@ -16,11 +21,6 @@ import { import { getTestScheduler } from 'jasmine-marbles'; import { TestScheduler } from 'rxjs/testing'; -import { CollectionDataService } from '../../core/data/collection-data.service'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { Collection } from '../../core/shared/collection.model'; -import { Community } from '../../core/shared/community.model'; -import { PageInfo } from '../../core/shared/page-info.model'; import { getMockThemeService } from '../mocks/theme-service.mock'; import { TranslateLoaderMock } from '../mocks/translate-loader.mock'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts index e574110370e..bdabbe1edc1 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.ts +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts @@ -15,6 +15,17 @@ import { ReactiveFormsModule, UntypedFormControl, } from '@angular/forms'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { @@ -35,17 +46,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { CollectionDataService } from '../../core/data/collection-data.service'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Collection } from '../../core/shared/collection.model'; -import { Community } from '../../core/shared/community.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../core/shared/operators'; import { hasValue } from '../empty.util'; import { ThemedLoadingComponent } from '../loading/themed-loading.component'; import { followLink } from '../utils/follow-link-config.model'; diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts index e5c7b9ef3ef..c91266b403f 100644 --- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts @@ -11,6 +11,11 @@ import { } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RequestService } from '@core/data/request.service'; +import { RestRequestMethod } from '@core/data/rest-request-method'; +import { Community } from '@core/shared/community.model'; import { DynamicFormControlModel, DynamicFormService, @@ -20,11 +25,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { Operation } from 'fast-json-patch'; import { of } from 'rxjs'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { RequestService } from '../../../../core/data/request.service'; -import { RestRequestMethod } from '../../../../core/data/rest-request-method'; -import { Community } from '../../../../core/shared/community.model'; import { hasValue } from '../../../empty.util'; import { FormComponent } from '../../../form/form.component'; import { AuthServiceMock } from '../../../mocks/auth.service.mock'; diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts index 2744a7d0fd2..7abc0627e64 100644 --- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts +++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts @@ -12,6 +12,21 @@ import { ViewChild, } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; +import { AuthService } from '@core/auth/auth.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { ComColDataService } from '@core/data/comcol-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { + MetadataMap, + MetadataValue, +} from '@core/shared/metadata.models'; +import { NoContent } from '@core/shared/NoContent.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { ResourceType } from '@core/shared/resource-type'; import { NgbModal, NgbModalRef, @@ -39,21 +54,6 @@ import { take, } from 'rxjs/operators'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { ComColDataService } from '../../../../core/data/comcol-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { RequestService } from '../../../../core/data/request.service'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Community } from '../../../../core/shared/community.model'; -import { - MetadataMap, - MetadataValue, -} from '../../../../core/shared/metadata.models'; -import { NoContent } from '../../../../core/shared/NoContent.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { ResourceType } from '../../../../core/shared/resource-type'; import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component'; import { hasValue, diff --git a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts index 1765063ff9a..cf82cc222a7 100644 --- a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts @@ -7,15 +7,15 @@ import { } from '@angular/core/testing'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ComColDataService } from '@core/data/comcol-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; +import { Community } from '@core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { ComColDataService } from '../../../../core/data/comcol-data.service'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { RequestService } from '../../../../core/data/request.service'; -import { RouteService } from '../../../../core/services/route.service'; -import { Community } from '../../../../core/shared/community.model'; import { NotificationsService } from '../../../notifications/notifications.service'; import { createFailedRemoteDataObject$, diff --git a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts index cb2b5a9f0c5..1fd5574743c 100644 --- a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts +++ b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts @@ -3,6 +3,17 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { ComColDataService } from '@core/data/comcol-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { ResourceType } from '@core/shared/resource-type'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, @@ -17,17 +28,6 @@ import { } from 'rxjs/operators'; import { getHomePageRoute } from '../../../../app-routing-paths'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { RequestParam } from '../../../../core/cache/models/request-param.model'; -import { ComColDataService } from '../../../../core/data/comcol-data.service'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { RequestService } from '../../../../core/data/request.service'; -import { RouteService } from '../../../../core/services/route.service'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Community } from '../../../../core/shared/community.model'; -import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; -import { ResourceType } from '../../../../core/shared/resource-type'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts index 07c553cbc5e..7244550c146 100644 --- a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts @@ -10,6 +10,9 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ComColDataService } from '@core/data/comcol-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { Community } from '@core/shared/community.model'; import { TranslateModule, TranslateService, @@ -17,9 +20,6 @@ import { import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { ComColDataService } from '../../../../core/data/comcol-data.service'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { Community } from '../../../../core/shared/community.model'; import { NotificationsService } from '../../../notifications/notifications.service'; import { createFailedRemoteDataObject$, diff --git a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts index 754b32e09be..9bdcc0565cf 100644 --- a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts +++ b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts @@ -6,6 +6,13 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { ComColDataService } from '@core/data/comcol-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, @@ -16,13 +23,6 @@ import { map, } from 'rxjs/operators'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { ComColDataService } from '../../../../core/data/comcol-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Community } from '../../../../core/shared/community.model'; -import { NoContent } from '../../../../core/shared/NoContent.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { NotificationsService } from '../../../notifications/notifications.service'; /** diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts index bdfa42e7778..06d49012daa 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts @@ -10,11 +10,11 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ComColDataService } from '@core/data/comcol-data.service'; +import { Community } from '@core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ComColDataService } from '../../../../../core/data/comcol-data.service'; -import { Community } from '../../../../../core/shared/community.model'; import { NotificationsService } from '../../../../notifications/notifications.service'; import { createFailedRemoteDataObject$, diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts index b895f6c80d9..5be6bc21a79 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts @@ -6,6 +6,16 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { ComColDataService } from '@core/data/comcol-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, +} from '@core/shared/operators'; +import { ResourceType } from '@core/shared/resource-type'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { @@ -13,16 +23,6 @@ import { take, } from 'rxjs/operators'; -import { ComColDataService } from '../../../../../core/data/comcol-data.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Collection } from '../../../../../core/shared/collection.model'; -import { Community } from '../../../../../core/shared/community.model'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, -} from '../../../../../core/shared/operators'; -import { ResourceType } from '../../../../../core/shared/resource-type'; import { isEmpty } from '../../../../empty.util'; import { NotificationsService } from '../../../../notifications/notifications.service'; diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts index 9095ecbc818..2d63cfbca09 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts @@ -10,13 +10,13 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RequestService } from '@core/data/request.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { RequestService } from '../../../../../core/data/request.service'; -import { GroupDataService } from '../../../../../core/eperson/group-data.service'; import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock'; import { NotificationsService } from '../../../../notifications/notifications.service'; import { diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts index 0519760019f..39e5cb09e9f 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts @@ -5,6 +5,19 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Group } from '@core/eperson/models/group.model'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getAllCompletedRemoteData, + getFirstCompletedRemoteData, +} from '@core/shared/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -23,19 +36,6 @@ import { } from 'rxjs/operators'; import { getGroupEditRoute } from '../../../../../access-control/access-control-routing-paths'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { RequestService } from '../../../../../core/data/request.service'; -import { GroupDataService } from '../../../../../core/eperson/group-data.service'; -import { Group } from '../../../../../core/eperson/models/group.model'; -import { Collection } from '../../../../../core/shared/collection.model'; -import { Community } from '../../../../../core/shared/community.model'; -import { HALLink } from '../../../../../core/shared/hal-link.model'; -import { NoContent } from '../../../../../core/shared/NoContent.model'; -import { - getAllCompletedRemoteData, - getFirstCompletedRemoteData, -} from '../../../../../core/shared/operators'; import { AlertComponent } from '../../../../alert/alert.component'; import { ConfirmationModalComponent } from '../../../../confirmation-modal/confirmation-modal.component'; import { diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts index 1a8e9560eaa..7604e9764b1 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts @@ -10,11 +10,11 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { Community } from '@core/shared/community.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Community } from '../../../../core/shared/community.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { EditComColPageComponent } from './edit-comcol-page.component'; describe('EditComColPageComponent', () => { diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts index f9baf75bfd2..67d972b6ee6 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts @@ -6,11 +6,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { isNotEmpty } from '../../../empty.util'; /** diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts index a81e74fca94..0c3bfc34dc5 100644 --- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -14,6 +14,11 @@ import { RouterLink, Scroll, } from '@angular/router'; +import { BrowseService } from '@core/browse/browse.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -35,11 +40,6 @@ import { } from '../../../../config/app-config.interface'; import { getCollectionPageRoute } from '../../../collection-page/collection-page-routing-paths'; import { getCommunityPageRoute } from '../../../community-page/community-page-routing-paths'; -import { BrowseService } from '../../../core/browse/browse.service'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { BrowseDefinition } from '../../../core/shared/browse-definition.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { isNotEmpty } from '../../empty.util'; export interface ComColPageNavOption { diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts index 4cb35396168..b35e09e1382 100644 --- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts +++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts @@ -3,8 +3,7 @@ import { Component, Input, } from '@angular/core'; - -import { Bitstream } from '../../../core/shared/bitstream.model'; +import { Bitstream } from '@core/shared/bitstream.model'; @Component({ selector: 'ds-comcol-page-logo', diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts index 360881f0b79..67fe04d870a 100644 --- a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts +++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts @@ -9,11 +9,11 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; import { BrowseByDataType } from '../../../../browse-by/browse-by-switcher/browse-by-data-type'; import { BrowseBySwitcherComponent } from '../../../../browse-by/browse-by-switcher/browse-by-switcher.component'; -import { BrowseDefinition } from '../../../../core/shared/browse-definition.model'; -import { GenericConstructor } from '../../../../core/shared/generic-constructor'; import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive'; import { getMockThemeService } from '../../../mocks/theme-service.mock'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts index 7b93de6b9fd..e8bf8c8c3c1 100644 --- a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts +++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts @@ -7,12 +7,12 @@ import { ActivatedRoute, Data, } from '@angular/router'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { BrowseByDataType } from '../../../../browse-by/browse-by-switcher/browse-by-data-type'; import { BrowseBySwitcherComponent } from '../../../../browse-by/browse-by-switcher/browse-by-switcher.component'; -import { BrowseDefinition } from '../../../../core/shared/browse-definition.model'; @Component({ selector: 'ds-comcol-browse-by', diff --git a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts index 6ed0984356e..0475bc4ccfe 100644 --- a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts +++ b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts @@ -8,6 +8,10 @@ import { ActivatedRoute, Data, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -15,10 +19,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../config/app-config.interface'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Community } from '../../../../core/shared/community.model'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service'; import { hasValue } from '../../../empty.util'; import { ThemedSearchComponent } from '../../../search/themed-search.component'; diff --git a/src/app/shared/cookies/browser-orejime.service.spec.ts b/src/app/shared/cookies/browser-orejime.service.spec.ts index 9fbe395af23..8f7973d67f1 100644 --- a/src/app/shared/cookies/browser-orejime.service.spec.ts +++ b/src/app/shared/cookies/browser-orejime.service.spec.ts @@ -1,4 +1,12 @@ import { TestBed } from '@angular/core/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { RestResponse } from '@core/cache/response.models'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { CookieService } from '@core/services/cookie.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { MetadataValue } from '@core/shared/metadata.models'; import { TranslateService } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; import clone from 'lodash/clone'; @@ -7,14 +15,6 @@ import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; import { environment } from '../../../environments/environment'; -import { AuthService } from '../../core/auth/auth.service'; -import { RestResponse } from '../../core/cache/response.models'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { CookieService } from '../../core/services/cookie.service'; -import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; -import { MetadataValue } from '../../core/shared/metadata.models'; import { getMockTranslateService } from '../mocks/translate.service.mock'; import { createFailedRemoteDataObject$, diff --git a/src/app/shared/cookies/browser-orejime.service.ts b/src/app/shared/cookies/browser-orejime.service.ts index 092e996bc3c..8ac8d896ef8 100644 --- a/src/app/shared/cookies/browser-orejime.service.ts +++ b/src/app/shared/cookies/browser-orejime.service.ts @@ -3,6 +3,17 @@ import { Injectable, InjectionToken, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { CAPTCHA_NAME } from '@core/google-recaptcha/google-recaptcha.service'; +import { CookieService } from '@core/services/cookie.service'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateService } from '@ngx-translate/core'; import { Operation } from 'fast-json-patch'; import cloneDeep from 'lodash/cloneDeep'; @@ -19,17 +30,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; -import { AuthService } from '../../core/auth/auth.service'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { CAPTCHA_NAME } from '../../core/google-recaptcha/google-recaptcha.service'; -import { CookieService } from '../../core/services/cookie.service'; -import { - NativeWindowRef, - NativeWindowService, -} from '../../core/services/window.service'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { MATOMO_ENABLED } from '../../statistics/matomo.service'; import { hasValue, diff --git a/src/app/shared/cookies/orejime-configuration.ts b/src/app/shared/cookies/orejime-configuration.ts index da383a9a345..7bcbb4d8ce0 100644 --- a/src/app/shared/cookies/orejime-configuration.ts +++ b/src/app/shared/cookies/orejime-configuration.ts @@ -1,15 +1,16 @@ -import { ACCESSIBILITY_COOKIE } from '../../accessibility/accessibility-settings.service'; import { IMPERSONATING_COOKIE, REDIRECT_COOKIE, -} from '../../core/auth/auth.service'; -import { TOKENITEM } from '../../core/auth/models/auth-token-info.model'; +} from '@core/auth/auth.service'; +import { TOKENITEM } from '@core/auth/models/auth-token-info.model'; import { CAPTCHA_COOKIE, CAPTCHA_NAME, -} from '../../core/google-recaptcha/google-recaptcha.service'; -import { LANG_COOKIE } from '../../core/locale/locale.service'; -import { NativeWindowRef } from '../../core/services/window.service'; +} from '@core/google-recaptcha/google-recaptcha.service'; +import { LANG_COOKIE } from '@core/locale/locale.service'; +import { NativeWindowRef } from '@core/services/window.service'; + +import { ACCESSIBILITY_COOKIE } from '../../accessibility/accessibility-settings.service'; /** * Cookie for has_agreed_end_user diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts index 8e16cec8e93..cecdf519409 100644 --- a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts +++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts @@ -5,11 +5,11 @@ import { Output, } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject } from 'rxjs'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { ModalBeforeDismiss } from '../interfaces/modal-before-dismiss.interface'; import { ThemedLoadingComponent } from '../loading/themed-loading.component'; diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts index 57d82a36ba5..871b7bb6a5b 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts @@ -9,11 +9,11 @@ import { } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { MenuService } from '../../menu/menu.service'; import { TextMenuItemModel } from '../../menu/menu-item/models/text.model'; import { getMockThemeService } from '../../mocks/theme-service.mock'; diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts index 4039b2440fc..739dfe7ac27 100644 --- a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts +++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts @@ -1,14 +1,14 @@ import { waitForAsync } from '@angular/core/testing'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { MetadataMap } from '@core/shared/metadata.models'; +import { PageInfo } from '@core/shared/page-info.model'; +import { Version } from '@core/shared/version.model'; import { EMPTY, of, } from 'rxjs'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { Item } from '../../../core/shared/item.model'; -import { MetadataMap } from '../../../core/shared/metadata.models'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { Version } from '../../../core/shared/version.model'; import { createRelationshipsObservable } from '../../../item-page/simple/item-types/shared/item.component.spec'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { DsoVersioningModalService } from './dso-versioning-modal.service'; diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts index e3a9a8c7927..1249c8947cc 100644 --- a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts +++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts @@ -1,5 +1,17 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { VersionDataService } from '@core/data/version-data.service'; +import { VersionHistoryDataService } from '@core/data/version-history-data.service'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { Version } from '@core/shared/version.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { Observable, @@ -11,18 +23,6 @@ import { tap, } from 'rxjs/operators'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { VersionDataService } from '../../../core/data/version-data.service'; -import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; -import { Version } from '../../../core/shared/version.model'; -import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; -import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; import { ItemVersionsSharedService } from '../../../item-page/versions/item-versions-shared.service'; import { ItemVersionsSummaryModalComponent } from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component'; diff --git a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts index 70dc48c68da..c7501022c95 100644 --- a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts +++ b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts @@ -1,16 +1,16 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { QualityAssuranceEventDataService } from '@core/notifications/qa/events/quality-assurance-event-data.service'; +import { QualityAssuranceEventObject } from '@core/notifications/qa/models/quality-assurance-event.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { take } from 'rxjs/operators'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { QualityAssuranceEventDataService } from '../../../core/notifications/qa/events/quality-assurance-event-data.service'; -import { QualityAssuranceEventObject } from '../../../core/notifications/qa/models/quality-assurance-event.model'; -import { Item } from '../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { ItemWithdrawnReinstateModalComponent } from '../../correction-suggestion/item-withdrawn-reinstate-modal.component'; import { NotificationsService } from '../../notifications/notifications.service'; diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts index 1695d43f522..8cf68b541e5 100644 --- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts +++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts @@ -5,12 +5,12 @@ import { waitForAsync, } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { SearchService } from '@core/shared/search/search.service'; import { TranslateModule } from '@ngx-translate/core'; -import { CollectionDataService } from '../../../../core/data/collection-data.service'; -import { Collection } from '../../../../core/shared/collection.model'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; import { ThemedLoadingComponent } from '../../../loading/themed-loading.component'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ListableObjectComponentLoaderComponent } from '../../../object-collection/shared/listable-object/listable-object-component-loader.component'; diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts index 7ee16ffedb9..fbb8e436481 100644 --- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts @@ -10,6 +10,18 @@ import { FormsModule, ReactiveFormsModule, } from '@angular/forms'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; import { TranslateModule, TranslateService, @@ -18,18 +30,6 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { CollectionDataService } from '../../../../core/data/collection-data.service'; -import { FindListOptions } from '../../../../core/data/find-list-options.model'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Collection } from '../../../../core/shared/collection.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { SearchService } from '../../../../core/shared/search/search.service'; import { hasValue } from '../../../empty.util'; import { HoverClassDirective } from '../../../hover-class.directive'; import { ThemedLoadingComponent } from '../../../loading/themed-loading.component'; diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts index 5867da9bdeb..95064f45bf8 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts @@ -7,15 +7,15 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; -import { TranslateModule } from '@ngx-translate/core'; - import { SortDirection, SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; +} from '@core/cache/models/sort-options.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { TranslateModule } from '@ngx-translate/core'; + import { hasValue } from '../../empty.util'; import { NotificationsService } from '../../notifications/notifications.service'; import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model'; diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index 5af72a33746..459e244fd2b 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -18,6 +18,22 @@ import { ReactiveFormsModule, UntypedFormControl, } from '@angular/forms'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule, TranslateService, @@ -38,22 +54,6 @@ import { tap, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { SortOptions } from '../../../core/cache/models/sort-options.model'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Context } from '../../../core/shared/context.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { hasNoValue, hasValue, diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts index 7c6994f0837..73450acd4ff 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts @@ -11,11 +11,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { Community } from '@core/shared/community.model'; +import { MetadataValue } from '@core/shared/metadata.models'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { Community } from '../../../../core/shared/community.model'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { RouterStub } from '../../../testing/router.stub'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts index 830a4e75cb7..8d8436d5b16 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts @@ -8,6 +8,12 @@ import { NavigationExtras, Router, } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; @@ -16,12 +22,6 @@ import { COLLECTION_PARENT_PARAMETER, getCollectionCreateRoute, } from '../../../../collection-page/collection-page-routing-paths'; -import { - SortDirection, - SortOptions, -} from '../../../../core/cache/models/sort-options.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; import { DSOSelectorModalWrapperComponent, diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts index f0722376566..98aea99c004 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts @@ -12,13 +12,13 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Community } from '@core/shared/community.model'; +import { MetadataValue } from '@core/shared/metadata.models'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { Community } from '../../../../core/shared/community.model'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { RouterStub } from '../../../testing/router.stub'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts index f86e9a2b08e..34b41e2da49 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -8,6 +8,14 @@ import { NavigationExtras, Router, } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; @@ -17,14 +25,6 @@ import { COMMUNITY_PARENT_PARAMETER, getCommunityCreateRoute, } from '../../../../community-page/community-page-routing-paths'; -import { - SortDirection, - SortOptions, -} from '../../../../core/cache/models/sort-options.model'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../../core/data/feature-authorization/feature-id'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; import { hasValue } from '../../../empty.util'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; import { diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts index e6a943d58e5..90dc50a76a6 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts @@ -11,11 +11,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { Collection } from '@core/shared/collection.model'; +import { MetadataValue } from '@core/shared/metadata.models'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { Collection } from '../../../../core/shared/collection.model'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { RouterStub } from '../../../testing/router.stub'; import { AuthorizedCollectionSelectorComponent } from '../../dso-selector/authorized-collection-selector/authorized-collection-selector.component'; diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts index 37af0fd4098..bb7d05e7af9 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts @@ -9,16 +9,16 @@ import { NavigationExtras, Router, } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { environment } from '../../../../../environments/environment'; -import { - SortDirection, - SortOptions, -} from '../../../../core/cache/models/sort-options.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; import { AuthorizedCollectionSelectorComponent } from '../../dso-selector/authorized-collection-selector/authorized-collection-selector.component'; import { DSOSelectorModalWrapperComponent, diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts index 1af44b71c8b..6c6002b695b 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts @@ -4,10 +4,10 @@ import { Input, Output, } from '@angular/core'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { ThemedComponent } from 'src/app/shared/theme-support/themed.component'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { CreateItemParentSelectorComponent } from './create-item-parent-selector.component'; /** diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts index 91dc1598afa..83fcb2c71e3 100644 --- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts @@ -14,14 +14,14 @@ import { ActivatedRoute, ActivatedRouteSnapshot, } from '@angular/router'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { Item } from '@core/shared/item.model'; +import { MetadataValue } from '@core/shared/metadata.models'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { MockComponent } from 'ng-mocks'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { Item } from '../../../core/shared/item.model'; -import { MetadataValue } from '../../../core/shared/metadata.models'; import { hasValue } from '../../empty.util'; import { createSuccessfulRemoteDataObject } from '../../remote-data.utils'; import { DSOSelectorComponent } from '../dso-selector/dso-selector.component'; diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts index 35548d05df6..818277a7cf3 100644 --- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts @@ -9,12 +9,12 @@ import { ActivatedRoute, ActivatedRouteSnapshot, } from '@angular/router'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { SortOptions } from '../../../core/cache/models/sort-options.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts index 43b12889254..e4935256b79 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts @@ -11,11 +11,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { Collection } from '@core/shared/collection.model'; +import { MetadataValue } from '@core/shared/metadata.models'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { Collection } from '../../../../core/shared/collection.model'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { RouterStub } from '../../../testing/router.stub'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts index 0e269c81b99..8af9b7325cf 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts @@ -6,17 +6,17 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { environment } from '../../../../../environments/environment'; import { getCollectionEditRoute } from '../../../../collection-page/collection-page-routing-paths'; -import { - SortDirection, - SortOptions, -} from '../../../../core/cache/models/sort-options.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; import { DSOSelectorModalWrapperComponent, diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts index cd5c0d1831a..51bd83ccdd8 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts @@ -11,11 +11,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { Community } from '@core/shared/community.model'; +import { MetadataValue } from '@core/shared/metadata.models'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { Community } from '../../../../core/shared/community.model'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { RouterStub } from '../../../testing/router.stub'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts index 7db4509ad35..90166e4bdb9 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts @@ -6,17 +6,17 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { environment } from '../../../../../environments/environment'; import { getCommunityEditRoute } from '../../../../community-page/community-page-routing-paths'; -import { - SortDirection, - SortOptions, -} from '../../../../core/cache/models/sort-options.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; import { DSOSelectorModalWrapperComponent, diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts index 36f38a48d8b..d0a2f9f8bab 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts @@ -11,11 +11,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { Item } from '@core/shared/item.model'; +import { MetadataValue } from '@core/shared/metadata.models'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { Item } from '../../../../core/shared/item.model'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { RouterStub } from '../../../testing/router.stub'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts index 7887d3205b5..4620710d5c4 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts @@ -7,12 +7,12 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { Item } from '@core/shared/item.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; -import { Item } from '../../../../core/shared/item.model'; import { getItemEditRoute } from '../../../../item-page/item-page-routing-paths'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; import { diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts index ef1084bdc88..f05a82b04ef 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts @@ -13,6 +13,14 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { + BATCH_EXPORT_SCRIPT_NAME, + ScriptDataService, +} from '@core/data/processes/script-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbActiveModal, NgbModal, @@ -24,16 +32,7 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { - BATCH_EXPORT_SCRIPT_NAME, - ScriptDataService, -} from '../../../../core/data/processes/script-data.service'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Item } from '../../../../core/shared/item.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model'; -import { SearchServiceStub } from '../../../../shared/testing/search-service.stub'; import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component'; import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; import { NotificationsService } from '../../../notifications/notifications.service'; @@ -43,6 +42,7 @@ import { createSuccessfulRemoteDataObject$, } from '../../../remote-data.utils'; import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; +import { SearchServiceStub } from '../../../testing/search-service.stub'; import { ExportBatchSelectorComponent } from './export-batch-selector.component'; // No way to add entryComponents yet to testbed; alternative implemented; source: https://stackoverflow.com/questions/41689468/how-to-shallow-test-a-component-with-an-entrycomponents diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts index 9a198e1a813..82a84069ac7 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts @@ -6,6 +6,18 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { + BATCH_EXPORT_SCRIPT_NAME, + ScriptDataService, +} from '@core/data/processes/script-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbActiveModal, NgbModal, @@ -23,18 +35,6 @@ import { switchMap, } from 'rxjs/operators'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../../core/data/feature-authorization/feature-id'; -import { - BATCH_EXPORT_SCRIPT_NAME, - ScriptDataService, -} from '../../../../core/data/processes/script-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Collection } from '../../../../core/shared/collection.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths'; import { Process } from '../../../../process-page/processes/process.model'; import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model'; diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts index 90d5f467718..d880bb39a8f 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts @@ -13,6 +13,14 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { + METADATA_EXPORT_SCRIPT_NAME, + ScriptDataService, +} from '@core/data/processes/script-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { Item } from '@core/shared/item.model'; import { NgbActiveModal, NgbModal, @@ -24,14 +32,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { - METADATA_EXPORT_SCRIPT_NAME, - ScriptDataService, -} from '../../../../core/data/processes/script-data.service'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Community } from '../../../../core/shared/community.model'; -import { Item } from '../../../../core/shared/item.model'; import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model'; import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component'; import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts index 0d3bd2d1282..c0e446f52e1 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts @@ -6,6 +6,19 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { + METADATA_EXPORT_SCRIPT_NAME, + ScriptDataService, +} from '@core/data/processes/script-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbActiveModal, NgbModal, @@ -23,19 +36,6 @@ import { switchMap, } from 'rxjs/operators'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../../core/data/feature-authorization/feature-id'; -import { - METADATA_EXPORT_SCRIPT_NAME, - ScriptDataService, -} from '../../../../core/data/processes/script-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Community } from '../../../../core/shared/community.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths'; import { Process } from '../../../../process-page/processes/process.model'; import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model'; diff --git a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts index e8580fe51d2..f91cf2ca176 100644 --- a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts @@ -5,17 +5,17 @@ import { waitForAsync, } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Item } from '../../../../core/shared/item.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; -import { SearchServiceStub } from '../../../../shared/testing/search-service.stub'; -import { ThemeService } from '../../../../shared/theme-support/theme.service'; +import { getMockThemeService } from '../../../mocks/theme-service.mock'; +import { NotificationsService } from '../../../notifications/notifications.service'; +import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; +import { SearchServiceStub } from '../../../testing/search-service.stub'; +import { ThemeService } from '../../../theme-support/theme.service'; import { ImportBatchSelectorComponent } from './import-batch-selector.component'; describe('ImportBatchSelectorComponent', () => { diff --git a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts index b648efda1b7..862c46be101 100644 --- a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts @@ -5,6 +5,9 @@ import { Output, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Collection } from '@core/shared/collection.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -12,9 +15,6 @@ import { of, } from 'rxjs'; -import { Collection } from '../../../../core/shared/collection.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; import { DSOSelectorModalWrapperComponent, diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts index cd540328d14..0008b843648 100644 --- a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts +++ b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts @@ -11,13 +11,13 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; import { TranslateModule } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { TestScheduler } from 'rxjs/testing'; -import { EntityTypeDataService } from '../../core/data/entity-type-data.service'; -import { ItemType } from '../../core/shared/item-relationships/item-type.model'; import { ThemedLoadingComponent } from '../loading/themed-loading.component'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { createPaginatedList } from '../testing/utils.test'; diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.ts index 42c65ab8b85..302354c4824 100644 --- a/src/app/shared/entity-dropdown/entity-dropdown.component.ts +++ b/src/app/shared/entity-dropdown/entity-dropdown.component.ts @@ -10,6 +10,12 @@ import { OnInit, Output, } from '@angular/core'; +import { EntityTypeDataService } from '@core/data/entity-type-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { getFirstSucceededRemoteWithNotEmptyData } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { @@ -23,12 +29,6 @@ import { switchMap, } from 'rxjs/operators'; -import { EntityTypeDataService } from '../../core/data/entity-type-data.service'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { ItemType } from '../../core/shared/item-relationships/item-type.model'; -import { getFirstSucceededRemoteWithNotEmptyData } from '../../core/shared/operators'; import { hasValue } from '../empty.util'; import { ThemedLoadingComponent } from '../loading/themed-loading.component'; diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts index 72b06a25824..c6a4af7f21b 100644 --- a/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts +++ b/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts @@ -12,6 +12,15 @@ import { waitForAsync, } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RequestService } from '@core/data/request.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { EPERSON } from '@core/eperson/models/eperson.resource-type'; +import { GROUP } from '@core/eperson/models/group.resource-type'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateModule } from '@ngx-translate/core'; import { hot } from 'jasmine-marbles'; import uniqueId from 'lodash/uniqueId'; @@ -21,15 +30,6 @@ import { APP_DATA_SERVICES_MAP, LazyDataServicesMap, } from '../../../config/app-config.interface'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { RequestService } from '../../core/data/request.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../core/eperson/group-data.service'; -import { EPERSON } from '../../core/eperson/models/eperson.resource-type'; -import { GROUP } from '../../core/eperson/models/group.resource-type'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { PageInfo } from '../../core/shared/page-info.model'; import { DSONameServiceMock } from '../mocks/dso-name.service.mock'; import { getMockRequestService } from '../mocks/request.service.mock'; import { PaginationComponent } from '../pagination/pagination.component'; diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.ts index ed9de60bd03..bce822e10cb 100644 --- a/src/app/shared/eperson-group-list/eperson-group-list.component.ts +++ b/src/app/shared/eperson-group-list/eperson-group-list.component.ts @@ -9,6 +9,23 @@ import { OnInit, Output, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { EPERSON } from '@core/eperson/models/eperson.resource-type'; +import { Group } from '@core/eperson/models/group.model'; +import { GROUP } from '@core/eperson/models/group.resource-type'; +import { lazyDataService } from '@core/lazy-data-service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { + getAllCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { ResourceType } from '@core/shared/resource-type'; import { TranslateModule } from '@ngx-translate/core'; import uniqueId from 'lodash/uniqueId'; import { @@ -21,23 +38,6 @@ import { APP_DATA_SERVICES_MAP, LazyDataServicesMap, } from '../../../config/app-config.interface'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../core/eperson/group-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { EPERSON } from '../../core/eperson/models/eperson.resource-type'; -import { Group } from '../../core/eperson/models/group.model'; -import { GROUP } from '../../core/eperson/models/group.resource-type'; -import { lazyDataService } from '../../core/lazy-data-service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { - getAllCompletedRemoteData, - getRemoteDataPayload, -} from '../../core/shared/operators'; -import { ResourceType } from '../../core/shared/resource-type'; import { fadeInOut } from '../animations/fade'; import { PaginationComponent } from '../pagination/pagination.component'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; diff --git a/src/app/shared/file-download-link/file-download-link.component.spec.ts b/src/app/shared/file-download-link/file-download-link.component.spec.ts index f16135fe437..bb451e1ba36 100644 --- a/src/app/shared/file-download-link/file-download-link.component.spec.ts +++ b/src/app/shared/file-download-link/file-download-link.component.spec.ts @@ -8,6 +8,12 @@ import { ActivatedRoute, RouterLink, } from '@angular/router'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Item } from '@core/shared/item.model'; +import { ItemRequest } from '@core/shared/item-request.model'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -18,12 +24,6 @@ import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from 'src/config/app-config.interface'; import { getBitstreamModuleRoute } from '../../app-routing-paths'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { Item } from '../../core/shared/item.model'; -import { ItemRequest } from '../../core/shared/item-request.model'; -import { URLCombiner } from '../../core/url-combiner/url-combiner'; import { getItemModuleRoute } from '../../item-page/item-page-routing-paths'; import { ActivatedRouteStub } from '../testing/active-router.stub'; import { RouterLinkDirectiveStub } from '../testing/router-link-directive.stub'; diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts index 2d8d0e4e893..c1edf6c624f 100644 --- a/src/app/shared/file-download-link/file-download-link.component.ts +++ b/src/app/shared/file-download-link/file-download-link.component.ts @@ -12,6 +12,12 @@ import { ActivatedRoute, RouterLink, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Item } from '@core/shared/item.model'; +import { ItemRequest } from '@core/shared/item-request.model'; import { TranslateModule, TranslateService, @@ -28,12 +34,6 @@ import { getBitstreamDownloadWithAccessTokenRoute, getBitstreamRequestACopyRoute, } from '../../app-routing-paths'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { Item } from '../../core/shared/item.model'; -import { ItemRequest } from '../../core/shared/item-request.model'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/file-download-link/themed-file-download-link.component.ts b/src/app/shared/file-download-link/themed-file-download-link.component.ts index b2c683360dc..19165f98c7a 100644 --- a/src/app/shared/file-download-link/themed-file-download-link.component.ts +++ b/src/app/shared/file-download-link/themed-file-download-link.component.ts @@ -2,9 +2,9 @@ import { Component, Input, } from '@angular/core'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Item } from '@core/shared/item.model'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { Item } from '../../core/shared/item.model'; import { ThemedComponent } from '../theme-support/themed.component'; import { FileDownloadLinkComponent } from './file-download-link.component'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts index 4ab7d00143f..f6747493217 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts @@ -17,6 +17,11 @@ import { UntypedFormGroup, } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { Item } from '@core/shared/item.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DYNAMIC_FORM_CONTROL_MAP_FN, @@ -62,11 +67,6 @@ import { APP_DATA_SERVICES_MAP, } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment'; -import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; -import { Item } from '../../../../core/shared/item.model'; -import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; -import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service'; -import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model'; import { SubmissionService } from '../../../../submission/submission.service'; import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts index 0a2e46a2d3b..30b610ca80f 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts @@ -30,6 +30,28 @@ import { UntypedFormArray, UntypedFormGroup, } from '@angular/forms'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { MetadataService } from '@core/metadata/metadata.service'; +import { Collection } from '@core/shared/collection.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { + MetadataValue, + VIRTUAL_METADATA_PREFIX, +} from '@core/shared/metadata.models'; +import { + getAllSucceededRemoteData, + getFirstSucceededRemoteData, + getFirstSucceededRemoteDataPayload, + getPaginatedListPayload, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { SUBMISSION_LINKS_TO_FOLLOW } from '@core/submission/resolver/submission-links-to-follow'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; import { NgbModal, NgbModalRef, @@ -76,28 +98,6 @@ import { AppConfig, } from '../../../../../config/app-config.interface'; import { AppState } from '../../../../app.reducer'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { MetadataService } from '../../../../core/metadata/metadata.service'; -import { Collection } from '../../../../core/shared/collection.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { Item } from '../../../../core/shared/item.model'; -import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; -import { - MetadataValue, - VIRTUAL_METADATA_PREFIX, -} from '../../../../core/shared/metadata.models'; -import { - getAllSucceededRemoteData, - getFirstSucceededRemoteData, - getFirstSucceededRemoteDataPayload, - getPaginatedListPayload, - getRemoteDataPayload, -} from '../../../../core/shared/operators'; -import { SubmissionObject } from '../../../../core/submission/models/submission-object.model'; -import { SUBMISSION_LINKS_TO_FOLLOW } from '../../../../core/submission/resolver/submission-links-to-follow'; -import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service'; import { paginatedRelationsToItems } from '../../../../item-page/simple/item-types/shared/item-relationships-utils'; import { SubmissionService } from '../../../../submission/submission.service'; import { BtnDisabledDirective } from '../../../btn-disabled.directive'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts index 63327d46f5c..da9435298f9 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts @@ -5,6 +5,8 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; import { Store } from '@ngrx/store'; import { TranslateLoader, @@ -12,8 +14,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Item } from '../../../../../core/shared/item.model'; -import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model'; import { SubmissionService } from '../../../../../submission/submission.service'; import { getMockThemeService } from '../../../../mocks/theme-service.mock'; import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts index 1b71215d6cf..5d0a4c1648f 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts @@ -10,6 +10,15 @@ import { Output, } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { ItemMetadataRepresentation } from '@core/shared/metadata-representation/item/item-metadata-representation.model'; +import { MetadataRepresentation } from '@core/shared/metadata-representation/metadata-representation.model'; +import { + getAllSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { DynamicFormArrayGroupModel } from '@ng-dynamic-forms/core'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; @@ -23,15 +32,6 @@ import { } from 'rxjs/operators'; import { AppState } from '../../../../../app.reducer'; -import { Item } from '../../../../../core/shared/item.model'; -import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model'; -import { MetadataValue } from '../../../../../core/shared/metadata.models'; -import { ItemMetadataRepresentation } from '../../../../../core/shared/metadata-representation/item/item-metadata-representation.model'; -import { MetadataRepresentation } from '../../../../../core/shared/metadata-representation/metadata-representation.model'; -import { - getAllSucceededRemoteData, - getRemoteDataPayload, -} from '../../../../../core/shared/operators'; import { SubmissionObjectEntry } from '../../../../../submission/objects/submission-objects.reducer'; import { SubmissionService } from '../../../../../submission/submission.service'; import { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts index 9dc8c0fb52d..7f4014b2b1a 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts @@ -4,12 +4,12 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Item } from '../../../../../core/shared/item.model'; -import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model'; import { SubmissionService } from '../../../../../submission/submission.service'; import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model'; import { ListableObjectComponentLoaderComponent } from '../../../../object-collection/shared/listable-object/listable-object-component-loader.component'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts index 15623682f22..80eebbb13af 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts @@ -9,6 +9,12 @@ import { OnInit, Output, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { + getAllSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; import { Store } from '@ngrx/store'; import { BehaviorSubject, @@ -18,12 +24,6 @@ import { import { filter } from 'rxjs/operators'; import { AppState } from '../../../../../app.reducer'; -import { Item } from '../../../../../core/shared/item.model'; -import { - getAllSucceededRemoteData, - getRemoteDataPayload, -} from '../../../../../core/shared/operators'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { SubmissionService } from '../../../../../submission/submission.service'; import { hasValue, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts index 34cac3f6db1..a7ac430be2e 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts @@ -20,6 +20,7 @@ import { ReactiveFormsModule, UntypedFormGroup, } from '@angular/forms'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; import { DynamicFormArrayComponent, DynamicFormControlCustomEvent, @@ -36,7 +37,6 @@ import { TranslateService, } from '@ngx-translate/core'; -import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model'; import { hasValue } from '../../../../../empty.util'; import { LiveRegionService } from '../../../../../live-region/live-region.service'; import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-control-container.component'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts index 1d828318cbd..0978cd8493e 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts @@ -1,3 +1,4 @@ +import { MetadataValue } from '@core/shared/metadata.models'; import { DynamicDateControlModel, DynamicDatePickerModelConfig, @@ -11,7 +12,6 @@ import { Subject, } from 'rxjs'; -import { MetadataValue } from '../../../../../../core/shared/metadata.models'; import { isEmpty, isNotUndefined, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts index fc59c58574c..136096ef2f1 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts @@ -1,3 +1,4 @@ +import { MetadataValue } from '@core/shared/metadata.models'; import { DynamicFormControlLayout, DynamicFormControlRelation, @@ -7,7 +8,6 @@ import { } from '@ng-dynamic-forms/core'; import { Subject } from 'rxjs'; -import { MetadataValue } from '../../../../../core/shared/metadata.models'; import { hasNoValue, isNotEmpty, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts index e239099bc41..0486d868cf1 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts @@ -1,3 +1,4 @@ +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { DynamicFormControlLayout, DynamicFormControlRelation, @@ -7,7 +8,6 @@ import { } from '@ng-dynamic-forms/core'; import { Subject } from 'rxjs'; -import { VocabularyOptions } from '../../../../../core/submission/vocabularies/models/vocabulary-options.model'; import { hasValue } from '../../../../empty.util'; import { LanguageCode } from '../../models/form-field-language-value.model'; import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts index 6984e617697..05243357861 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts @@ -5,6 +5,9 @@ import { Output, } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; +import { PageInfo } from '@core/shared/page-info.model'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { DynamicFormControlComponent, DynamicFormLayoutService, @@ -16,9 +19,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { VocabularyEntry } from '../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; import { isNotEmpty } from '../../../../empty.util'; import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model'; import { DsDynamicInputModel } from './ds-dynamic-input.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts index 9fa2ead2a60..f55c2d58a73 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts @@ -1,3 +1,5 @@ +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { DynamicCheckboxGroupModel, DynamicFormControlLayout, @@ -7,8 +9,6 @@ import { } from '@ng-dynamic-forms/core'; import { Subject } from 'rxjs'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model'; import { hasValue } from '../../../../../empty.util'; export interface DynamicListCheckboxGroupModelConfig extends DynamicFormGroupModelConfig { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts index af5f65802d1..6953035ce5c 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts @@ -1,3 +1,5 @@ +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { DynamicFormControlLayout, DynamicFormControlRelation, @@ -6,8 +8,6 @@ import { serializable, } from '@ng-dynamic-forms/core'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model'; import { hasValue } from '../../../../../empty.util'; export interface DynamicListModelConfig extends DynamicRadioGroupModelConfig { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts index 9ead88a2769..8af955e7d70 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts @@ -16,6 +16,11 @@ import { UntypedFormGroup, } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormControlLayout, @@ -25,11 +30,6 @@ import { } from '@ng-dynamic-forms/core'; import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap'; -import { ConfigurationDataService } from '../../../../../../core/data/configuration-data.service'; -import { ConfigurationProperty } from '../../../../../../core/shared/configuration-property.model'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils'; import { mockDynamicFormLayoutService, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts index 576cdef20b6..d59ec0fa619 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts @@ -18,6 +18,11 @@ import { ValidationErrors, ValidatorFn, } from '@angular/forms'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbButtonsModule } from '@ng-bootstrap/ng-bootstrap'; import { DynamicCheckboxModel, @@ -36,11 +41,6 @@ import { tap, } from 'rxjs/operators'; -import { PaginatedList } from '../../../../../../core/data/paginated-list.model'; -import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators'; -import { PageInfo } from '../../../../../../core/shared/page-info.model'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts index 87434f39967..88df7a50728 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts @@ -19,6 +19,9 @@ import { UntypedFormGroup, } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormLayoutService, @@ -30,9 +33,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { of } from 'rxjs'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { BtnDisabledDirective } from '../../../../../btn-disabled.directive'; import { mockDynamicFormLayoutService, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts index 7175f5fa2e0..249a7f95281 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts @@ -15,6 +15,15 @@ import { FormsModule, UntypedFormGroup, } from '@angular/forms'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { ConfidenceType } from '@core/shared/confidence-type'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbDropdown, NgbDropdownModule, @@ -35,15 +44,6 @@ import { distinctUntilChanged, } from 'rxjs/operators'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../../../../core/data/paginated-list.model'; -import { ConfidenceType } from '../../../../../../core/shared/confidence-type'; -import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators'; -import { PageInfo } from '../../../../../../core/shared/page-info.model'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { BtnDisabledDirective } from '../../../../../btn-disabled.directive'; import { hasValue, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts index bf2723eda54..e27394b39a9 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts @@ -20,6 +20,9 @@ import { UntypedFormGroup, } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbModal, NgbModule, @@ -35,9 +38,6 @@ import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils'; import { mockDynamicFormLayoutService, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts index 5b2cfd01a8b..1f7a6f89d43 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts @@ -16,6 +16,17 @@ import { FormsModule, UntypedFormGroup, } from '@angular/forms'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { ConfidenceType } from '@core/shared/confidence-type'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; +import { Vocabulary } from '@core/submission/vocabularies/models/vocabulary.model'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbModal, NgbModalRef, @@ -46,17 +57,6 @@ import { tap, } from 'rxjs/operators'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../../../../core/data/paginated-list.model'; -import { ConfidenceType } from '../../../../../../core/shared/confidence-type'; -import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators'; -import { PageInfo } from '../../../../../../core/shared/page-info.model'; -import { Vocabulary } from '../../../../../../core/submission/vocabularies/models/vocabulary.model'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { BtnDisabledDirective } from '../../../../../btn-disabled.directive'; import { hasValue, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts index 1354614699a..3eaea6fcd79 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts @@ -21,6 +21,11 @@ import { UntypedFormGroup, } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { FormRowModel } from '@core/config/models/config-submission-form.model'; +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { NgbModule, NgbTooltipModule, @@ -38,11 +43,6 @@ import { } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment.test'; -import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model'; -import { SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model'; -import { SubmissionObjectDataService } from '../../../../../../core/submission/submission-object-data.service'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; -import { XSRFService } from '../../../../../../core/xsrf/xsrf.service'; import { SubmissionService } from '../../../../../../submission/submission.service'; import { createTestComponent } from '../../../../../testing/utils.test'; import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts index d227ed3f5be..0217d333c05 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts @@ -14,6 +14,10 @@ import { ViewChild, } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormControlComponent, @@ -40,10 +44,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../../../../../environments/environment'; -import { SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model'; -import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators'; -import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { shrinkInOut } from '../../../../../animations/shrink'; import { BtnDisabledDirective } from '../../../../../btn-disabled.directive'; import { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts index d88c29d148c..fa1dd1ef51f 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts @@ -1,9 +1,9 @@ +import { FormRowModel } from '@core/config/models/config-submission-form.model'; import { DynamicFormControlLayout, serializable, } from '@ng-dynamic-forms/core'; -import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model'; import { isEmpty, isNull, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts index 3dfa0ac15c3..d475f5d326c 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts @@ -20,6 +20,9 @@ import { UntypedFormGroup, } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormLayoutService, @@ -31,9 +34,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { APP_DATA_SERVICES_MAP } from '../../../../../../../config/app-config.interface'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { mockDynamicFormLayoutService, mockDynamicFormValidationService, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts index 85f6c923cc4..a51e8151a2f 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts @@ -12,6 +12,17 @@ import { ViewChild, } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { FindAllDataImpl } from '@core/data/base/find-all-data'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { lazyDataService } from '@core/lazy-data-service'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbDropdown, NgbDropdownModule, @@ -38,17 +49,6 @@ import { LazyDataServicesMap, } from 'src/config/app-config.interface'; -import { CacheableObject } from '../../../../../../core/cache/cacheable-object.model'; -import { FindAllDataImpl } from '../../../../../../core/data/base/find-all-data'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../../../core/data/remote-data'; -import { lazyDataService } from '../../../../../../core/lazy-data-service'; -import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators'; -import { PageInfo } from '../../../../../../core/shared/page-info.model'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { BtnDisabledDirective } from '../../../../../btn-disabled.directive'; import { hasValue, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts index 8454186801f..c02717bae35 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts @@ -1,11 +1,11 @@ +import { ResourceType } from '@core/shared/resource-type'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable, } from '@ng-dynamic-forms/core'; -import { ResourceType } from '../../../../../../core/shared/resource-type'; -import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model'; import { DsDynamicInputModel, DsDynamicInputModelConfig, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts index e76d37b89b7..8c1600c0aff 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts @@ -18,6 +18,9 @@ import { UntypedFormControl, UntypedFormGroup, } from '@angular/forms'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbModule, NgbTypeaheadSelectItemEvent, @@ -31,9 +34,6 @@ import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstr import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { mockDynamicFormLayoutService, mockDynamicFormValidationService, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts index 203f02d4afe..ef55a6b7252 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts @@ -12,6 +12,14 @@ import { FormsModule, UntypedFormGroup, } from '@angular/forms'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbTypeahead, NgbTypeaheadModule, @@ -37,14 +45,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../../../../../environments/environment'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../../../../core/data/paginated-list.model'; -import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators'; -import { PageInfo } from '../../../../../../core/shared/page-info.model'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts index 484551ae18a..54a30f9d214 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts @@ -10,6 +10,16 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ExternalSourceDataService } from '@core/data/external-source-data.service'; +import { LookupRelationService } from '@core/data/lookup-relation.service'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { ExternalSource } from '@core/shared/external-source.model'; +import { Item } from '@core/shared/item.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { NgbActiveModal, NgbModule, @@ -23,16 +33,6 @@ import { } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../../../../config/app-config.interface'; -import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service'; -import { LookupRelationService } from '../../../../../core/data/lookup-relation.service'; -import { RelationshipDataService } from '../../../../../core/data/relationship-data.service'; -import { Collection } from '../../../../../core/shared/collection.model'; -import { ExternalSource } from '../../../../../core/shared/external-source.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; -import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model'; -import { XSRFService } from '../../../../../core/xsrf/xsrf.service'; import { BtnDisabledDirective } from '../../../../btn-disabled.directive'; import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model'; import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts index a1f8c9c7adc..e7f96ba6756 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts @@ -8,6 +8,23 @@ import { Output, } from '@angular/core'; import { Router } from '@angular/router'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { ExternalSourceDataService } from '@core/data/external-source-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { LookupRelationService } from '@core/data/lookup-relation.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { ExternalSource } from '@core/shared/external-source.model'; +import { Item } from '@core/shared/item.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; +import { + getAllSucceededRemoteDataPayload, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbActiveModal, NgbNavModule, @@ -28,23 +45,6 @@ import { } from 'rxjs/operators'; import { AppState } from '../../../../../app.reducer'; -import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { RequestParam } from '../../../../../core/cache/models/request-param.model'; -import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service'; -import { FindListOptions } from '../../../../../core/data/find-list-options.model'; -import { LookupRelationService } from '../../../../../core/data/lookup-relation.service'; -import { PaginatedList } from '../../../../../core/data/paginated-list.model'; -import { RelationshipDataService } from '../../../../../core/data/relationship-data.service'; -import { Context } from '../../../../../core/shared/context.model'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; -import { ExternalSource } from '../../../../../core/shared/external-source.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model'; -import { - getAllSucceededRemoteDataPayload, - getFirstSucceededRemoteDataPayload, -} from '../../../../../core/shared/operators'; -import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; import { BtnDisabledDirective } from '../../../../btn-disabled.directive'; import { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts index 882e7c978e6..61663e9beab 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts @@ -10,6 +10,14 @@ import { import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { ExternalSourceDataService } from '@core/data/external-source-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Collection } from '@core/shared/collection.model'; +import { ExternalSource } from '@core/shared/external-source.model'; +import { ExternalSourceEntry } from '@core/shared/external-source-entry.model'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -17,14 +25,6 @@ import { of, } from 'rxjs'; -import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { Collection } from '../../../../../../core/shared/collection.model'; -import { ExternalSource } from '../../../../../../core/shared/external-source.model'; -import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model'; -import { Item } from '../../../../../../core/shared/item.model'; -import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { ErrorComponent } from '../../../../../error/error.component'; import { ThemedLoadingComponent } from '../../../../../loading/themed-loading.component'; import { ObjectCollectionComponent } from '../../../../../object-collection/object-collection.component'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts index ec5ba8ff0c6..61742a40a71 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts @@ -9,6 +9,18 @@ import { Output, } from '@angular/core'; import { Router } from '@angular/router'; +import { ExternalSourceDataService } from '@core/data/external-source-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Collection } from '@core/shared/collection.model'; +import { Context } from '@core/shared/context.model'; +import { ExternalSource } from '@core/shared/external-source.model'; +import { ExternalSourceEntry } from '@core/shared/external-source-entry.model'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModal, NgbModalRef, @@ -24,18 +36,6 @@ import { switchMap, } from 'rxjs/operators'; -import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service'; -import { PaginatedList } from '../../../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../../../core/data/remote-data'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { Collection } from '../../../../../../core/shared/collection.model'; -import { Context } from '../../../../../../core/shared/context.model'; -import { ExternalSource } from '../../../../../../core/shared/external-source.model'; -import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model'; -import { Item } from '../../../../../../core/shared/item.model'; -import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model'; -import { getFirstCompletedRemoteData } from '../../../../../../core/shared/operators'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-configuration.service'; import { fadeIn, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts index e2a4bbf4bbc..c647ba1878a 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.spec.ts @@ -6,17 +6,17 @@ import { } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { ItemDataService } from '@core/data/item-data.service'; +import { LookupRelationService } from '@core/data/lookup-relation.service'; +import { Collection } from '@core/shared/collection.model'; +import { ExternalSourceEntry } from '@core/shared/external-source-entry.model'; +import { Item } from '@core/shared/item.model'; import { NgbActiveModal, NgbModule, } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { ItemDataService } from '../../../../../../../core/data/item-data.service'; -import { LookupRelationService } from '../../../../../../../core/data/lookup-relation.service'; -import { Collection } from '../../../../../../../core/shared/collection.model'; -import { ExternalSourceEntry } from '../../../../../../../core/shared/external-source-entry.model'; -import { Item } from '../../../../../../../core/shared/item.model'; import { NotificationsService } from '../../../../../../notifications/notifications.service'; import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model'; import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts index 51cdef260f0..44c3cfbb4d5 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -4,6 +4,20 @@ import { EventEmitter, OnInit, } from '@angular/core'; +import { ItemDataService } from '@core/data/item-data.service'; +import { LookupRelationService } from '@core/data/lookup-relation.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { ExternalSourceEntry } from '@core/shared/external-source-entry.model'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { Metadata } from '@core/shared/metadata.utils'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { NgbActiveModal, NgbModal, @@ -19,20 +33,6 @@ import { take, } from 'rxjs/operators'; -import { ItemDataService } from '../../../../../../../core/data/item-data.service'; -import { LookupRelationService } from '../../../../../../../core/data/lookup-relation.service'; -import { PaginatedList } from '../../../../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../../../../core/data/remote-data'; -import { Context } from '../../../../../../../core/shared/context.model'; -import { ExternalSourceEntry } from '../../../../../../../core/shared/external-source-entry.model'; -import { Item } from '../../../../../../../core/shared/item.model'; -import { ItemType } from '../../../../../../../core/shared/item-relationships/item-type.model'; -import { MetadataValue } from '../../../../../../../core/shared/metadata.models'; -import { Metadata } from '../../../../../../../core/shared/metadata.utils'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../../../../../core/shared/operators'; import { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component'; import { BtnDisabledDirective } from '../../../../../../btn-disabled.directive'; import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts index 590871d5bfe..fde40c9948a 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component.ts @@ -4,11 +4,11 @@ import { Input, Output, } from '@angular/core'; +import { Collection } from '@core/shared/collection.model'; +import { Context } from '@core/shared/context.model'; +import { ExternalSource } from '@core/shared/external-source.model'; +import { Item } from '@core/shared/item.model'; -import { Collection } from '../../../../../../core/shared/collection.model'; -import { Context } from '../../../../../../core/shared/context.model'; -import { ExternalSource } from '../../../../../../core/shared/external-source.model'; -import { Item } from '../../../../../../core/shared/item.model'; import { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; import { ThemedComponent } from '../../../../../theme-support/themed.component'; import { RelationshipOptions } from '../../../models/relationship-options.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts index 7d21fcb1f6f..a0e3a365174 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts @@ -2,10 +2,10 @@ /** * The list of RelationshipAction type definitions */ +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; import { Action } from '@ngrx/store'; -import { Item } from '../../../../../core/shared/item.model'; -import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model'; import { type } from '../../../../ngrx/type'; export const RelationshipActionTypes = { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts index 8ff3d7d9682..a133034f074 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts @@ -2,6 +2,19 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RestResponse } from '@core/cache/response.models'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RelationshipTypeDataService } from '@core/data/relationship-type-data.service'; +import { RequestService } from '@core/data/request.service'; +import { Item } from '@core/shared/item.model'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { DEBOUNCE_TIME_OPERATOR } from '@core/shared/operators'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; import { provideMockActions } from '@ngrx/effects/testing'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; @@ -16,19 +29,6 @@ import { } from 'rxjs'; import { last } from 'rxjs/operators'; -import { ObjectCacheService } from '../../../../../core/cache/object-cache.service'; -import { RestResponse } from '../../../../../core/cache/response.models'; -import { RelationshipDataService } from '../../../../../core/data/relationship-data.service'; -import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service'; -import { RequestService } from '../../../../../core/data/request.service'; -import { Item } from '../../../../../core/shared/item.model'; -import { ItemType } from '../../../../../core/shared/item-relationships/item-type.model'; -import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model'; -import { MetadataValue } from '../../../../../core/shared/metadata.models'; -import { DEBOUNCE_TIME_OPERATOR } from '../../../../../core/shared/operators'; -import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model'; -import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service'; import { NotificationsService } from '../../../../notifications/notifications.service'; import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service'; import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts index cb49c831155..b125ad7b7f4 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts @@ -3,6 +3,23 @@ import { Inject, Injectable, } from '@angular/core'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { ServerSyncBufferActionTypes } from '@core/cache/server-sync-buffer.actions'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { RelationshipTypeDataService } from '@core/data/relationship-type-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { JsonPatchOperationsActionTypes } from '@core/json-patch/json-patch-operations.actions'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; +import { + DEBOUNCE_TIME_OPERATOR, + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; import { Actions, createEffect, @@ -25,23 +42,6 @@ import { tap, } from 'rxjs/operators'; -import { ObjectCacheService } from '../../../../../core/cache/object-cache.service'; -import { ServerSyncBufferActionTypes } from '../../../../../core/cache/server-sync-buffer.actions'; -import { RelationshipDataService } from '../../../../../core/data/relationship-data.service'; -import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { RequestService } from '../../../../../core/data/request.service'; -import { JsonPatchOperationsActionTypes } from '../../../../../core/json-patch/json-patch-operations.actions'; -import { Item } from '../../../../../core/shared/item.model'; -import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model'; -import { - DEBOUNCE_TIME_OPERATOR, - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../../../core/shared/operators'; -import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model'; -import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service'; import { SaveSubmissionSectionFormSuccessAction } from '../../../../../submission/objects/submission-objects.actions'; import { SubmissionState } from '../../../../../submission/submission.reducers'; import { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts index 288749ba8e0..e0ad9acd3ad 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts @@ -5,17 +5,17 @@ import { waitForAsync, } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { LookupRelationService } from '@core/data/lookup-relation.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Item } from '@core/shared/item.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service'; -import { buildPaginatedList } from '../../../../../../core/data/paginated-list.model'; -import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { Item } from '../../../../../../core/shared/item.model'; -import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model'; -import { SearchService } from '../../../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model'; import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts index 28907656733..73e51fc181c 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts @@ -7,6 +7,21 @@ import { OnInit, Output, } from '@angular/core'; +import { LookupRelationService } from '@core/data/lookup-relation.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RelationshipDataService } from '@core/data/relationship-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -15,21 +30,6 @@ import { } from 'rxjs'; import { take } from 'rxjs/operators'; -import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service'; -import { PaginatedList } from '../../../../../../core/data/paginated-list.model'; -import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { Context } from '../../../../../../core/shared/context.model'; -import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model'; -import { Item } from '../../../../../../core/shared/item.model'; -import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../../../../core/shared/operators'; -import { SearchService } from '../../../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-configuration.service'; import { hasValue } from '../../../../../empty.util'; import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts index 835fe0bc4d1..c3d7df85756 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts @@ -4,12 +4,12 @@ import { Input, Output, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { RelationshipType } from '@core/shared/item-relationships/relationship-type.model'; import { Observable } from 'rxjs'; -import { Context } from '../../../../../../core/shared/context.model'; -import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model'; -import { Item } from '../../../../../../core/shared/item.model'; -import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model'; import { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; import { SearchObjects } from '../../../../../search/models/search-objects.model'; import { SearchResult } from '../../../../../search/models/search-result.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts index 6b709bce945..9fd4102588c 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts @@ -6,24 +6,24 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Item } from '@core/shared/item.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, of, } from 'rxjs'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../../../core/data/remote-data'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { Item } from '../../../../../../core/shared/item.model'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; -import { ObjectCollectionComponent } from '../../../../../../shared/object-collection/object-collection.component'; -import { PageSizeSelectorComponent } from '../../../../../../shared/page-size-selector/page-size-selector.component'; +import { ObjectCollectionComponent } from '../../../../../object-collection/object-collection.component'; import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model'; import { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; +import { PageSizeSelectorComponent } from '../../../../../page-size-selector/page-size-selector.component'; import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model'; import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils'; import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts index c55fdea1535..8f5da5e4562 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts @@ -7,6 +7,16 @@ import { Output, } from '@angular/core'; import { Router } from '@angular/router'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { @@ -15,16 +25,6 @@ import { take, } from 'rxjs/operators'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../../../core/data/remote-data'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { Context } from '../../../../../../core/shared/context.model'; -import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model'; -import { PageInfo } from '../../../../../../core/shared/page-info.model'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-configuration.service'; import { ObjectCollectionComponent } from '../../../../../object-collection/object-collection.component'; import { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts index 1e481391915..ebd6c20f03c 100644 --- a/src/app/shared/form/builder/form-builder.service.spec.ts +++ b/src/app/shared/form/builder/form-builder.service.spec.ts @@ -10,6 +10,11 @@ import { UntypedFormControl, UntypedFormGroup, } from '@angular/forms'; +import { FormRowModel } from '@core/config/models/config-submission-form.model'; +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { DynamicCheckboxGroupModel, DynamicCheckboxModel, @@ -33,11 +38,6 @@ import { } from '@ng-dynamic-forms/core'; import { TranslateService } from '@ngx-translate/core'; -import { FormRowModel } from '../../../core/config/models/config-submission-form.model'; -import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; -import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model'; import { getMockTranslateService } from '../../mocks/translate.service.mock'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { DynamicDsDatePickerModel } from './ds-dynamic-form-ui/models/date-picker/date-picker.model'; diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts index 66c500f23dc..a9ba8f0a845 100644 --- a/src/app/shared/form/builder/form-builder.service.ts +++ b/src/app/shared/form/builder/form-builder.service.ts @@ -7,6 +7,10 @@ import { UntypedFormControl, UntypedFormGroup, } from '@angular/forms'; +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { VIRTUAL_METADATA_PREFIX } from '@core/shared/metadata.models'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { DYNAMIC_FORM_CONTROL_TYPE_ARRAY, DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX_GROUP, @@ -28,10 +32,6 @@ import isObject from 'lodash/isObject'; import isString from 'lodash/isString'; import mergeWith from 'lodash/mergeWith'; -import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { dateToString, isNgbDateStruct, diff --git a/src/app/shared/form/builder/models/form-field-metadata-value.model.ts b/src/app/shared/form/builder/models/form-field-metadata-value.model.ts index b36e793f446..454e9c03c68 100644 --- a/src/app/shared/form/builder/models/form-field-metadata-value.model.ts +++ b/src/app/shared/form/builder/models/form-field-metadata-value.model.ts @@ -1,8 +1,9 @@ -import { ConfidenceType } from '../../../../core/shared/confidence-type'; +import { ConfidenceType } from '@core/shared/confidence-type'; import { MetadataValueInterface, VIRTUAL_METADATA_PREFIX, -} from '../../../../core/shared/metadata.models'; +} from '@core/shared/metadata.models'; + import { hasValue, isEmpty, diff --git a/src/app/shared/form/builder/models/form-field.model.ts b/src/app/shared/form/builder/models/form-field.model.ts index a89801007f9..76114504dfc 100644 --- a/src/app/shared/form/builder/models/form-field.model.ts +++ b/src/app/shared/form/builder/models/form-field.model.ts @@ -1,7 +1,7 @@ +import { FormRowModel } from '@core/config/models/config-submission-form.model'; import { autoserialize } from 'cerialize'; -import { FormRowModel } from '../../../../core/config/models/config-submission-form.model'; -import { SectionVisibility } from './../../../../submission/objects/section-visibility.model'; +import { SectionVisibility } from '../../../../submission/objects/section-visibility.model'; import { LanguageCode } from './form-field-language-value.model'; import { RelationshipOptions } from './relationship-options.model'; diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts index c634c7d8766..f9c0c862bce 100644 --- a/src/app/shared/form/builder/parsers/field-parser.ts +++ b/src/app/shared/form/builder/parsers/field-parser.ts @@ -2,6 +2,8 @@ import { Inject, InjectionToken, } from '@angular/core'; +import { SubmissionScopeType } from '@core/submission/submission-scope-type'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { DynamicFormControlLayout, DynamicFormControlRelation, @@ -11,8 +13,8 @@ import { import { TranslateService } from '@ngx-translate/core'; import uniqueId from 'lodash/uniqueId'; -import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type'; -import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model'; +import { SectionVisibility } from '../../../../submission/objects/section-visibility.model'; +import { VisibilityType } from '../../../../submission/sections/visibility-type'; import { isNgbDateStruct } from '../../../date.util'; import { hasValue, @@ -31,8 +33,6 @@ import { import { FormFieldModel } from '../models/form-field.model'; import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model'; import { RelationshipOptions } from '../models/relationship-options.model'; -import { SectionVisibility } from './../../../../submission/objects/section-visibility.model'; -import { VisibilityType } from './../../../../submission/sections/visibility-type'; import { setLayout } from './parser.utils'; import { ParserOptions } from './parser-options'; import { ParserType } from './parser-type'; diff --git a/src/app/shared/form/builder/parsers/relation-group-field-parser.ts b/src/app/shared/form/builder/parsers/relation-group-field-parser.ts index 30401b20efc..bef94284b89 100644 --- a/src/app/shared/form/builder/parsers/relation-group-field-parser.ts +++ b/src/app/shared/form/builder/parsers/relation-group-field-parser.ts @@ -1,4 +1,5 @@ -import { FormRowModel } from '../../../../core/config/models/config-submission-form.model'; +import { FormRowModel } from '@core/config/models/config-submission-form.model'; + import { isNotEmpty } from '../../../empty.util'; import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-ui/ds-dynamic-form-constants'; import { diff --git a/src/app/shared/form/builder/parsers/row-parser.spec.ts b/src/app/shared/form/builder/parsers/row-parser.spec.ts index d87931a4880..5cd63d5d9a8 100644 --- a/src/app/shared/form/builder/parsers/row-parser.spec.ts +++ b/src/app/shared/form/builder/parsers/row-parser.spec.ts @@ -1,8 +1,8 @@ import { Injector } from '@angular/core'; +import { FormRowModel } from '@core/config/models/config-submission-form.model'; import { TranslateService } from '@ngx-translate/core'; import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock'; -import { FormRowModel } from '../../../../core/config/models/config-submission-form.model'; import { DynamicRowArrayModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-array-model'; import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model'; import { FormFieldModel } from '../models/form-field.model'; diff --git a/src/app/shared/form/builder/parsers/row-parser.ts b/src/app/shared/form/builder/parsers/row-parser.ts index 5de43bb9189..7291978bbae 100644 --- a/src/app/shared/form/builder/parsers/row-parser.ts +++ b/src/app/shared/form/builder/parsers/row-parser.ts @@ -2,13 +2,15 @@ import { Injectable, Injector, } from '@angular/core'; +import { SubmissionFieldScopeType } from '@core/submission/submission-field-scope-type'; +import { SubmissionScopeType } from '@core/submission/submission-scope-type'; import { DYNAMIC_FORM_CONTROL_TYPE_ARRAY, DynamicFormGroupModelConfig, } from '@ng-dynamic-forms/core'; import uniqueId from 'lodash/uniqueId'; -import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type'; +import { SectionVisibility } from '../../../../submission/objects/section-visibility.model'; import { isEmpty, isNotEmpty, @@ -16,8 +18,6 @@ import { import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../ds-dynamic-form-ui/ds-dynamic-form-constants'; import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model'; import { FormFieldModel } from '../models/form-field.model'; -import { SubmissionFieldScopeType } from './../../../../core/submission/submission-field-scope-type'; -import { SectionVisibility } from './../../../../submission/objects/section-visibility.model'; import { CONFIG_DATA, FieldParser, diff --git a/src/app/shared/form/chips/chips.component.spec.ts b/src/app/shared/form/chips/chips.component.spec.ts index 6fb62320488..796700090ad 100644 --- a/src/app/shared/form/chips/chips.component.spec.ts +++ b/src/app/shared/form/chips/chips.component.spec.ts @@ -14,11 +14,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { ConfidenceType } from '@core/shared/confidence-type'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { environment } from '../../../../environments/environment'; -import { ConfidenceType } from '../../../core/shared/confidence-type'; import { createTestComponent } from '../../testing/utils.test'; import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model'; import { AuthorityConfidenceStateDirective } from '../directives/authority-confidence-state.directive'; diff --git a/src/app/shared/form/chips/models/chips-item.model.ts b/src/app/shared/form/chips/models/chips-item.model.ts index a2c6033ff80..000cecc827b 100644 --- a/src/app/shared/form/chips/models/chips-item.model.ts +++ b/src/app/shared/form/chips/models/chips-item.model.ts @@ -1,7 +1,7 @@ +import { ConfidenceType } from '@core/shared/confidence-type'; import isObject from 'lodash/isObject'; import uniqueId from 'lodash/uniqueId'; -import { ConfidenceType } from '../../../../core/shared/confidence-type'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/form/chips/models/chips.model.ts b/src/app/shared/form/chips/models/chips.model.ts index 5b2d3c5da8a..6c396fa8ed5 100644 --- a/src/app/shared/form/chips/models/chips.model.ts +++ b/src/app/shared/form/chips/models/chips.model.ts @@ -1,10 +1,10 @@ +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; import findIndex from 'lodash/findIndex'; import isEqual from 'lodash/isEqual'; import isObject from 'lodash/isObject'; import { BehaviorSubject } from 'rxjs'; import { MetadataIconConfig } from '../../../../../config/submission-config.interface'; -import { VocabularyEntry } from '../../../../core/submission/vocabularies/models/vocabulary-entry.model'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/form/directives/authority-confidence-state.directive.ts b/src/app/shared/form/directives/authority-confidence-state.directive.ts index 1c6c6274741..0b6ea24a467 100644 --- a/src/app/shared/form/directives/authority-confidence-state.directive.ts +++ b/src/app/shared/form/directives/authority-confidence-state.directive.ts @@ -18,15 +18,15 @@ import { Renderer2, SimpleChanges, } from '@angular/core'; +import { ConfidenceType } from '@core/shared/confidence-type'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { TranslateService } from '@ngx-translate/core'; import findIndex from 'lodash/findIndex'; import { ConfidenceIconConfig } from '../../../../config/submission-config.interface'; import { environment } from '../../../../environments/environment'; -import { ConfidenceType } from '../../../core/shared/confidence-type'; -import { MetadataValue } from '../../../core/shared/metadata.models'; -import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { isNotEmpty, isNull, diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts index 1a0a8010222..789c3dd718b 100644 --- a/src/app/shared/form/form.component.spec.ts +++ b/src/app/shared/form/form.component.spec.ts @@ -15,6 +15,7 @@ import { FormsModule, ReactiveFormsModule, } from '@angular/forms'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormArrayModel, @@ -33,7 +34,6 @@ import { BehaviorSubject } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; import { storeModuleConfig } from '../../app.reducer'; -import { XSRFService } from '../../core/xsrf/xsrf.service'; import { StoreMock } from '../testing/store.mock'; import { createTestComponent } from '../testing/utils.test'; import { DsDynamicFormComponent } from './builder/ds-dynamic-form-ui/ds-dynamic-form.component'; diff --git a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts index 99ec27dd7db..a5ab86dda6c 100644 --- a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts +++ b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts @@ -2,10 +2,10 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model'; import { VocabularyTreeviewComponent } from '../vocabulary-treeview/vocabulary-treeview.component'; import { VocabularyTreeviewModalComponent } from './vocabulary-treeview-modal.component'; diff --git a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.ts b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.ts index c9a598a0070..5b5dad27641 100644 --- a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.ts +++ b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.ts @@ -5,14 +5,14 @@ import { OnInit, Output, } from '@angular/core'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model'; import { VocabularyTreeviewComponent } from '../vocabulary-treeview/vocabulary-treeview.component'; @Component({ diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview-node.model.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview-node.model.ts index c4dc5fb1fde..0e52f4930fe 100644 --- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview-node.model.ts +++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview-node.model.ts @@ -1,9 +1,8 @@ /* eslint-disable max-classes-per-file */ +import { PageInfo } from '@core/shared/page-info.model'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { BehaviorSubject } from 'rxjs'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; - export const LOAD_MORE = 'LOAD_MORE'; export const LOAD_MORE_ROOT = 'LOAD_MORE_ROOT'; export const LOAD_MORE_NODE: any = { id: LOAD_MORE }; diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts index e43d18daa26..967cb50bb38 100644 --- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts +++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts @@ -12,15 +12,15 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { PageInfo } from '@core/shared/page-info.model'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model'; -import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { createTestComponent } from '../../testing/utils.test'; import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model'; diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts index dd54d1aee29..ef31a1bd9c1 100644 --- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts +++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts @@ -16,6 +16,13 @@ import { ViewChild, } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; +import { Vocabulary } from '@core/submission/vocabularies/models/vocabulary.model'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -29,13 +36,6 @@ import { } from 'rxjs/operators'; import { VocabularyService } from 'src/app/core/submission/vocabularies/vocabulary.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { Vocabulary } from '../../../core/submission/vocabularies/models/vocabulary.model'; -import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model'; import { AlertComponent } from '../../alert/alert.component'; import { AlertType } from '../../alert/alert-type'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts index fea65250a02..77e679d8294 100644 --- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts +++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts @@ -2,6 +2,12 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { TranslateLoader, TranslateModule, @@ -20,12 +26,6 @@ import { } from 'rxjs/operators'; import { TestScheduler } from 'rxjs/testing'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model'; -import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; import { createSuccessfulRemoteDataObject } from '../../remote-data.utils'; import { VocabularyTreeviewService } from './vocabulary-treeview.service'; diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts index a6e555fa096..13363e370bb 100644 --- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts +++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts @@ -1,4 +1,14 @@ import { Injectable } from '@angular/core'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { + getFirstSucceededRemoteDataPayload, + getFirstSucceededRemoteListPayload, +} from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import findIndex from 'lodash/findIndex'; import { BehaviorSubject, @@ -12,16 +22,6 @@ import { scan, } from 'rxjs/operators'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { - getFirstSucceededRemoteDataPayload, - getFirstSucceededRemoteListPayload, -} from '../../../core/shared/operators'; -import { PageInfo } from '../../../core/shared/page-info.model'; -import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model'; -import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service'; import { isEmpty, isNotEmpty, diff --git a/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts b/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts index 0e06e2b67a2..6f05a974df3 100644 --- a/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts +++ b/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts @@ -3,9 +3,9 @@ import { TestBed, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { NativeWindowService } from '@core/services/window.service'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { NativeWindowService } from '../../core/services/window.service'; import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { GoogleRecaptchaComponent } from './google-recaptcha.component'; diff --git a/src/app/shared/google-recaptcha/google-recaptcha.component.ts b/src/app/shared/google-recaptcha/google-recaptcha.component.ts index 669cc80c3fc..e875113973b 100644 --- a/src/app/shared/google-recaptcha/google-recaptcha.component.ts +++ b/src/app/shared/google-recaptcha/google-recaptcha.component.ts @@ -7,14 +7,14 @@ import { OnInit, Output, } from '@angular/core'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; import { Observable } from 'rxjs'; import { NativeWindowRef, NativeWindowService, } from 'src/app/core/services/window.service'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; import { isNotEmpty } from '../empty.util'; @Component({ diff --git a/src/app/shared/handle.service.spec.ts b/src/app/shared/handle.service.spec.ts index 4550bf97530..76268ec7ca0 100644 --- a/src/app/shared/handle.service.spec.ts +++ b/src/app/shared/handle.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { ConfigurationProperty } from '../core/shared/configuration-property.model'; import { CANONICAL_PREFIX_KEY, HandleService, diff --git a/src/app/shared/handle.service.ts b/src/app/shared/handle.service.ts index 26e8cc50288..9fbdf378ff9 100644 --- a/src/app/shared/handle.service.ts +++ b/src/app/shared/handle.service.ts @@ -1,4 +1,8 @@ import { Injectable } from '@angular/core'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable, of, @@ -8,10 +12,6 @@ import { take, } from 'rxjs/operators'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { ConfigurationProperty } from '../core/shared/configuration-property.model'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { hasNoValue, isEmpty, diff --git a/src/app/shared/idle-modal/idle-modal.component.spec.ts b/src/app/shared/idle-modal/idle-modal.component.spec.ts index 41801175763..9fb89eb5f39 100644 --- a/src/app/shared/idle-modal/idle-modal.component.spec.ts +++ b/src/app/shared/idle-modal/idle-modal.component.spec.ts @@ -10,12 +10,12 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { LogOutAction } from '@core/auth/auth.actions'; +import { AuthService } from '@core/auth/auth.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; -import { LogOutAction } from '../../core/auth/auth.actions'; -import { AuthService } from '../../core/auth/auth.service'; import { IdleModalComponent } from './idle-modal.component'; describe('IdleModalComponent', () => { diff --git a/src/app/shared/idle-modal/idle-modal.component.ts b/src/app/shared/idle-modal/idle-modal.component.ts index 1b4caaff02b..b5f6038c750 100644 --- a/src/app/shared/idle-modal/idle-modal.component.ts +++ b/src/app/shared/idle-modal/idle-modal.component.ts @@ -4,14 +4,14 @@ import { OnInit, Output, } from '@angular/core'; +import { LogOutAction } from '@core/auth/auth.actions'; +import { AuthService } from '@core/auth/auth.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { environment } from '../../../environments/environment'; import { AppState } from '../../app.reducer'; -import { LogOutAction } from '../../core/auth/auth.actions'; -import { AuthService } from '../../core/auth/auth.service'; import { hasValue } from '../empty.util'; @Component({ diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts b/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts index 46ce7e980c0..09e25dad90b 100644 --- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts +++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts @@ -6,6 +6,9 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { authReducer } from '@core/auth/auth.reducer'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthTokenInfo } from '@core/auth/models/auth-token-info.model'; import { Store, StoreModule, @@ -18,9 +21,6 @@ import { AppState, storeModuleConfig, } from '../../app.reducer'; -import { authReducer } from '../../core/auth/auth.reducer'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; import { EPersonMock } from '../testing/eperson.mock'; import { VarDirective } from '../utils/var.directive'; import { ImpersonateNavbarComponent } from './impersonate-navbar.component'; diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts b/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts index e2db5209694..604aa063f52 100644 --- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts +++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts @@ -4,6 +4,8 @@ import { ElementRef, OnInit, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { isAuthenticated } from '@core/auth/selectors'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { select, @@ -17,8 +19,6 @@ import { import { map } from 'rxjs/operators'; import { AppState } from '../../app.reducer'; -import { AuthService } from '../../core/auth/auth.service'; -import { isAuthenticated } from '../../core/auth/selectors'; @Component({ selector: 'ds-impersonate-navbar', diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts index cb46384d875..c5c725fb5c0 100644 --- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts +++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts @@ -12,9 +12,9 @@ import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { getMockThemeService } from '../../mocks/theme-service.mock'; import { ListableObjectComponentLoaderComponent } from '../../object-collection/shared/listable-object/listable-object-component-loader.component'; import { ThemeService } from '../../theme-support/theme.service'; diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts index 00a66220d94..8eabd92fb4f 100644 --- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts +++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts @@ -11,11 +11,11 @@ import { FormsModule, NG_VALUE_ACCESSOR, } from '@angular/forms'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { hasValue } from '../../empty.util'; import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type'; import { ListableObjectComponentLoaderComponent } from '../../object-collection/shared/listable-object/listable-object-component-loader.component'; diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts index f806894fee7..8a9e60b15b9 100644 --- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts +++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts @@ -15,10 +15,10 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { MetadataFieldDataService } from '@core/data/metadata-field-data.service'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; import { TranslateModule } from '@ngx-translate/core'; -import { MetadataFieldDataService } from '../../../core/data/metadata-field-data.service'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; import { ValidationSuggestionsComponent } from './validation-suggestions.component'; describe('ValidationSuggestionsComponent', () => { diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts index f9c17b521bf..d459b4695c0 100644 --- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts +++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts @@ -16,10 +16,10 @@ import { UntypedFormGroup, Validators, } from '@angular/forms'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { MetadatumViewModel } from '@core/shared/metadata.models'; import { TranslateModule } from '@ngx-translate/core'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { MetadatumViewModel } from '../../../core/shared/metadata.models'; import { ClickOutsideDirective } from '../../utils/click-outside.directive'; import { DebounceDirective } from '../../utils/debounce.directive'; import { MetadataFieldValidator } from '../../utils/metadatafield-validator.directive'; diff --git a/src/app/shared/lang-switch/lang-switch.component.spec.ts b/src/app/shared/lang-switch/lang-switch.component.spec.ts index 48d74130146..33b60995861 100644 --- a/src/app/shared/lang-switch/lang-switch.component.spec.ts +++ b/src/app/shared/lang-switch/lang-switch.component.spec.ts @@ -16,6 +16,7 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { LocaleService } from '@core/locale/locale.service'; import { TranslateLoader, TranslateModule, @@ -27,7 +28,6 @@ import { } from 'rxjs'; import { LangConfig } from '../../../config/lang-config.interface'; -import { LocaleService } from '../../core/locale/locale.service'; import { LangSwitchComponent } from './lang-switch.component'; // This test is completely independent from any message catalogs or keys in the codebase diff --git a/src/app/shared/lang-switch/lang-switch.component.ts b/src/app/shared/lang-switch/lang-switch.component.ts index d0df4487f07..40e18ab4c5f 100644 --- a/src/app/shared/lang-switch/lang-switch.component.ts +++ b/src/app/shared/lang-switch/lang-switch.component.ts @@ -4,6 +4,7 @@ import { ElementRef, OnInit, } from '@angular/core'; +import { LocaleService } from '@core/locale/locale.service'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -12,7 +13,6 @@ import { import { LangConfig } from '../../../config/lang-config.interface'; import { environment } from '../../../environments/environment'; -import { LocaleService } from '../../core/locale/locale.service'; @Component({ selector: 'ds-base-lang-switch', diff --git a/src/app/shared/live-region/live-region.service.spec.ts b/src/app/shared/live-region/live-region.service.spec.ts index 84f9d443688..ae49869c105 100644 --- a/src/app/shared/live-region/live-region.service.spec.ts +++ b/src/app/shared/live-region/live-region.service.spec.ts @@ -2,11 +2,11 @@ import { fakeAsync, tick, } from '@angular/core/testing'; +import { UUIDService } from '@core/shared/uuid.service'; import { of } from 'rxjs'; import { AccessibilitySettingsService } from '../../accessibility/accessibility-settings.service'; import { getAccessibilitySettingsServiceStub } from '../../accessibility/accessibility-settings.service.stub'; -import { UUIDService } from '../../core/shared/uuid.service'; import { LiveRegionService } from './live-region.service'; describe('liveRegionService', () => { diff --git a/src/app/shared/live-region/live-region.service.ts b/src/app/shared/live-region/live-region.service.ts index c972867dbcd..7eaeee5478b 100644 --- a/src/app/shared/live-region/live-region.service.ts +++ b/src/app/shared/live-region/live-region.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { UUIDService } from '@core/shared/uuid.service'; import { BehaviorSubject, map, @@ -10,7 +11,6 @@ import { import { environment } from '../../../environments/environment'; import { AccessibilitySettingsService } from '../../accessibility/accessibility-settings.service'; -import { UUIDService } from '../../core/shared/uuid.service'; export const MIN_MESSAGE_DURATION = 200; diff --git a/src/app/shared/log-in/container/log-in-container.component.spec.ts b/src/app/shared/log-in/container/log-in-container.component.spec.ts index 4c2e9eddca6..8f25e9a1623 100644 --- a/src/app/shared/log-in/container/log-in-container.component.spec.ts +++ b/src/app/shared/log-in/container/log-in-container.component.spec.ts @@ -13,15 +13,15 @@ import { ReactiveFormsModule, } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; +import { authReducer } from '@core/auth/auth.reducer'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthMethod } from '@core/auth/models/auth.method'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; import { StoreModule } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; -import { authReducer } from '../../../core/auth/auth.reducer'; -import { AuthService } from '../../../core/auth/auth.service'; -import { AuthMethod } from '../../../core/auth/models/auth.method'; -import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { HardRedirectService } from '../../../core/services/hard-redirect.service'; import { AuthServiceStub } from '../../testing/auth-service.stub'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { createTestComponent } from '../../testing/utils.test'; diff --git a/src/app/shared/log-in/container/log-in-container.component.ts b/src/app/shared/log-in/container/log-in-container.component.ts index fc9ad96fdd8..eaa9a40beac 100644 --- a/src/app/shared/log-in/container/log-in-container.component.ts +++ b/src/app/shared/log-in/container/log-in-container.component.ts @@ -5,8 +5,8 @@ import { Input, OnInit, } from '@angular/core'; +import { AuthMethod } from '@core/auth/models/auth.method'; -import { AuthMethod } from '../../../core/auth/models/auth.method'; import { AuthMethodTypeComponent } from '../methods/auth-methods.type'; import { AUTH_METHOD_FOR_DECORATOR_MAP } from '../methods/log-in.methods-decorator'; import { rendersAuthMethodType } from '../methods/log-in.methods-decorator.utils'; diff --git a/src/app/shared/log-in/log-in.component.spec.ts b/src/app/shared/log-in/log-in.component.spec.ts index 571f8b26258..04b33c100de 100644 --- a/src/app/shared/log-in/log-in.component.spec.ts +++ b/src/app/shared/log-in/log-in.component.spec.ts @@ -15,16 +15,16 @@ import { import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { authReducer } from '@core/auth/auth.reducer'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { NativeWindowService } from '@core/services/window.service'; import { StoreModule } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { authReducer } from '../../core/auth/auth.reducer'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { HardRedirectService } from '../../core/services/hard-redirect.service'; -import { NativeWindowService } from '../../core/services/window.service'; import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref'; import { getMockThemeService } from '../mocks/theme-service.mock'; import { ActivatedRouteStub } from '../testing/active-router.stub'; diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts index 8bae463f853..5922eb2e707 100644 --- a/src/app/shared/log-in/log-in.component.ts +++ b/src/app/shared/log-in/log-in.component.ts @@ -5,22 +5,22 @@ import { Input, OnInit, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthMethodsService } from '@core/auth/auth-methods.service'; +import { AuthMethod } from '@core/auth/models/auth.method'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; +import { + getAuthenticationError, + isAuthenticated, + isAuthenticationLoading, +} from '@core/auth/selectors'; +import { CoreState } from '@core/core-state.model'; import { select, Store, } from '@ngrx/store'; import { Observable } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { AuthMethodsService } from '../../core/auth/auth-methods.service'; -import { AuthMethod } from '../../core/auth/models/auth.method'; -import { AuthMethodType } from '../../core/auth/models/auth.method-type'; -import { - getAuthenticationError, - isAuthenticated, - isAuthenticationLoading, -} from '../../core/auth/selectors'; -import { CoreState } from '../../core/core-state.model'; import { hasValue } from '../empty.util'; import { ThemedLoadingComponent } from '../loading/themed-loading.component'; import { LogInContainerComponent } from './container/log-in-container.component'; diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts index 293d818e3f4..0132754d0b1 100644 --- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts +++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts @@ -8,17 +8,17 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { authReducer } from '@core/auth/auth.reducer'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthMethod } from '@core/auth/models/auth.method'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { NativeWindowService } from '@core/services/window.service'; import { StoreModule } from '@ngrx/store'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { storeModuleConfig } from '../../../../app.reducer'; -import { authReducer } from '../../../../core/auth/auth.reducer'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { AuthMethod } from '../../../../core/auth/models/auth.method'; -import { AuthMethodType } from '../../../../core/auth/models/auth.method-type'; -import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; -import { NativeWindowService } from '../../../../core/services/window.service'; import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; import { AuthServiceStub } from '../../../testing/auth-service.stub'; diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts index 1c8871ffea4..aeee21bafb0 100644 --- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts +++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts @@ -3,6 +3,18 @@ import { Inject, OnInit, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthMethod } from '@core/auth/models/auth.method'; +import { + isAuthenticated, + isAuthenticationLoading, +} from '@core/auth/selectors'; +import { CoreState } from '@core/core-state.model'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; import { select, Store, @@ -11,18 +23,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { AuthMethod } from '../../../../core/auth/models/auth.method'; -import { - isAuthenticated, - isAuthenticationLoading, -} from '../../../../core/auth/selectors'; -import { CoreState } from '../../../../core/core-state.model'; -import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; -import { - NativeWindowRef, - NativeWindowService, -} from '../../../../core/services/window.service'; import { isEmpty } from '../../../empty.util'; @Component({ diff --git a/src/app/shared/log-in/methods/log-in.methods-decorator.ts b/src/app/shared/log-in/methods/log-in.methods-decorator.ts index e17fff856a6..56c73d87bd3 100644 --- a/src/app/shared/log-in/methods/log-in.methods-decorator.ts +++ b/src/app/shared/log-in/methods/log-in.methods-decorator.ts @@ -1,4 +1,5 @@ -import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; + import { AuthMethodTypeComponent } from './auth-methods.type'; import { LogInExternalProviderComponent } from './log-in-external-provider/log-in-external-provider.component'; import { LogInPasswordComponent } from './password/log-in-password.component'; diff --git a/src/app/shared/log-in/methods/log-in.methods-decorator.utils.ts b/src/app/shared/log-in/methods/log-in.methods-decorator.utils.ts index 32c639e985e..b1718d711a1 100644 --- a/src/app/shared/log-in/methods/log-in.methods-decorator.utils.ts +++ b/src/app/shared/log-in/methods/log-in.methods-decorator.utils.ts @@ -1,4 +1,5 @@ -import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; + import { AuthMethodTypeComponent } from './auth-methods.type'; /** diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts b/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts index d583122d8c0..82d4c6332ca 100644 --- a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts +++ b/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts @@ -11,6 +11,12 @@ import { } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { authReducer } from '@core/auth/auth.reducer'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthMethod } from '@core/auth/models/auth.method'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; import { Store, StoreModule, @@ -19,12 +25,6 @@ import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { storeModuleConfig } from '../../../../app.reducer'; -import { authReducer } from '../../../../core/auth/auth.reducer'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { AuthMethod } from '../../../../core/auth/models/auth.method'; -import { AuthMethodType } from '../../../../core/auth/models/auth.method-type'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; import { getMockThemeService } from '../../../mocks/theme-service.mock'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; import { AuthServiceStub } from '../../../testing/auth-service.stub'; diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts index 45181910baf..12ca2436a68 100644 --- a/src/app/shared/log-in/methods/password/log-in-password.component.ts +++ b/src/app/shared/log-in/methods/password/log-in-password.component.ts @@ -12,6 +12,20 @@ import { Validators, } from '@angular/forms'; import { RouterLink } from '@angular/router'; +import { + AuthenticateAction, + ResetAuthenticationMessagesAction, +} from '@core/auth/auth.actions'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthMethod } from '@core/auth/models/auth.method'; +import { + getAuthenticationError, + getAuthenticationInfo, +} from '@core/auth/selectors'; +import { CoreState } from '@core/core-state.model'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; import { select, Store, @@ -31,20 +45,6 @@ import { getForgotPasswordRoute, getRegisterRoute, } from '../../../../app-routing-paths'; -import { - AuthenticateAction, - ResetAuthenticationMessagesAction, -} from '../../../../core/auth/auth.actions'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { AuthMethod } from '../../../../core/auth/models/auth.method'; -import { - getAuthenticationError, - getAuthenticationInfo, -} from '../../../../core/auth/selectors'; -import { CoreState } from '../../../../core/core-state.model'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../../core/data/feature-authorization/feature-id'; -import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; import { fadeOut } from '../../../animations/fade'; import { BtnDisabledDirective } from '../../../btn-disabled.directive'; import { isNotEmpty } from '../../../empty.util'; diff --git a/src/app/shared/log-in/themed-log-in.component.ts b/src/app/shared/log-in/themed-log-in.component.ts index a297f7dd79d..f9d3741e435 100644 --- a/src/app/shared/log-in/themed-log-in.component.ts +++ b/src/app/shared/log-in/themed-log-in.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; -import { AuthMethodType } from '../../core/auth/models/auth.method-type'; import { ThemedComponent } from '../theme-support/themed.component'; import { LogInComponent } from './log-in.component'; diff --git a/src/app/shared/log-out/log-out.component.spec.ts b/src/app/shared/log-out/log-out.component.spec.ts index 59a09c9ccaf..9e6b567f493 100644 --- a/src/app/shared/log-out/log-out.component.spec.ts +++ b/src/app/shared/log-out/log-out.component.spec.ts @@ -10,6 +10,8 @@ import { ReactiveFormsModule, } from '@angular/forms'; import { Router } from '@angular/router'; +import { authReducer } from '@core/auth/auth.reducer'; +import { EPerson } from '@core/eperson/models/eperson.model'; import { Store, StoreModule, @@ -17,8 +19,6 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { AppState } from '../../app.reducer'; -import { authReducer } from '../../core/auth/auth.reducer'; -import { EPerson } from '../../core/eperson/models/eperson.model'; import { EPersonMock } from '../testing/eperson.mock'; import { RouterStub } from '../testing/router.stub'; import { LogOutComponent } from './log-out.component'; diff --git a/src/app/shared/log-out/log-out.component.ts b/src/app/shared/log-out/log-out.component.ts index 37e5fa1fa13..81f8f49b99d 100644 --- a/src/app/shared/log-out/log-out.component.ts +++ b/src/app/shared/log-out/log-out.component.ts @@ -4,6 +4,8 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; +import { LogOutAction } from '@core/auth/auth.actions'; +import { getLogOutError } from '@core/auth/selectors'; import { select, Store, @@ -12,8 +14,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { AppState } from '../../app.reducer'; -import { LogOutAction } from '../../core/auth/auth.actions'; -import { getLogOutError } from '../../core/auth/selectors'; import { fadeOut } from '../animations/fade'; import { BrowserOnlyPipe } from '../utils/browser-only.pipe'; diff --git a/src/app/shared/menu/menu-section/abstract-menu-section.component.ts b/src/app/shared/menu/menu-section/abstract-menu-section.component.ts index 732d7ffa6c3..18e39f7026d 100644 --- a/src/app/shared/menu/menu-section/abstract-menu-section.component.ts +++ b/src/app/shared/menu/menu-section/abstract-menu-section.component.ts @@ -4,6 +4,7 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { GenericConstructor } from '@core/shared/generic-constructor'; import { BehaviorSubject, Observable, @@ -14,7 +15,6 @@ import { switchMap, } from 'rxjs/operators'; -import { GenericConstructor } from '../../../core/shared/generic-constructor'; import { hasNoValue, hasValue, diff --git a/src/app/shared/menu/menu.component.spec.ts b/src/app/shared/menu/menu.component.spec.ts index 9e2dbf4c000..11c818967c2 100644 --- a/src/app/shared/menu/menu.component.spec.ts +++ b/src/app/shared/menu/menu.component.spec.ts @@ -15,6 +15,9 @@ import { import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { authReducer } from '@core/auth/auth.reducer'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; import { Store, StoreModule, @@ -33,9 +36,6 @@ import { AppState, storeModuleConfig, } from '../../app.reducer'; -import { authReducer } from '../../core/auth/auth.reducer'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../core/shared/item.model'; import { getMockThemeService } from '../mocks/theme-service.mock'; import { createSuccessfulRemoteDataObject } from '../remote-data.utils'; import { ThemeService } from '../theme-support/theme.service'; diff --git a/src/app/shared/menu/menu.component.ts b/src/app/shared/menu/menu.component.ts index b3ed0a650d5..f89ea0d3899 100644 --- a/src/app/shared/menu/menu.component.ts +++ b/src/app/shared/menu/menu.component.ts @@ -6,6 +6,8 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { GenericConstructor } from '@core/shared/generic-constructor'; import { BehaviorSubject, Observable, @@ -17,8 +19,6 @@ import { switchMap, } from 'rxjs/operators'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; import { hasValue, isNotEmptyOperator, diff --git a/src/app/shared/menu/providers/access-control.menu.spec.ts b/src/app/shared/menu/providers/access-control.menu.spec.ts index 9b57f5813da..3d8f80e8607 100644 --- a/src/app/shared/menu/providers/access-control.menu.spec.ts +++ b/src/app/shared/menu/providers/access-control.menu.spec.ts @@ -7,11 +7,11 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { ScriptDataService } from '../../../core/data/processes/script-data.service'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { ScriptServiceStub } from '../../testing/script-service.stub'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/menu/providers/access-control.menu.ts b/src/app/shared/menu/providers/access-control.menu.ts index ee1a915fc82..ae6b242f1ab 100644 --- a/src/app/shared/menu/providers/access-control.menu.ts +++ b/src/app/shared/menu/providers/access-control.menu.ts @@ -7,6 +7,9 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { combineLatest as observableCombineLatest, @@ -15,9 +18,6 @@ import { of, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { ScriptDataService } from '../../../core/data/processes/script-data.service'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; import { AbstractExpandableMenuProvider } from './helper-providers/expandable-menu-provider'; diff --git a/src/app/shared/menu/providers/admin-search.menu.spec.ts b/src/app/shared/menu/providers/admin-search.menu.spec.ts index f33a66eee6c..33ddbb001b8 100644 --- a/src/app/shared/menu/providers/admin-search.menu.spec.ts +++ b/src/app/shared/menu/providers/admin-search.menu.spec.ts @@ -7,9 +7,9 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/admin-search.menu.ts b/src/app/shared/menu/providers/admin-search.menu.ts index 5e90de9db30..905f5bbcbbb 100644 --- a/src/app/shared/menu/providers/admin-search.menu.ts +++ b/src/app/shared/menu/providers/admin-search.menu.ts @@ -7,13 +7,13 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { map, Observable, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { MenuItemType } from '../menu-item-type.model'; import { AbstractMenuProvider, diff --git a/src/app/shared/menu/providers/browse.menu.spec.ts b/src/app/shared/menu/providers/browse.menu.spec.ts index f6c5e1f53bc..f0295104eb3 100644 --- a/src/app/shared/menu/providers/browse.menu.spec.ts +++ b/src/app/shared/menu/providers/browse.menu.spec.ts @@ -7,14 +7,14 @@ */ import { TestBed } from '@angular/core/testing'; +import { BrowseService } from '@core/browse/browse.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; import { APP_CONFIG, AppConfig, } from '../../../../config/app-config.interface'; -import { BrowseService } from '../../../core/browse/browse.service'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { BrowseDefinition } from '../../../core/shared/browse-definition.model'; import { getMockObjectCacheService } from '../../mocks/object-cache.service.mock'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { BrowseServiceStub } from '../../testing/browse-service.stub'; diff --git a/src/app/shared/menu/providers/browse.menu.ts b/src/app/shared/menu/providers/browse.menu.ts index f67dec20857..6e1ffd6dab4 100644 --- a/src/app/shared/menu/providers/browse.menu.ts +++ b/src/app/shared/menu/providers/browse.menu.ts @@ -10,6 +10,11 @@ import { Inject, Injectable, } from '@angular/core'; +import { BrowseService } from '@core/browse/browse.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { Observable, of, @@ -20,11 +25,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../config/app-config.interface'; -import { BrowseService } from '../../../core/browse/browse.service'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { BrowseDefinition } from '../../../core/shared/browse-definition.model'; -import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { TextMenuItemModel } from '../menu-item/models/text.model'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/coar-notify.menu.spec.ts b/src/app/shared/menu/providers/coar-notify.menu.spec.ts index d3d41ae7575..85037483b3b 100644 --- a/src/app/shared/menu/providers/coar-notify.menu.spec.ts +++ b/src/app/shared/menu/providers/coar-notify.menu.spec.ts @@ -7,9 +7,9 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { LinkMenuItemModel } from '../menu-item/models/link.model'; import { TextMenuItemModel } from '../menu-item/models/text.model'; diff --git a/src/app/shared/menu/providers/coar-notify.menu.ts b/src/app/shared/menu/providers/coar-notify.menu.ts index 197ca4c4ee3..f878e0288ab 100644 --- a/src/app/shared/menu/providers/coar-notify.menu.ts +++ b/src/app/shared/menu/providers/coar-notify.menu.ts @@ -7,14 +7,14 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { combineLatest as observableCombineLatest, Observable, } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { LinkMenuItemModel } from '../menu-item/models/link.model'; import { TextMenuItemModel } from '../menu-item/models/text.model'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/menu/providers/comcol-subscribe.menu.spec.ts b/src/app/shared/menu/providers/comcol-subscribe.menu.spec.ts index 8450d56c492..5555ed6f508 100644 --- a/src/app/shared/menu/providers/comcol-subscribe.menu.spec.ts +++ b/src/app/shared/menu/providers/comcol-subscribe.menu.spec.ts @@ -1,9 +1,9 @@ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Collection } from '@core/shared/collection.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { Collection } from '../../../core/shared/collection.model'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; import { SubscribeMenuProvider } from './comcol-subscribe.menu'; diff --git a/src/app/shared/menu/providers/comcol-subscribe.menu.ts b/src/app/shared/menu/providers/comcol-subscribe.menu.ts index 00c2b346949..382f343d763 100644 --- a/src/app/shared/menu/providers/comcol-subscribe.menu.ts +++ b/src/app/shared/menu/providers/comcol-subscribe.menu.ts @@ -6,6 +6,9 @@ * http://www.dspace.org/license/ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { combineLatest, @@ -13,9 +16,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { SubscriptionModalComponent } from '../../subscriptions/subscription-modal/subscription-modal.component'; import { OnClickMenuItemModel } from '../menu-item/models/onclick.model'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/menu/providers/create-report.menu.spec.ts b/src/app/shared/menu/providers/create-report.menu.spec.ts index 270f14fcf79..c75d6a9bef9 100644 --- a/src/app/shared/menu/providers/create-report.menu.spec.ts +++ b/src/app/shared/menu/providers/create-report.menu.spec.ts @@ -7,12 +7,12 @@ */ import { TestBed } from '@angular/core/testing'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; import { of } from 'rxjs'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { ConfigurationDataServiceStub } from '../../testing/configuration-data.service.stub'; diff --git a/src/app/shared/menu/providers/create-report.menu.ts b/src/app/shared/menu/providers/create-report.menu.ts index 1d6ff3f4f8e..f074ad23c19 100644 --- a/src/app/shared/menu/providers/create-report.menu.ts +++ b/src/app/shared/menu/providers/create-report.menu.ts @@ -7,18 +7,18 @@ */ import { Injectable } from '@angular/core'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { RemoteData } from '@core/data/remote-data'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { combineLatest as observableCombineLatest, Observable, } from 'rxjs'; import { map } from 'rxjs/operators'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { LinkMenuItemModel } from '../menu-item/models/link.model'; import { TextMenuItemModel } from '../menu-item/models/text.model'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/menu/providers/curation.menu.spec.ts b/src/app/shared/menu/providers/curation.menu.spec.ts index 97995cb3080..a1071b98937 100644 --- a/src/app/shared/menu/providers/curation.menu.spec.ts +++ b/src/app/shared/menu/providers/curation.menu.spec.ts @@ -7,9 +7,9 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/curation.menu.ts b/src/app/shared/menu/providers/curation.menu.ts index e7d09fb1824..a7488ffe6cb 100644 --- a/src/app/shared/menu/providers/curation.menu.ts +++ b/src/app/shared/menu/providers/curation.menu.ts @@ -7,14 +7,14 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { combineLatest, map, Observable, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { LinkMenuItemModel } from '../menu-item/models/link.model'; import { MenuItemType } from '../menu-item-type.model'; import { diff --git a/src/app/shared/menu/providers/dso-edit.menu.spec.ts b/src/app/shared/menu/providers/dso-edit.menu.spec.ts index 4393da59e7d..85c620d7f78 100644 --- a/src/app/shared/menu/providers/dso-edit.menu.spec.ts +++ b/src/app/shared/menu/providers/dso-edit.menu.spec.ts @@ -1,10 +1,10 @@ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { COLLECTION } from '@core/shared/collection.resource-type'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { COLLECTION } from '../../../core/shared/collection.resource-type'; -import { URLCombiner } from '../../../core/url-combiner/url-combiner'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; import { DSpaceObjectEditMenuProvider } from './dso-edit.menu'; diff --git a/src/app/shared/menu/providers/dso-edit.menu.ts b/src/app/shared/menu/providers/dso-edit.menu.ts index 400a65f54e5..1722ef2e596 100644 --- a/src/app/shared/menu/providers/dso-edit.menu.ts +++ b/src/app/shared/menu/providers/dso-edit.menu.ts @@ -6,6 +6,10 @@ * http://www.dspace.org/license/ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { combineLatest, Observable, @@ -13,10 +17,6 @@ import { import { map } from 'rxjs/operators'; import { getDSORoute } from '../../../app-routing-paths'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { URLCombiner } from '../../../core/url-combiner/url-combiner'; import { LinkMenuItemModel } from '../menu-item/models/link.model'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/dso-option.menu.spec.ts b/src/app/shared/menu/providers/dso-option.menu.spec.ts index affe9432495..7a970b2ef63 100644 --- a/src/app/shared/menu/providers/dso-option.menu.spec.ts +++ b/src/app/shared/menu/providers/dso-option.menu.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; +import { Collection } from '@core/shared/collection.model'; +import { COLLECTION } from '@core/shared/collection.resource-type'; -import { Collection } from '../../../core/shared/collection.model'; -import { COLLECTION } from '../../../core/shared/collection.resource-type'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; import { DsoOptionMenuProvider } from './dso-option.menu'; diff --git a/src/app/shared/menu/providers/edit.menu.spec.ts b/src/app/shared/menu/providers/edit.menu.spec.ts index 512560875cf..c9fe297e406 100644 --- a/src/app/shared/menu/providers/edit.menu.spec.ts +++ b/src/app/shared/menu/providers/edit.menu.spec.ts @@ -7,10 +7,10 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/edit.menu.ts b/src/app/shared/menu/providers/edit.menu.ts index 02ec7a4afc2..4811d0593dd 100644 --- a/src/app/shared/menu/providers/edit.menu.ts +++ b/src/app/shared/menu/providers/edit.menu.ts @@ -7,6 +7,8 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { combineLatest, @@ -15,8 +17,6 @@ import { of, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { ThemedEditCollectionSelectorComponent } from '../../dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component'; import { ThemedEditCommunitySelectorComponent } from '../../dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component'; import { ThemedEditItemSelectorComponent } from '../../dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component'; diff --git a/src/app/shared/menu/providers/export.menu.spec.ts b/src/app/shared/menu/providers/export.menu.spec.ts index df97a042696..84fb5ed0bc0 100644 --- a/src/app/shared/menu/providers/export.menu.spec.ts +++ b/src/app/shared/menu/providers/export.menu.spec.ts @@ -7,10 +7,10 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { ScriptDataService } from '../../../core/data/processes/script-data.service'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { ScriptServiceStub } from '../../testing/script-service.stub'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/menu/providers/export.menu.ts b/src/app/shared/menu/providers/export.menu.ts index aeccbb1c5a0..50e9e3a264b 100644 --- a/src/app/shared/menu/providers/export.menu.ts +++ b/src/app/shared/menu/providers/export.menu.ts @@ -7,6 +7,12 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { + METADATA_EXPORT_SCRIPT_NAME, + ScriptDataService, +} from '@core/data/processes/script-data.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { combineLatest as observableCombineLatest, @@ -15,12 +21,6 @@ import { of, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { - METADATA_EXPORT_SCRIPT_NAME, - ScriptDataService, -} from '../../../core/data/processes/script-data.service'; import { ExportBatchSelectorComponent } from '../../dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component'; import { ExportMetadataSelectorComponent } from '../../dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/menu/providers/health.menu.spec.ts b/src/app/shared/menu/providers/health.menu.spec.ts index 3487ab70f63..fe15592ccc5 100644 --- a/src/app/shared/menu/providers/health.menu.spec.ts +++ b/src/app/shared/menu/providers/health.menu.spec.ts @@ -7,9 +7,9 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/health.menu.ts b/src/app/shared/menu/providers/health.menu.ts index 05f20373398..d896a56c4cb 100644 --- a/src/app/shared/menu/providers/health.menu.ts +++ b/src/app/shared/menu/providers/health.menu.ts @@ -7,14 +7,14 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { combineLatest, map, Observable, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { MenuItemType } from '../menu-item-type.model'; import { AbstractMenuProvider, diff --git a/src/app/shared/menu/providers/helper-providers/dso.menu.spec.ts b/src/app/shared/menu/providers/helper-providers/dso.menu.spec.ts index 0270d38715b..c39f571f7ad 100644 --- a/src/app/shared/menu/providers/helper-providers/dso.menu.spec.ts +++ b/src/app/shared/menu/providers/helper-providers/dso.menu.spec.ts @@ -1,9 +1,9 @@ import { TestBed } from '@angular/core/testing'; +import { Collection } from '@core/shared/collection.model'; +import { COLLECTION } from '@core/shared/collection.resource-type'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; -import { Collection } from '../../../../core/shared/collection.model'; -import { COLLECTION } from '../../../../core/shared/collection.resource-type'; -import { Item } from '../../../../core/shared/item.model'; -import { ITEM } from '../../../../core/shared/item.resource-type'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { DSpaceObjectPageMenuProvider } from './dso.menu'; diff --git a/src/app/shared/menu/providers/helper-providers/dso.menu.ts b/src/app/shared/menu/providers/helper-providers/dso.menu.ts index 6440a8340e9..dc0935df75e 100644 --- a/src/app/shared/menu/providers/helper-providers/dso.menu.ts +++ b/src/app/shared/menu/providers/helper-providers/dso.menu.ts @@ -9,13 +9,13 @@ import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Observable, of, } from 'rxjs'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { hasNoValue, hasValue, diff --git a/src/app/shared/menu/providers/helper-providers/route-context.menu.spec.ts b/src/app/shared/menu/providers/helper-providers/route-context.menu.spec.ts index 37e33e0a0a1..129fa83644f 100644 --- a/src/app/shared/menu/providers/helper-providers/route-context.menu.spec.ts +++ b/src/app/shared/menu/providers/helper-providers/route-context.menu.spec.ts @@ -11,12 +11,12 @@ import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; import { Observable, of, } from 'rxjs'; -import { CacheableObject } from '../../../../core/cache/cacheable-object.model'; import { MenuID } from '../../menu-id.model'; import { MenuItemType } from '../../menu-item-type.model'; import { PartialMenuSection } from '../../menu-provider.model'; diff --git a/src/app/shared/menu/providers/import.menu.spec.ts b/src/app/shared/menu/providers/import.menu.spec.ts index 8292445ade7..2da940bc291 100644 --- a/src/app/shared/menu/providers/import.menu.spec.ts +++ b/src/app/shared/menu/providers/import.menu.spec.ts @@ -7,10 +7,10 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { ScriptDataService } from '../../../core/data/processes/script-data.service'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { ScriptServiceStub } from '../../testing/script-service.stub'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/menu/providers/import.menu.ts b/src/app/shared/menu/providers/import.menu.ts index 909fc9329db..68bf5971c73 100644 --- a/src/app/shared/menu/providers/import.menu.ts +++ b/src/app/shared/menu/providers/import.menu.ts @@ -7,6 +7,12 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { + METADATA_IMPORT_SCRIPT_NAME, + ScriptDataService, +} from '@core/data/processes/script-data.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { combineLatest as observableCombineLatest, @@ -15,12 +21,6 @@ import { of, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { - METADATA_IMPORT_SCRIPT_NAME, - ScriptDataService, -} from '../../../core/data/processes/script-data.service'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; import { AbstractExpandableMenuProvider } from './helper-providers/expandable-menu-provider'; diff --git a/src/app/shared/menu/providers/item-claim.menu.spec.ts b/src/app/shared/menu/providers/item-claim.menu.spec.ts index e28972bbfdc..ce4a27354c2 100644 --- a/src/app/shared/menu/providers/item-claim.menu.spec.ts +++ b/src/app/shared/menu/providers/item-claim.menu.spec.ts @@ -1,12 +1,12 @@ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ResearcherProfileDataService } from '@core/profile/researcher-profile-data.service'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { ITEM } from '../../../core/shared/item.resource-type'; import { NotificationsService } from '../../notifications/notifications.service'; import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; import { MenuService } from '../menu.service'; diff --git a/src/app/shared/menu/providers/item-claim.menu.ts b/src/app/shared/menu/providers/item-claim.menu.ts index 2669db8c36c..8a792e48f7b 100644 --- a/src/app/shared/menu/providers/item-claim.menu.ts +++ b/src/app/shared/menu/providers/item-claim.menu.ts @@ -6,6 +6,11 @@ * http://www.dspace.org/license/ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ResearcherProfileDataService } from '@core/profile/researcher-profile-data.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { @@ -14,11 +19,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { Item } from '../../../core/shared/item.model'; import { isNotEmpty } from '../../empty.util'; import { NotificationsService } from '../../notifications/notifications.service'; import { MenuService } from '../menu.service'; diff --git a/src/app/shared/menu/providers/item-orcid.menu.spec.ts b/src/app/shared/menu/providers/item-orcid.menu.spec.ts index 6b348f22a14..76f0a340537 100644 --- a/src/app/shared/menu/providers/item-orcid.menu.spec.ts +++ b/src/app/shared/menu/providers/item-orcid.menu.spec.ts @@ -1,11 +1,11 @@ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { ITEM } from '../../../core/shared/item.resource-type'; -import { URLCombiner } from '../../../core/url-combiner/url-combiner'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; import { OrcidMenuProvider } from './item-orcid.menu'; diff --git a/src/app/shared/menu/providers/item-orcid.menu.ts b/src/app/shared/menu/providers/item-orcid.menu.ts index 75516a9d6ec..c8d4e5eb8ea 100644 --- a/src/app/shared/menu/providers/item-orcid.menu.ts +++ b/src/app/shared/menu/providers/item-orcid.menu.ts @@ -6,6 +6,10 @@ * http://www.dspace.org/license/ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { Item } from '@core/shared/item.model'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { combineLatest, Observable, @@ -13,10 +17,6 @@ import { import { map } from 'rxjs/operators'; import { getDSORoute } from '../../../app-routing-paths'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { Item } from '../../../core/shared/item.model'; -import { URLCombiner } from '../../../core/url-combiner/url-combiner'; import { LinkMenuItemModel } from '../menu-item/models/link.model'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/item-versioning.menu.spec.ts b/src/app/shared/menu/providers/item-versioning.menu.spec.ts index 8b10643060d..acb34cdb7e4 100644 --- a/src/app/shared/menu/providers/item-versioning.menu.spec.ts +++ b/src/app/shared/menu/providers/item-versioning.menu.spec.ts @@ -1,10 +1,10 @@ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { ITEM } from '../../../core/shared/item.resource-type'; import { DsoVersioningModalService } from '../../dso-page/dso-versioning-modal-service/dso-versioning-modal.service'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/item-versioning.menu.ts b/src/app/shared/menu/providers/item-versioning.menu.ts index 6bc04bd7045..1dd72617fee 100644 --- a/src/app/shared/menu/providers/item-versioning.menu.ts +++ b/src/app/shared/menu/providers/item-versioning.menu.ts @@ -6,15 +6,15 @@ * http://www.dspace.org/license/ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { Item } from '@core/shared/item.model'; import { combineLatest, Observable, } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { Item } from '../../../core/shared/item.model'; import { DsoVersioningModalService } from '../../dso-page/dso-versioning-modal-service/dso-versioning-modal.service'; import { OnClickMenuItemModel } from '../menu-item/models/onclick.model'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/menu/providers/new.menu.spec.ts b/src/app/shared/menu/providers/new.menu.spec.ts index be46c8609cb..00ef5b0a43f 100644 --- a/src/app/shared/menu/providers/new.menu.spec.ts +++ b/src/app/shared/menu/providers/new.menu.spec.ts @@ -7,10 +7,10 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { LinkMenuItemModel } from '../menu-item/models/link.model'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/menu/providers/new.menu.ts b/src/app/shared/menu/providers/new.menu.ts index 685fe30f81c..ca2d789336c 100644 --- a/src/app/shared/menu/providers/new.menu.ts +++ b/src/app/shared/menu/providers/new.menu.ts @@ -7,6 +7,8 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { combineLatest, @@ -15,8 +17,6 @@ import { of, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { ThemedCreateCollectionParentSelectorComponent } from '../../dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component'; import { ThemedCreateCommunityParentSelectorComponent } from '../../dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component'; import { ThemedCreateItemParentSelectorComponent } from '../../dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component'; diff --git a/src/app/shared/menu/providers/notifications.menu.spec.ts b/src/app/shared/menu/providers/notifications.menu.spec.ts index c8d11eaf6e7..b8f6d24d22e 100644 --- a/src/app/shared/menu/providers/notifications.menu.spec.ts +++ b/src/app/shared/menu/providers/notifications.menu.spec.ts @@ -7,11 +7,11 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { of } from 'rxjs'; import { PUBLICATION_CLAIMS_PATH } from '../../../admin/admin-notifications/admin-notifications-routing-paths'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { LinkMenuItemModel } from '../menu-item/models/link.model'; import { TextMenuItemModel } from '../menu-item/models/text.model'; diff --git a/src/app/shared/menu/providers/notifications.menu.ts b/src/app/shared/menu/providers/notifications.menu.ts index 254cffc2993..e1a0c4c33aa 100644 --- a/src/app/shared/menu/providers/notifications.menu.ts +++ b/src/app/shared/menu/providers/notifications.menu.ts @@ -7,6 +7,8 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { combineLatest as observableCombineLatest, Observable, @@ -14,8 +16,6 @@ import { import { map } from 'rxjs/operators'; import { PUBLICATION_CLAIMS_PATH } from '../../../admin/admin-notifications/admin-notifications-routing-paths'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { LinkMenuItemModel } from '../menu-item/models/link.model'; import { TextMenuItemModel } from '../menu-item/models/text.model'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/menu/providers/processes.menu.spec.ts b/src/app/shared/menu/providers/processes.menu.spec.ts index 47a40ab1f92..30e83bc6514 100644 --- a/src/app/shared/menu/providers/processes.menu.spec.ts +++ b/src/app/shared/menu/providers/processes.menu.spec.ts @@ -7,9 +7,9 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/processes.menu.ts b/src/app/shared/menu/providers/processes.menu.ts index 540e0a89cee..a2a31572997 100644 --- a/src/app/shared/menu/providers/processes.menu.ts +++ b/src/app/shared/menu/providers/processes.menu.ts @@ -7,14 +7,14 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { combineLatest, map, Observable, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { MenuItemType } from '../menu-item-type.model'; import { AbstractMenuProvider, diff --git a/src/app/shared/menu/providers/registries.menu.spec.ts b/src/app/shared/menu/providers/registries.menu.spec.ts index bc713f0d237..b0b0bdecbe4 100644 --- a/src/app/shared/menu/providers/registries.menu.spec.ts +++ b/src/app/shared/menu/providers/registries.menu.spec.ts @@ -7,10 +7,10 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { ScriptDataService } from '../../../core/data/processes/script-data.service'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { ScriptServiceStub } from '../../testing/script-service.stub'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/menu/providers/registries.menu.ts b/src/app/shared/menu/providers/registries.menu.ts index 335676cfd71..7c37947e8e9 100644 --- a/src/app/shared/menu/providers/registries.menu.ts +++ b/src/app/shared/menu/providers/registries.menu.ts @@ -7,6 +7,9 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { combineLatest, @@ -15,9 +18,6 @@ import { of, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { ScriptDataService } from '../../../core/data/processes/script-data.service'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; import { AbstractExpandableMenuProvider } from './helper-providers/expandable-menu-provider'; diff --git a/src/app/shared/menu/providers/statistics.menu.spec.ts b/src/app/shared/menu/providers/statistics.menu.spec.ts index 085595f65d5..551e064f7ea 100644 --- a/src/app/shared/menu/providers/statistics.menu.spec.ts +++ b/src/app/shared/menu/providers/statistics.menu.spec.ts @@ -1,10 +1,10 @@ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { ITEM } from '../../../core/shared/item.resource-type'; import { createSuccessfulRemoteDataObject } from '../../remote-data.utils'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/statistics.menu.ts b/src/app/shared/menu/providers/statistics.menu.ts index e3188921508..58e77194db5 100644 --- a/src/app/shared/menu/providers/statistics.menu.ts +++ b/src/app/shared/menu/providers/statistics.menu.ts @@ -7,6 +7,9 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { combineLatest, map, @@ -14,9 +17,6 @@ import { } from 'rxjs'; import { getDSORoute } from '../../../app-routing-paths'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { hasValue } from '../../empty.util'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/system-wide-alert.menu.spec.ts b/src/app/shared/menu/providers/system-wide-alert.menu.spec.ts index 0aca4befefa..14b516a4cbd 100644 --- a/src/app/shared/menu/providers/system-wide-alert.menu.spec.ts +++ b/src/app/shared/menu/providers/system-wide-alert.menu.spec.ts @@ -7,9 +7,9 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/system-wide-alert.menu.ts b/src/app/shared/menu/providers/system-wide-alert.menu.ts index 8614775eb2d..ea321a6afd3 100644 --- a/src/app/shared/menu/providers/system-wide-alert.menu.ts +++ b/src/app/shared/menu/providers/system-wide-alert.menu.ts @@ -7,14 +7,14 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { combineLatest, map, Observable, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { MenuItemType } from '../menu-item-type.model'; import { AbstractMenuProvider, diff --git a/src/app/shared/menu/providers/withdrawn-reinstate-item.menu.spec.ts b/src/app/shared/menu/providers/withdrawn-reinstate-item.menu.spec.ts index d757165cc6d..c82aefcee06 100644 --- a/src/app/shared/menu/providers/withdrawn-reinstate-item.menu.spec.ts +++ b/src/app/shared/menu/providers/withdrawn-reinstate-item.menu.spec.ts @@ -1,10 +1,10 @@ import { TestBed } from '@angular/core/testing'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; +import { CorrectionTypeDataService } from '@core/submission/correctiontype-data.service'; +import { CorrectionType } from '@core/submission/models/correctiontype.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Item } from '../../../core/shared/item.model'; -import { ITEM } from '../../../core/shared/item.resource-type'; -import { CorrectionTypeDataService } from '../../../core/submission/correctiontype-data.service'; -import { CorrectionType } from '../../../core/submission/models/correctiontype.model'; import { DsoWithdrawnReinstateModalService, REQUEST_WITHDRAWN, diff --git a/src/app/shared/menu/providers/withdrawn-reinstate-item.menu.ts b/src/app/shared/menu/providers/withdrawn-reinstate-item.menu.ts index 44c9998c51c..8f9344f601b 100644 --- a/src/app/shared/menu/providers/withdrawn-reinstate-item.menu.ts +++ b/src/app/shared/menu/providers/withdrawn-reinstate-item.menu.ts @@ -6,18 +6,18 @@ * http://www.dspace.org/license/ */ import { Injectable } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { CorrectionTypeDataService } from '@core/submission/correctiontype-data.service'; import { combineLatest, Observable, } from 'rxjs'; import { map } from 'rxjs/operators'; -import { Item } from '../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; -import { CorrectionTypeDataService } from '../../../core/submission/correctiontype-data.service'; import { DsoWithdrawnReinstateModalService, REQUEST_REINSTATE, diff --git a/src/app/shared/menu/providers/workflow.menu.spec.ts b/src/app/shared/menu/providers/workflow.menu.spec.ts index cce9ce3e990..a2987641cb1 100644 --- a/src/app/shared/menu/providers/workflow.menu.spec.ts +++ b/src/app/shared/menu/providers/workflow.menu.spec.ts @@ -7,9 +7,9 @@ */ import { TestBed } from '@angular/core/testing'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { of } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/menu/providers/workflow.menu.ts b/src/app/shared/menu/providers/workflow.menu.ts index 1a629f26f36..cf347330f24 100644 --- a/src/app/shared/menu/providers/workflow.menu.ts +++ b/src/app/shared/menu/providers/workflow.menu.ts @@ -7,14 +7,14 @@ */ import { Injectable } from '@angular/core'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { combineLatest, map, Observable, } from 'rxjs'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { MenuItemType } from '../menu-item-type.model'; import { AbstractMenuProvider, diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts b/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts index 35470b15fae..391ae842024 100644 --- a/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts +++ b/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts @@ -7,12 +7,12 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; - -import { Context } from '../../core/shared/context.model'; +import { Context } from '@core/shared/context.model'; import { MetadataRepresentation, MetadataRepresentationType, -} from '../../core/shared/metadata-representation/metadata-representation.model'; +} from '@core/shared/metadata-representation/metadata-representation.model'; + import { DynamicComponentLoaderDirective } from '../abstract-component-loader/dynamic-component-loader.directive'; import { getMockThemeService } from '../mocks/theme-service.mock'; import { PlainTextMetadataListElementComponent } from '../object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component'; diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.ts b/src/app/shared/metadata-representation/metadata-representation-loader.component.ts index 46b13b14408..7cd2df8a25d 100644 --- a/src/app/shared/metadata-representation/metadata-representation-loader.component.ts +++ b/src/app/shared/metadata-representation/metadata-representation-loader.component.ts @@ -3,13 +3,13 @@ import { Inject, Input, } from '@angular/core'; - -import { Context } from '../../core/shared/context.model'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; +import { Context } from '@core/shared/context.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; import { MetadataRepresentation, MetadataRepresentationType, -} from '../../core/shared/metadata-representation/metadata-representation.model'; +} from '@core/shared/metadata-representation/metadata-representation.model'; + import { AbstractComponentLoaderComponent } from '../abstract-component-loader/abstract-component-loader.component'; import { MetadataRepresentationListElementComponent } from '../object-list/metadata-representation-list-element/metadata-representation-list-element.component'; import { ThemeService } from '../theme-support/theme.service'; diff --git a/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts b/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts index 8a6ac7eb220..92077b7833a 100644 --- a/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts +++ b/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts @@ -1,9 +1,9 @@ /* eslint-disable max-classes-per-file */ +import { Context } from '@core/shared/context.model'; +import { MetadataRepresentationType } from '@core/shared/metadata-representation/metadata-representation.model'; import { v4 as uuidv4 } from 'uuid'; import { environment } from '../../../environments/environment'; -import { Context } from '../../core/shared/context.model'; -import { MetadataRepresentationType } from '../../core/shared/metadata-representation/metadata-representation.model'; import { DEFAULT_ENTITY_TYPE, DEFAULT_REPRESENTATION_TYPE, diff --git a/src/app/shared/metadata-representation/metadata-representation.decorator.ts b/src/app/shared/metadata-representation/metadata-representation.decorator.ts index c34eb0d2191..e1e95a43ce1 100644 --- a/src/app/shared/metadata-representation/metadata-representation.decorator.ts +++ b/src/app/shared/metadata-representation/metadata-representation.decorator.ts @@ -1,8 +1,8 @@ import { InjectionToken } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { MetadataRepresentationType } from '@core/shared/metadata-representation/metadata-representation.model'; -import { Context } from '../../core/shared/context.model'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; -import { MetadataRepresentationType } from '../../core/shared/metadata-representation/metadata-representation.model'; import { OrgUnitItemMetadataListElementComponent } from '../../entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component'; import { PersonItemMetadataListElementComponent } from '../../entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component'; import { ProjectItemMetadataListElementComponent } from '../../entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component'; diff --git a/src/app/shared/mocks/dso-name.service.mock.ts b/src/app/shared/mocks/dso-name.service.mock.ts index b8fbaebee43..855358210da 100644 --- a/src/app/shared/mocks/dso-name.service.mock.ts +++ b/src/app/shared/mocks/dso-name.service.mock.ts @@ -1,4 +1,4 @@ -import { DSpaceObject } from '../../core/shared/dspace-object.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; export const UNDEFINED_NAME = 'Undefined'; diff --git a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts index 4a8aabce370..a17f4b4cfdc 100644 --- a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts +++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts @@ -2,9 +2,9 @@ import { HttpHeaders, HttpResponse, } from '@angular/common/http'; +import { RestRequestMethod } from '@core/data/rest-request-method'; import { of } from 'rxjs'; -import { RestRequestMethod } from '../../../core/data/rest-request-method'; import { EndpointMockingRestService } from './endpoint-mocking-rest.service'; import { ResponseMapMock } from './mocks/response-map.mock'; diff --git a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts index c3084f202bb..8e48fca706d 100644 --- a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts +++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts @@ -6,18 +6,18 @@ import { Inject, Injectable, } from '@angular/core'; +import { RestRequestMethod } from '@core/data/rest-request-method'; +import { + DspaceRestService, + HttpOptions, +} from '@core/dspace-rest/dspace-rest.service'; +import { RawRestResponse } from '@core/dspace-rest/raw-rest-response.model'; import { Observable, of, } from 'rxjs'; import { environment } from '../../../../environments/environment'; -import { RestRequestMethod } from '../../../core/data/rest-request-method'; -import { - DspaceRestService, - HttpOptions, -} from '../../../core/dspace-rest/dspace-rest.service'; -import { RawRestResponse } from '../../../core/dspace-rest/raw-rest-response.model'; import { isEmpty } from '../../empty.util'; import { MOCK_RESPONSE_MAP, diff --git a/src/app/shared/mocks/external-source.service.mock.ts b/src/app/shared/mocks/external-source.service.mock.ts index 7769095f2c1..0a93381e337 100644 --- a/src/app/shared/mocks/external-source.service.mock.ts +++ b/src/app/shared/mocks/external-source.service.mock.ts @@ -1,6 +1,6 @@ -import { ExternalSourceDataService } from '../../core/data/external-source-data.service'; -import { ExternalSource } from '../../core/shared/external-source.model'; -import { ResourceType } from '../../core/shared/resource-type'; +import { ExternalSourceDataService } from '@core/data/external-source-data.service'; +import { ExternalSource } from '@core/shared/external-source.model'; +import { ResourceType } from '@core/shared/resource-type'; export const externalSourceOrcid: ExternalSource = { type: new ResourceType('externalsource'), diff --git a/src/app/shared/mocks/find-id-config-data.service.mock.ts b/src/app/shared/mocks/find-id-config-data.service.mock.ts index 1be0fc57205..b5488a10052 100644 --- a/src/app/shared/mocks/find-id-config-data.service.mock.ts +++ b/src/app/shared/mocks/find-id-config-data.service.mock.ts @@ -1,4 +1,5 @@ -import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; + import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; export function getMockFindByIdDataService(propertyKey: string, ...values: string[]) { diff --git a/src/app/shared/mocks/form-models.mock.ts b/src/app/shared/mocks/form-models.mock.ts index 39fc3823b0f..ef32d115171 100644 --- a/src/app/shared/mocks/form-models.mock.ts +++ b/src/app/shared/mocks/form-models.mock.ts @@ -1,9 +1,9 @@ +import { FormRowModel } from '@core/config/models/config-submission-form.model'; +import { SubmissionScopeType } from '@core/submission/submission-scope-type'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { DynamicSelectModel } from '@ng-dynamic-forms/core'; -import { FormRowModel } from '../../core/config/models/config-submission-form.model'; -import { SubmissionScopeType } from '../../core/submission/submission-scope-type'; -import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model'; import { DsDynamicInputModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model'; import { DynamicQualdropModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model'; import { diff --git a/src/app/shared/mocks/href-only-data.service.mock.ts b/src/app/shared/mocks/href-only-data.service.mock.ts index a54b94c6017..f7df792f6a6 100644 --- a/src/app/shared/mocks/href-only-data.service.mock.ts +++ b/src/app/shared/mocks/href-only-data.service.mock.ts @@ -1,7 +1,7 @@ +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; import { Observable } from 'rxjs'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$, diff --git a/src/app/shared/mocks/item.mock.ts b/src/app/shared/mocks/item.mock.ts index 0326014d981..81bb012e885 100644 --- a/src/app/shared/mocks/item.mock.ts +++ b/src/app/shared/mocks/item.mock.ts @@ -1,9 +1,9 @@ +import { Bitstream } from '@core/shared/bitstream.model'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { Bundle } from '@core/shared/bundle.model'; +import { Item } from '@core/shared/item.model'; import { of } from 'rxjs'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { BitstreamFormat } from '../../core/shared/bitstream-format.model'; -import { Bundle } from '../../core/shared/bundle.model'; -import { Item } from '../../core/shared/item.model'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { createPaginatedList } from '../testing/utils.test'; diff --git a/src/app/shared/mocks/link-service.mock.ts b/src/app/shared/mocks/link-service.mock.ts index d6919761986..d345d55c526 100644 --- a/src/app/shared/mocks/link-service.mock.ts +++ b/src/app/shared/mocks/link-service.mock.ts @@ -1,4 +1,4 @@ -import { LinkService } from '../../core/cache/builders/link.service'; +import { LinkService } from '@core/cache/builders/link.service'; export function getMockLinkService(): LinkService { return jasmine.createSpyObj('linkService', { diff --git a/src/app/shared/mocks/mock-resource-policy-service.ts b/src/app/shared/mocks/mock-resource-policy-service.ts index b6f2908508b..5d95e268ca7 100644 --- a/src/app/shared/mocks/mock-resource-policy-service.ts +++ b/src/app/shared/mocks/mock-resource-policy-service.ts @@ -1,4 +1,4 @@ -import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service'; +import { ResourcePolicyDataService } from '@core/resource-policy/resource-policy-data.service'; export function getMockResourcePolicyService(): ResourcePolicyDataService { return jasmine.createSpyObj('resourcePolicyService', { diff --git a/src/app/shared/mocks/notifications.mock.ts b/src/app/shared/mocks/notifications.mock.ts index 0078b83a1b8..9ad381d587f 100644 --- a/src/app/shared/mocks/notifications.mock.ts +++ b/src/app/shared/mocks/notifications.mock.ts @@ -1,13 +1,13 @@ +import { QualityAssuranceEventDataService } from '@core/notifications/qa/events/quality-assurance-event-data.service'; +import { QualityAssuranceEventObject } from '@core/notifications/qa/models/quality-assurance-event.model'; +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; +import { QualityAssuranceTopicObject } from '@core/notifications/qa/models/quality-assurance-topic.model'; +import { QualityAssuranceTopicDataService } from '@core/notifications/qa/topics/quality-assurance-topic-data.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { ResourceType } from '@core/shared/resource-type'; import { of } from 'rxjs'; -import { QualityAssuranceEventDataService } from '../../core/notifications/qa/events/quality-assurance-event-data.service'; -import { QualityAssuranceEventObject } from '../../core/notifications/qa/models/quality-assurance-event.model'; -import { QualityAssuranceSourceObject } from '../../core/notifications/qa/models/quality-assurance-source.model'; -import { QualityAssuranceTopicObject } from '../../core/notifications/qa/models/quality-assurance-topic.model'; -import { QualityAssuranceTopicDataService } from '../../core/notifications/qa/topics/quality-assurance-topic-data.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { Item } from '../../core/shared/item.model'; -import { ResourceType } from '../../core/shared/resource-type'; import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject, diff --git a/src/app/shared/mocks/object-cache.service.mock.ts b/src/app/shared/mocks/object-cache.service.mock.ts index 8cceaefc3da..8624fce05c8 100644 --- a/src/app/shared/mocks/object-cache.service.mock.ts +++ b/src/app/shared/mocks/object-cache.service.mock.ts @@ -1,4 +1,4 @@ -import { ObjectCacheService } from '../../core/cache/object-cache.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; export function getMockObjectCacheService(): ObjectCacheService { return jasmine.createSpyObj('objectCacheService', [ diff --git a/src/app/shared/mocks/publication-claim-targets.mock.ts b/src/app/shared/mocks/publication-claim-targets.mock.ts index b94235c0478..d732a4ce0c0 100644 --- a/src/app/shared/mocks/publication-claim-targets.mock.ts +++ b/src/app/shared/mocks/publication-claim-targets.mock.ts @@ -1,5 +1,5 @@ -import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model'; -import { ResourceType } from '../../core/shared/resource-type'; +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; +import { ResourceType } from '@core/shared/resource-type'; // REST Mock --------------------------------------------------------------------- // ------------------------------------------------------------------------------- diff --git a/src/app/shared/mocks/publication-claim.mock.ts b/src/app/shared/mocks/publication-claim.mock.ts index a5ef4e30019..b641d9bfa7c 100644 --- a/src/app/shared/mocks/publication-claim.mock.ts +++ b/src/app/shared/mocks/publication-claim.mock.ts @@ -2,8 +2,8 @@ // REST Mock --------------------------------------------------------------------- // ------------------------------------------------------------------------------- -import { Suggestion } from '../../core/notifications/suggestions/models/suggestion.model'; -import { SUGGESTION } from '../../core/notifications/suggestions/models/suggestion-objects.resource-type'; +import { Suggestion } from '@core/notifications/suggestions/models/suggestion.model'; +import { SUGGESTION } from '@core/notifications/suggestions/models/suggestion-objects.resource-type'; export const mockSuggestionPublicationOne: Suggestion = { id: '24694773', diff --git a/src/app/shared/mocks/remote-data-build.service.mock.ts b/src/app/shared/mocks/remote-data-build.service.mock.ts index a44e54c92cc..240f6e3949e 100644 --- a/src/app/shared/mocks/remote-data-build.service.mock.ts +++ b/src/app/shared/mocks/remote-data-build.service.mock.ts @@ -1,17 +1,17 @@ +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestEntry } from '@core/data/request-entry.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { Observable } from 'rxjs'; import { map, switchMap, } from 'rxjs/operators'; -import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { RequestEntry } from '../../core/data/request-entry.model'; -import { PageInfo } from '../../core/shared/page-info.model'; import { hasValue } from '../empty.util'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; diff --git a/src/app/shared/mocks/request.service.mock.ts b/src/app/shared/mocks/request.service.mock.ts index 16054012b62..e838b8cea18 100644 --- a/src/app/shared/mocks/request.service.mock.ts +++ b/src/app/shared/mocks/request.service.mock.ts @@ -1,11 +1,10 @@ +import { RequestService } from '@core/data/request.service'; import { Observable, of, } from 'rxjs'; - -import { RequestService } from '../../core/data/request.service'; import SpyObj = jasmine.SpyObj; -import { RequestEntry } from '../../core/data/request-entry.model'; +import { RequestEntry } from '@core/data/request-entry.model'; export function getMockRequestService(requestEntry$: Observable = of(new RequestEntry())): SpyObj { return jasmine.createSpyObj('requestService', { diff --git a/src/app/shared/mocks/role-service.mock.ts b/src/app/shared/mocks/role-service.mock.ts index 2ab9978e627..39099522434 100644 --- a/src/app/shared/mocks/role-service.mock.ts +++ b/src/app/shared/mocks/role-service.mock.ts @@ -1,10 +1,9 @@ +import { RoleType } from '@core/roles/role-types'; import { BehaviorSubject, Observable, } from 'rxjs'; -import { RoleType } from '../../core/roles/role-types'; - export class RoleServiceMock { _isSubmitter = new BehaviorSubject(true); diff --git a/src/app/shared/mocks/search-service.mock.ts b/src/app/shared/mocks/search-service.mock.ts index 434be75faec..d1584293581 100644 --- a/src/app/shared/mocks/search-service.mock.ts +++ b/src/app/shared/mocks/search-service.mock.ts @@ -1,7 +1,6 @@ +import { SearchService } from '@core/shared/search/search.service'; import { of } from 'rxjs'; -import { SearchService } from '../../core/shared/search/search.service'; - export function getMockSearchService(): SearchService { return jasmine.createSpyObj('searchService', { search: '', diff --git a/src/app/shared/mocks/section-accesses-config.service.mock.ts b/src/app/shared/mocks/section-accesses-config.service.mock.ts index 8e03913528d..1ea53e20cfa 100644 --- a/src/app/shared/mocks/section-accesses-config.service.mock.ts +++ b/src/app/shared/mocks/section-accesses-config.service.mock.ts @@ -1,5 +1,6 @@ -import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model'; -import { SubmissionFormsConfigDataService } from '../../core/config/submission-forms-config-data.service'; +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; +import { SubmissionFormsConfigDataService } from '@core/config/submission-forms-config-data.service'; + import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; const configRes = Object.assign(new SubmissionFormsModel(), { diff --git a/src/app/shared/mocks/section-accesses.service.mock.ts b/src/app/shared/mocks/section-accesses.service.mock.ts index 227871e4c99..eadaf449384 100644 --- a/src/app/shared/mocks/section-accesses.service.mock.ts +++ b/src/app/shared/mocks/section-accesses.service.mock.ts @@ -1,7 +1,6 @@ +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; import { of } from 'rxjs'; -import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model'; - const dataRes = Object.assign(new SubmissionFormsModel(), { 'id': 'AccessConditionDefaultConfiguration', 'accessConditions': [], diff --git a/src/app/shared/mocks/section-sherpa-policies.service.mock.ts b/src/app/shared/mocks/section-sherpa-policies.service.mock.ts index f379af2568d..d6fb7baeb67 100644 --- a/src/app/shared/mocks/section-sherpa-policies.service.mock.ts +++ b/src/app/shared/mocks/section-sherpa-policies.service.mock.ts @@ -1,4 +1,4 @@ -import { WorkspaceitemSectionSherpaPoliciesObject } from '../../core/submission/models/workspaceitem-section-sherpa-policies.model'; +import { WorkspaceitemSectionSherpaPoliciesObject } from '@core/submission/models/workspaceitem-section-sherpa-policies.model'; export const SherpaDataResponse = { 'id': 'sherpaPolicies', diff --git a/src/app/shared/mocks/section-upload.service.mock.ts b/src/app/shared/mocks/section-upload.service.mock.ts index 3789bbac63c..d0f317c73df 100644 --- a/src/app/shared/mocks/section-upload.service.mock.ts +++ b/src/app/shared/mocks/section-upload.service.mock.ts @@ -1,4 +1,4 @@ -import { SubmissionFormsConfigDataService } from '../../core/config/submission-forms-config-data.service'; +import { SubmissionFormsConfigDataService } from '@core/config/submission-forms-config-data.service'; /** * Mock for [[SubmissionFormsConfigService]] diff --git a/src/app/shared/mocks/submission.mock.ts b/src/app/shared/mocks/submission.mock.ts index df31dc96f32..92fe6df90c7 100644 --- a/src/app/shared/mocks/submission.mock.ts +++ b/src/app/shared/mocks/submission.mock.ts @@ -1,7 +1,8 @@ -import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { Group } from '../../core/eperson/models/group.model'; -import { PageInfo } from '../../core/shared/page-info.model'; +import { SubmissionDefinitionsModel } from '@core/config/models/config-submission-definitions.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Group } from '@core/eperson/models/group.model'; +import { PageInfo } from '@core/shared/page-info.model'; + import { SubmissionObjectState } from '../../submission/objects/submission-objects.reducer'; import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; diff --git a/src/app/shared/mocks/suggestion.mock.ts b/src/app/shared/mocks/suggestion.mock.ts index bceaa93368b..9e482ae9fbe 100644 --- a/src/app/shared/mocks/suggestion.mock.ts +++ b/src/app/shared/mocks/suggestion.mock.ts @@ -1,7 +1,7 @@ +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; import { of } from 'rxjs'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { Item } from '../../core/shared/item.model'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { SearchResult } from '../search/models/search-result.model'; import { createPaginatedList } from '../testing/utils.test'; diff --git a/src/app/shared/mocks/uuid.service.mock.ts b/src/app/shared/mocks/uuid.service.mock.ts index 1acf3e1f3e4..0dff6918691 100644 --- a/src/app/shared/mocks/uuid.service.mock.ts +++ b/src/app/shared/mocks/uuid.service.mock.ts @@ -1,4 +1,4 @@ -import { UUIDService } from '../../core/shared/uuid.service'; +import { UUIDService } from '@core/shared/uuid.service'; export const defaultUUID = 'c4ce6905-290b-478f-979d-a333bbd7820f'; diff --git a/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts b/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts index 803fb7c4b49..cd2dfc7edd4 100644 --- a/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts @@ -9,12 +9,12 @@ import { Params, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { TranslateService } from '@ngx-translate/core'; -import { RequestService } from '../../../../core/data/request.service'; -import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { getAdvancedWorkflowRoute } from '../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ClaimedTaskActionsAbstractComponent } from './claimed-task-actions-abstract.component'; diff --git a/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts b/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts index dfbe3ae8d7c..e7a80b2d52f 100644 --- a/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts @@ -5,19 +5,19 @@ import { OnDestroy, } from '@angular/core'; import { Router } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { CLAIMED_TASK } from '@core/tasks/models/claimed-task-object.resource-type'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { RequestService } from '../../../../core/data/request.service'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { Item } from '../../../../core/shared/item.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; -import { CLAIMED_TASK } from '../../../../core/tasks/models/claimed-task-object.resource-type'; import { isEmpty } from '../../../empty.util'; import { NotificationsService } from '../../../notifications/notifications.service'; import { MyDSpaceReloadableActionsComponent } from '../../mydspace-reloadable-actions'; diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts index c05b778a57b..5b5bdf78fcc 100644 --- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts @@ -10,19 +10,19 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; +import { PoolTaskDataService } from '@core/tasks/pool-task-data.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../../../core/data/request.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { WorkflowItemDataService } from '../../../../core/submission/workflowitem-data.service'; -import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; -import { ProcessTaskResponse } from '../../../../core/tasks/models/process-task-response'; -import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service'; import { getMockRequestService } from '../../../mocks/request.service.mock'; import { getMockSearchService } from '../../../mocks/search-service.mock'; import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts index aec2aff2826..3d26ac6dd8a 100644 --- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts @@ -4,6 +4,11 @@ import { Injector, } from '@angular/core'; import { Router } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -14,11 +19,6 @@ import { of, } from 'rxjs'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { RequestService } from '../../../../core/data/request.service'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { WorkflowItemDataService } from '../../../../core/submission/workflowitem-data.service'; import { BtnDisabledDirective } from '../../../btn-disabled.directive'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model'; diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts index cc0506b26df..857796963c1 100644 --- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts @@ -13,20 +13,20 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { WorkflowActionDataService } from '@core/data/workflow-action-data.service'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { WorkflowAction } from '@core/tasks/models/workflow-action-object.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../../core/data/request.service'; -import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; -import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model'; -import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model'; import { getMockRequestService } from '../../mocks/request.service.mock'; import { getMockSearchService } from '../../mocks/search-service.mock'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts index 1545ec9377e..d4f41876196 100644 --- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts @@ -9,6 +9,15 @@ import { Router, RouterLink, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { WorkflowActionDataService } from '@core/data/workflow-action-data.service'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { WorkflowAction } from '@core/tasks/models/workflow-action-object.model'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -16,15 +25,6 @@ import { } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; -import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model'; -import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model'; import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; import { NotificationsService } from '../../notifications/notifications.service'; import { VarDirective } from '../../utils/var.directive'; diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts index e0df762b24e..166f9d2b8e9 100644 --- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts @@ -10,16 +10,16 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { PoolTaskDataService } from '@core/tasks/pool-task-data.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; -import { RequestService } from '../../../../core/data/request.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; -import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service'; import { getMockRequestService } from '../../../mocks/request.service.mock'; import { getMockSearchService } from '../../../mocks/search-service.mock'; import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts index 421e8ab83c7..5545ac80ed5 100644 --- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts @@ -4,6 +4,9 @@ import { Injector, } from '@angular/core'; import { Router } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -15,9 +18,6 @@ import { } from 'rxjs'; import { RemoteData } from 'src/app/core/data/remote-data'; -import { RequestService } from '../../../../core/data/request.service'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; import { BtnDisabledDirective } from '../../../btn-disabled.directive'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ClaimedDeclinedTaskTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-task-search-result.model'; diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts index db885446547..871e1c4a402 100644 --- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts @@ -13,17 +13,17 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { PoolTaskDataService } from '@core/tasks/pool-task-data.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { ActivatedRouteStub } from 'src/app/shared/testing/active-router.stub'; -import { RequestService } from '../../../../core/data/request.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; -import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service'; import { getMockRequestService } from '../../../mocks/request.service.mock'; import { getMockSearchService } from '../../../mocks/search-service.mock'; import { NotificationsService } from '../../../notifications/notifications.service'; diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts index 78871ce57a4..31b34f7d14f 100644 --- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts @@ -7,14 +7,14 @@ import { Router, RouterLink, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { RequestService } from '../../../../core/data/request.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component'; diff --git a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts index 6c0af3fe610..06eadf71de9 100644 --- a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts @@ -9,14 +9,14 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../../../core/data/request.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; import { ADVANCED_WORKFLOW_ACTION_RATING } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; diff --git a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts index bb58baa8b0d..4b855ed2b4c 100644 --- a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts @@ -6,14 +6,14 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { RequestService } from '../../../../core/data/request.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; import { ADVANCED_WORKFLOW_ACTION_RATING } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component'; import { NotificationsService } from '../../../notifications/notifications.service'; import { AdvancedClaimedTaskActionsAbstractComponent } from '../abstract/advanced-claimed-task-actions-abstract.component'; diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts index fb1f42879f6..f2cace205dc 100644 --- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts @@ -15,6 +15,12 @@ import { } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; +import { PoolTaskDataService } from '@core/tasks/pool-task-data.service'; import { NgbModal, NgbModule, @@ -25,12 +31,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../../../core/data/request.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; -import { ProcessTaskResponse } from '../../../../core/tasks/models/process-task-response'; -import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service'; import { getMockRequestService } from '../../../mocks/request.service.mock'; import { getMockSearchService } from '../../../mocks/search-service.mock'; import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts index f8f75349878..2e29a6e4dc1 100644 --- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts @@ -12,6 +12,10 @@ import { Validators, } from '@angular/forms'; import { Router } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbModal, NgbModalRef, @@ -26,10 +30,6 @@ import { of, } from 'rxjs'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { RequestService } from '../../../../core/data/request.service'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; import { BtnDisabledDirective } from '../../../btn-disabled.directive'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model'; diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts index 915e1ad4f5a..7a83a53aa55 100644 --- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts @@ -11,18 +11,18 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; +import { PoolTaskDataService } from '@core/tasks/pool-task-data.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../../../core/data/request.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; -import { ProcessTaskResponse } from '../../../../core/tasks/models/process-task-response'; -import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service'; import { getMockRequestService } from '../../../mocks/request.service.mock'; import { getMockSearchService } from '../../../mocks/search-service.mock'; import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts index 1b99fa2cc87..a61fa445909 100644 --- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts @@ -4,6 +4,11 @@ import { Injector, } from '@angular/core'; import { Router } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { PoolTaskDataService } from '@core/tasks/pool-task-data.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -12,11 +17,6 @@ import { import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { RequestService } from '../../../../core/data/request.service'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service'; import { BtnDisabledDirective } from '../../../btn-disabled.directive'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component'; diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts index 61d595d2c52..ecb3b7ab641 100644 --- a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts @@ -9,14 +9,14 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../../../core/data/request.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; import { ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts index c1179c5454b..f29c07a3a9f 100644 --- a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts @@ -6,14 +6,14 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { RequestService } from '../../../../core/data/request.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; import { ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component'; import { NotificationsService } from '../../../notifications/notifications.service'; import { AdvancedClaimedTaskActionsAbstractComponent } from '../abstract/advanced-claimed-task-actions-abstract.component'; diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts index 5c2398442d8..a0fe94e5c82 100644 --- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts @@ -12,22 +12,22 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { PoolTaskDataService } from '@core/tasks/pool-task-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { ThemeService } from 'src/app/shared/theme-support/theme.service'; -import { RequestService } from '../../../../core/data/request.service'; -import { Item } from '../../../../core/shared/item.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; -import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service'; -import { ActivatedRouteStub } from '../../../../shared/testing/active-router.stub'; import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive'; import { getMockRequestService } from '../../../mocks/request.service.mock'; import { getMockSearchService } from '../../../mocks/search-service.mock'; import { getMockThemeService } from '../../../mocks/theme-service.mock'; import { NotificationsService } from '../../../notifications/notifications.service'; +import { ActivatedRouteStub } from '../../../testing/active-router.stub'; import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; import { RouterStub } from '../../../testing/router.stub'; import { ClaimedTaskActionsEditMetadataComponent } from '../edit-metadata/claimed-task-actions-edit-metadata.component'; diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts index 0e9f8ab3d3e..df399cf61ac 100644 --- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts @@ -4,11 +4,11 @@ import { Input, Output, } from '@angular/core'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; -import { GenericConstructor } from '../../../../core/shared/generic-constructor'; -import { Item } from '../../../../core/shared/item.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; import { AbstractComponentLoaderComponent } from '../../../abstract-component-loader/abstract-component-loader.component'; import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive'; import { MyDSpaceActionsResult } from '../../mydspace-actions'; diff --git a/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts b/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts index ef7ecb7082c..99db555c845 100644 --- a/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts +++ b/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts @@ -12,16 +12,16 @@ import { Router, RouterLink, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RequestService } from '@core/data/request.service'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RequestService } from '../../../core/data/request.service'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; import { getMockRequestService } from '../../mocks/request.service.mock'; import { getMockSearchService } from '../../mocks/search-service.mock'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; diff --git a/src/app/shared/mydspace-actions/item/item-actions.component.ts b/src/app/shared/mydspace-actions/item/item-actions.component.ts index e1bdff3cfc5..26c4143a27b 100644 --- a/src/app/shared/mydspace-actions/item/item-actions.component.ts +++ b/src/app/shared/mydspace-actions/item/item-actions.component.ts @@ -8,16 +8,16 @@ import { Router, RouterLink, } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RequestService } from '@core/data/request.service'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { RequestService } from '../../../core/data/request.service'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { NotificationsService } from '../../notifications/notifications.service'; import { MyDSpaceActionsComponent } from '../mydspace-actions'; diff --git a/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts b/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts index d61e99a08a7..f015ab6cf3a 100644 --- a/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts +++ b/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts @@ -1,16 +1,16 @@ -import { CacheableObject } from '../../core/cache/cacheable-object.model'; -import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { Item } from '../../core/shared/item.model'; -import { ResourceType } from '../../core/shared/resource-type'; -import { WorkflowItem } from '../../core/submission/models/workflowitem.model'; -import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; -import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service'; -import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; -import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service'; -import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model'; -import { PoolTask } from '../../core/tasks/models/pool-task-object.model'; -import { PoolTaskDataService } from '../../core/tasks/pool-task-data.service'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Item } from '@core/shared/item.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; +import { PoolTaskDataService } from '@core/tasks/pool-task-data.service'; /** * Class to return UpdateDataServiceImpl for given ResourceType diff --git a/src/app/shared/mydspace-actions/mydspace-actions.ts b/src/app/shared/mydspace-actions/mydspace-actions.ts index 261f26fa13f..a74cc2b9deb 100644 --- a/src/app/shared/mydspace-actions/mydspace-actions.ts +++ b/src/app/shared/mydspace-actions/mydspace-actions.ts @@ -6,6 +6,13 @@ import { Output, } from '@angular/core'; import { Router } from '@angular/router'; +import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; +import { ResourceType } from '@core/shared/resource-type'; +import { SearchService } from '@core/shared/search/search.service'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, @@ -16,13 +23,6 @@ import { tap, } from 'rxjs/operators'; -import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { RequestService } from '../../core/data/request.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { getFirstSucceededRemoteData } from '../../core/shared/operators'; -import { ResourceType } from '../../core/shared/resource-type'; -import { SearchService } from '../../core/shared/search/search.service'; import { NotificationOptions } from '../notifications/models/notification-options.model'; import { NotificationsService } from '../notifications/notifications.service'; import { MyDSpaceActionsServiceFactory } from './mydspace-actions-service.factory'; diff --git a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts index 5850e2969d1..ab26f3112d7 100644 --- a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts +++ b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts @@ -12,20 +12,20 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; +import { PoolTaskDataService } from '@core/tasks/pool-task-data.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../core/data/request.service'; -import { Item } from '../../core/shared/item.model'; -import { SearchService } from '../../core/shared/search/search.service'; -import { WorkflowItem } from '../../core/submission/models/workflowitem.model'; -import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service'; -import { PoolTask } from '../../core/tasks/models/pool-task-object.model'; -import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response'; -import { PoolTaskDataService } from '../../core/tasks/pool-task-data.service'; import { getMockRequestService } from '../mocks/request.service.mock'; import { getMockSearchService } from '../mocks/search-service.mock'; import { TranslateLoaderMock } from '../mocks/translate-loader.mock'; diff --git a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts index c59b2a86f02..11eb7a2c92f 100644 --- a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts +++ b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts @@ -4,6 +4,14 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; +import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { ResourceType } from '@core/shared/resource-type'; +import { SearchService } from '@core/shared/search/search.service'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; import { TranslateService } from '@ngx-translate/core'; import { Observable, @@ -16,14 +24,6 @@ import { tap, } from 'rxjs/operators'; -import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { RequestService } from '../../core/data/request.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { ResourceType } from '../../core/shared/resource-type'; -import { SearchService } from '../../core/shared/search/search.service'; -import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response'; import { NotificationOptions } from '../notifications/models/notification-options.model'; import { NotificationsService } from '../notifications/notifications.service'; import { getSearchResultFor } from '../search/search-result-element-decorator'; diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts index 73ad4f8a96a..8aec52dff97 100644 --- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts +++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts @@ -13,20 +13,20 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; +import { PoolTaskDataService } from '@core/tasks/pool-task-data.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../../core/data/request.service'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; -import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; -import { PoolTask } from '../../../core/tasks/models/pool-task-object.model'; -import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response'; -import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service'; import { getMockRequestService } from '../../mocks/request.service.mock'; import { getMockSearchService } from '../../mocks/search-service.mock'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts index 98f39c0b487..18d393734fe 100644 --- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts +++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts @@ -9,6 +9,16 @@ import { Router, RouterLink, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; +import { PoolTaskDataService } from '@core/tasks/pool-task-data.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -20,16 +30,6 @@ import { take, } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; -import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; -import { PoolTask } from '../../../core/tasks/models/pool-task-object.model'; -import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response'; -import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service'; import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { NotificationsService } from '../../notifications/notifications.service'; diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts index 9feb9a0d97a..fc4d96107eb 100644 --- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts +++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts @@ -13,17 +13,17 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../../core/data/request.service'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; -import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; import { getMockRequestService } from '../../mocks/request.service.mock'; import { getMockSearchService } from '../../mocks/search-service.mock'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts index 1f499551a4f..f5712e5767b 100644 --- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts +++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts @@ -7,16 +7,16 @@ import { Router, RouterLink, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { RequestService } from '../../../core/data/request.service'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; -import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; import { NotificationsService } from '../../notifications/notifications.service'; import { MyDSpaceActionsComponent } from '../mydspace-actions'; diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts index 95d86899c61..56d8125b949 100644 --- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts +++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts @@ -13,6 +13,14 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { RequestService } from '@core/data/request.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { NgbModal, NgbModule, @@ -23,14 +31,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { RequestService } from '../../../core/data/request.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { Item } from '../../../core/shared/item.model'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; -import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; import { getMockRequestService } from '../../mocks/request.service.mock'; import { getMockSearchService } from '../../mocks/search-service.mock'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts index ca35ced222e..b88a945c424 100644 --- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts +++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts @@ -9,6 +9,19 @@ import { Router, RouterLink, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { Item } from '@core/shared/item.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { NgbModal, NgbTooltipModule, @@ -24,19 +37,6 @@ import { } from 'rxjs'; import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; -import { AuthService } from '../../../core/auth/auth.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { Item } from '../../../core/shared/item.model'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; -import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; import { getWorkspaceItemViewRoute } from '../../../workspaceitems-edit-page/workspaceitems-edit-page-routing-paths'; import { NotificationsService } from '../../notifications/notifications.service'; import { MyDSpaceActionsComponent } from '../mydspace-actions'; diff --git a/src/app/shared/ng-for-track-by-id.directive.ts b/src/app/shared/ng-for-track-by-id.directive.ts index d36df6a6e81..7a096655521 100644 --- a/src/app/shared/ng-for-track-by-id.directive.ts +++ b/src/app/shared/ng-for-track-by-id.directive.ts @@ -3,8 +3,7 @@ import { Directive, Host, } from '@angular/core'; - -import { DSpaceObject } from '../core/shared/dspace-object.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; @Directive({ // eslint-disable-next-line @angular-eslint/directive-selector diff --git a/src/app/shared/notification-box/notification-box.component.ts b/src/app/shared/notification-box/notification-box.component.ts index 4501e5f97dd..a13d07694f8 100644 --- a/src/app/shared/notification-box/notification-box.component.ts +++ b/src/app/shared/notification-box/notification-box.component.ts @@ -5,11 +5,11 @@ import { Input, Output, } from '@angular/core'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { AdminNotifyMetricsBox } from '../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model'; import { AdminNotifySearchResult } from '../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { HoverClassDirective } from '../hover-class.directive'; import { listableObjectComponent } from '../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-collection/object-collection.component.spec.ts b/src/app/shared/object-collection/object-collection.component.spec.ts index 433fecc2427..e359af6553c 100644 --- a/src/app/shared/object-collection/object-collection.component.spec.ts +++ b/src/app/shared/object-collection/object-collection.component.spec.ts @@ -9,10 +9,10 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { ViewMode } from '@core/shared/view-mode.model'; import { provideMockStore } from '@ngrx/store/testing'; import { of } from 'rxjs'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { getMockThemeService } from '../mocks/theme-service.mock'; import { ObjectDetailComponent } from '../object-detail/object-detail.component'; import { ObjectGridComponent } from '../object-grid/object-grid.component'; diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts index 9a6c1775900..a70fc282325 100644 --- a/src/app/shared/object-collection/object-collection.component.ts +++ b/src/app/shared/object-collection/object-collection.component.ts @@ -18,21 +18,21 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { Observable } from 'rxjs'; import { distinctUntilChanged, map, } from 'rxjs/operators'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Context } from '../../core/shared/context.model'; -import { PageInfo } from '../../core/shared/page-info.model'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { isEmpty } from '../empty.util'; import { ObjectDetailComponent } from '../object-detail/object-detail.component'; import { ObjectGeospatialMapComponent } from '../object-geospatial-map/object-geospatial-map.component'; diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts index 7d8db40b819..498c5b6f42b 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts +++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts @@ -5,6 +5,8 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { LinkService } from 'src/app/core/cache/builders/link.service'; import { getMockLinkService } from 'src/app/shared/mocks/link-service.mock'; @@ -12,8 +14,6 @@ import { followLink } from 'src/app/shared/utils/follow-link-config.model'; import { APP_DATA_SERVICES_MAP } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment'; -import { Bitstream } from '../../../../../core/shared/bitstream.model'; -import { Item } from '../../../../../core/shared/item.model'; import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils'; import { TruncatePipe } from '../../../../utils/truncate.pipe'; import { AccessStatusObject } from './access-status.model'; diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts index 88fcc4c3a1a..d0e7d4d699b 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts +++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts @@ -5,6 +5,7 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, @@ -21,7 +22,6 @@ import { getFirstSucceededRemoteDataPayload } from 'src/app/core/shared/operator import { followLink } from 'src/app/shared/utils/follow-link-config.model'; import { environment } from 'src/environments/environment'; -import { Item } from '../../../../../core/shared/item.model'; import { hasValue } from '../../../../empty.util'; import { AccessStatusObject } from './access-status.model'; diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component.ts index 10cf3545487..61f48df627c 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component.ts +++ b/src/app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; import { ThemedComponent } from '../../../../theme-support/themed.component'; import { AccessStatusBadgeComponent } from './access-status-badge.component'; diff --git a/src/app/shared/object-collection/shared/badges/badges.component.ts b/src/app/shared/object-collection/shared/badges/badges.component.ts index 1196761ce01..4752ae70d63 100644 --- a/src/app/shared/object-collection/shared/badges/badges.component.ts +++ b/src/app/shared/object-collection/shared/badges/badges.component.ts @@ -3,9 +3,9 @@ import { Component, Input, } from '@angular/core'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Context } from 'src/app/core/shared/context.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { ThemedAccessStatusBadgeComponent } from './access-status-badge/themed-access-status-badge.component'; import { ThemedMyDSpaceStatusBadgeComponent } from './my-dspace-status-badge/themed-my-dspace-status-badge.component'; import { ThemedStatusBadgeComponent } from './status-badge/themed-status-badge.component'; diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts index 2280c27ba57..1d165a66c77 100644 --- a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts +++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts @@ -8,15 +8,15 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { Context } from '@core/shared/context.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Context } from '../../../../../core/shared/context.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { PoolTask } from '../../../../../core/tasks/models/pool-task-object.model'; import { TranslateLoaderMock } from '../../../../mocks/translate-loader.mock'; import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils'; import { EPersonMock } from '../../../../testing/eperson.mock'; diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts index 7671adea699..d56aefc99d2 100644 --- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts +++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts @@ -8,9 +8,9 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Item } from '../../../../../core/shared/item.model'; import { TruncatePipe } from '../../../../utils/truncate.pipe'; import { StatusBadgeComponent } from './status-badge.component'; diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts index b757a460a65..3f87c5eaa4d 100644 --- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts +++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts @@ -4,9 +4,9 @@ import { Input, OnInit, } from '@angular/core'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; import { hasValue } from '../../../../empty.util'; @Component({ diff --git a/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts index 34d735d063a..68cfa0001fe 100644 --- a/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts +++ b/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; import { ThemedComponent } from '../../../../theme-support/themed.component'; import { StatusBadgeComponent } from './status-badge.component'; diff --git a/src/app/shared/object-collection/shared/badges/themed-badges.component.ts b/src/app/shared/object-collection/shared/badges/themed-badges.component.ts index c1bb23f8cff..01f10b4ae9a 100644 --- a/src/app/shared/object-collection/shared/badges/themed-badges.component.ts +++ b/src/app/shared/object-collection/shared/badges/themed-badges.component.ts @@ -2,9 +2,9 @@ import { Component, Input, } from '@angular/core'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Context } from 'src/app/core/shared/context.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { ThemedComponent } from '../../../theme-support/themed.component'; import { BadgesComponent } from './badges.component'; diff --git a/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts b/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts index e3b7a871df7..a391d29581d 100644 --- a/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts +++ b/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; import { ThemedComponent } from '../../../../theme-support/themed.component'; import { TypeBadgeComponent } from './type-badge.component'; diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts index 7d0a7ef0274..9d97be098ca 100644 --- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts +++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts @@ -8,10 +8,10 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Item } from '../../../../../core/shared/item.model'; import { TruncatePipe } from '../../../../utils/truncate.pipe'; import { TypeBadgeComponent } from './type-badge.component'; diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts index 6da46dd1764..3c0f06db7d3 100644 --- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts +++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts @@ -3,10 +3,10 @@ import { Component, Input, } from '@angular/core'; +import { getResourceTypeValueFor } from '@core/cache/object-cache.reducer'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { TranslateModule } from '@ngx-translate/core'; -import { getResourceTypeValueFor } from '../../../../../core/cache/object-cache.reducer'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; import { hasValue, isEmpty, diff --git a/src/app/shared/object-collection/shared/claimed-approved-task-search-result.model.ts b/src/app/shared/object-collection/shared/claimed-approved-task-search-result.model.ts index 71b885d2494..4b68966359e 100644 --- a/src/app/shared/object-collection/shared/claimed-approved-task-search-result.model.ts +++ b/src/app/shared/object-collection/shared/claimed-approved-task-search-result.model.ts @@ -1,4 +1,5 @@ -import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; + import { SearchResult } from '../../search/models/search-result.model'; /** diff --git a/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts b/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts index 0afb79a2747..7a600dda826 100644 --- a/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts +++ b/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts @@ -1,4 +1,5 @@ -import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; + import { SearchResult } from '../../search/models/search-result.model'; /** diff --git a/src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model.ts b/src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model.ts index dffb3c1313f..c5f270d4952 100644 --- a/src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model.ts +++ b/src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model.ts @@ -1,4 +1,5 @@ -import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; + import { SearchResult } from '../../search/models/search-result.model'; /** diff --git a/src/app/shared/object-collection/shared/claimed-task-search-result.model.ts b/src/app/shared/object-collection/shared/claimed-task-search-result.model.ts index 8f580f19243..246a99f18cb 100644 --- a/src/app/shared/object-collection/shared/claimed-task-search-result.model.ts +++ b/src/app/shared/object-collection/shared/claimed-task-search-result.model.ts @@ -1,4 +1,5 @@ -import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; + import { SearchResult } from '../../search/models/search-result.model'; /** diff --git a/src/app/shared/object-collection/shared/collection-search-result.model.ts b/src/app/shared/object-collection/shared/collection-search-result.model.ts index cff44c0ba20..8066a0892da 100644 --- a/src/app/shared/object-collection/shared/collection-search-result.model.ts +++ b/src/app/shared/object-collection/shared/collection-search-result.model.ts @@ -1,4 +1,5 @@ -import { Collection } from '../../../core/shared/collection.model'; +import { Collection } from '@core/shared/collection.model'; + import { SearchResult } from '../../search/models/search-result.model'; export class CollectionSearchResult extends SearchResult { diff --git a/src/app/shared/object-collection/shared/community-search-result.model.ts b/src/app/shared/object-collection/shared/community-search-result.model.ts index 08127671753..cb9e258cbc2 100644 --- a/src/app/shared/object-collection/shared/community-search-result.model.ts +++ b/src/app/shared/object-collection/shared/community-search-result.model.ts @@ -1,4 +1,5 @@ -import { Community } from '../../../core/shared/community.model'; +import { Community } from '@core/shared/community.model'; + import { SearchResult } from '../../search/models/search-result.model'; export class CommunitySearchResult extends SearchResult { diff --git a/src/app/shared/object-collection/shared/item-search-result.model.ts b/src/app/shared/object-collection/shared/item-search-result.model.ts index 4704a9ffe68..f86ced609bd 100644 --- a/src/app/shared/object-collection/shared/item-search-result.model.ts +++ b/src/app/shared/object-collection/shared/item-search-result.model.ts @@ -1,6 +1,7 @@ -import { GenericConstructor } from '../../../core/shared/generic-constructor'; -import { Item } from '../../../core/shared/item.model'; -import { inheritEquatable } from '../../../core/utilities/equals.decorators'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { Item } from '@core/shared/item.model'; +import { inheritEquatable } from '@core/utilities/equals.decorators'; + import { SearchResult } from '../../search/models/search-result.model'; import { ListableObject } from './listable-object.model'; diff --git a/src/app/shared/object-collection/shared/listable-object.model.ts b/src/app/shared/object-collection/shared/listable-object.model.ts index cb44cefb569..fc83677b9ea 100644 --- a/src/app/shared/object-collection/shared/listable-object.model.ts +++ b/src/app/shared/object-collection/shared/listable-object.model.ts @@ -1,5 +1,5 @@ -import { GenericConstructor } from '../../../core/shared/generic-constructor'; -import { EquatableObject } from '../../../core/utilities/equals.decorators'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { EquatableObject } from '@core/utilities/equals.decorators'; export abstract class ListableObject extends EquatableObject { /** diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts index 519323fb1fa..57c35ee33a4 100644 --- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts +++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts @@ -8,19 +8,19 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Context } from '@core/shared/context.model'; +import { FileService } from '@core/shared/file.service'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { ListableModule } from '@core/shared/listable.module'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment.test'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; -import { Context } from '../../../../core/shared/context.model'; -import { FileService } from '../../../../core/shared/file.service'; -import { GenericConstructor } from '../../../../core/shared/generic-constructor'; -import { ListableModule } from '../../../../core/shared/listable.module'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; -import { XSRFService } from '../../../../core/xsrf/xsrf.service'; import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockThemeService } from '../../../mocks/theme-service.mock'; diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts index 484c28c018c..8381f945e89 100644 --- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts +++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts @@ -5,12 +5,12 @@ import { Input, Output, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { ViewMode } from '@core/shared/view-mode.model'; import { take } from 'rxjs/operators'; -import { Context } from '../../../../core/shared/context.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { GenericConstructor } from '../../../../core/shared/generic-constructor'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { AbstractComponentLoaderComponent } from '../../../abstract-component-loader/abstract-component-loader.component'; import { ThemeService } from '../../../theme-support/theme.service'; import { CollectionElementLinkType } from '../../collection-element-link.type'; diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts index 4487b240331..89312fdd240 100644 --- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts +++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts @@ -1,7 +1,8 @@ /* eslint-disable max-classes-per-file */ +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; + import { environment } from '../../../../../environments/environment'; -import { Context } from '../../../../core/shared/context.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { DEFAULT_VIEW_MODE, getListableObjectComponent, diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts index 8038833902d..743d49100dc 100644 --- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts +++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts @@ -1,10 +1,10 @@ import { InjectionToken } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { ViewMode } from '@core/shared/view-mode.model'; import { ThemeConfig } from '../../../../../config/theme.config'; import { environment } from '../../../../../environments/environment'; -import { Context } from '../../../../core/shared/context.model'; -import { GenericConstructor } from '../../../../core/shared/generic-constructor'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { hasNoValue, hasValue, diff --git a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts index 5cd1ff979a6..340af26a9ef 100644 --- a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts +++ b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts @@ -5,6 +5,12 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { TranslateModule } from '@ngx-translate/core'; import { EMPTY, @@ -15,12 +21,6 @@ import { mergeMap, } from 'rxjs/operators'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Collection } from '../../../../core/shared/collection.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { isNotEmpty } from '../../../empty.util'; import { followLink } from '../../../utils/follow-link-config.model'; diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts index 42a106e478e..429a4b37943 100644 --- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts +++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts @@ -9,6 +9,9 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { LinkService } from '@core/cache/builders/link.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; import { TranslateLoader, TranslateModule, @@ -16,9 +19,6 @@ import { import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model'; import { getMockLinkService } from '../../../mocks/link-service.mock'; import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts index 431455eea2c..1382b962bb0 100644 --- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts +++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts @@ -4,6 +4,12 @@ import { Input, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteData } from '@core/data/remote-data'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { TranslateModule } from '@ngx-translate/core'; import { EMPTY, @@ -14,12 +20,6 @@ import { mergeMap, } from 'rxjs/operators'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { isNotEmpty } from '../../../empty.util'; import { followLink } from '../../../utils/follow-link-config.model'; diff --git a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts index 9da5a40d082..ed527657f7c 100644 --- a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts +++ b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts @@ -4,11 +4,11 @@ import { Input, Output, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { Context } from '../../../../core/shared/context.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { CollectionElementLinkType } from '../../collection-element-link.type'; import { ListableObject } from '../listable-object.model'; diff --git a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts index f1368b62784..95090c07ad6 100644 --- a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts +++ b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts @@ -4,11 +4,11 @@ import { Input, Output, } from '@angular/core'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Context } from '../../../../core/shared/context.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { CollectionElementLinkType } from '../../collection-element-link.type'; import { ListableObject } from '../listable-object.model'; diff --git a/src/app/shared/object-collection/shared/pool-task-search-result.model.ts b/src/app/shared/object-collection/shared/pool-task-search-result.model.ts index e6d06b4e666..d13cc3cf92e 100644 --- a/src/app/shared/object-collection/shared/pool-task-search-result.model.ts +++ b/src/app/shared/object-collection/shared/pool-task-search-result.model.ts @@ -1,4 +1,5 @@ -import { PoolTask } from '../../../core/tasks/models/pool-task-object.model'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; + import { SearchResult } from '../../search/models/search-result.model'; /** diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts index a9d057ae269..101174c875e 100644 --- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts +++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts @@ -8,10 +8,10 @@ import { waitForAsync, } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Item } from '../../../../core/shared/item.model'; import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service'; import { VarDirective } from '../../../utils/var.directive'; import { ListableObject } from '../listable-object.model'; diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts index 1b54375016e..1c452614307 100644 --- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts +++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts @@ -6,11 +6,11 @@ import { tick, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { provideMockStore } from '@ngrx/store/testing'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { Context } from '../../../../core/shared/context.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { TabulatableResultListElementsComponent } from '../../../object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component'; import { ThemeService } from '../../../theme-support/theme.service'; import { ListableObject } from '../listable-object.model'; diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts index f1eb6044932..2ab141ba26e 100644 --- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts +++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts @@ -11,6 +11,10 @@ import { SimpleChanges, ViewChild, } from '@angular/core'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { Context } from '@core/shared/context.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { ViewMode } from '@core/shared/view-mode.model'; import { combineLatest, Observable, @@ -19,10 +23,6 @@ import { } from 'rxjs'; import { take } from 'rxjs/operators'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { Context } from '../../../../core/shared/context.model'; -import { GenericConstructor } from '../../../../core/shared/generic-constructor'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { hasNoValue, hasValue, diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts index 734f32c76fe..4368d2fb660 100644 --- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts +++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts @@ -1,7 +1,8 @@ +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; + import { AdminNotifySearchResultComponent } from '../../../../admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component'; import { AdminNotifySearchResult } from '../../../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model'; -import { Context } from '../../../../core/shared/context.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { getTabulatableObjectsComponent } from './tabulatable-objects.decorator'; describe('TabulatableObject decorator function', () => { diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts index bb323a4880d..8e0ce5cea18 100644 --- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts +++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts @@ -1,8 +1,9 @@ +import { Context } from '@core/shared/context.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { ViewMode } from '@core/shared/view-mode.model'; + import { AdminNotifySearchResultComponent } from '../../../../admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component'; import { AdminNotifySearchResult } from '../../../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model'; -import { Context } from '../../../../core/shared/context.model'; -import { GenericConstructor } from '../../../../core/shared/generic-constructor'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { hasNoValue, hasValue, diff --git a/src/app/shared/object-collection/shared/workflow-item-search-result.model.ts b/src/app/shared/object-collection/shared/workflow-item-search-result.model.ts index 431974cbcc4..581736d623c 100644 --- a/src/app/shared/object-collection/shared/workflow-item-search-result.model.ts +++ b/src/app/shared/object-collection/shared/workflow-item-search-result.model.ts @@ -1,4 +1,5 @@ -import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; + import { SearchResult } from '../../search/models/search-result.model'; /** diff --git a/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts b/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts index f0b65c4bd1c..38855b39efa 100644 --- a/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts +++ b/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts @@ -1,4 +1,5 @@ -import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; + import { SearchResult } from '../../search/models/search-result.model'; /** diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts index 06fe04bfe8d..1459490c4dd 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts @@ -12,15 +12,15 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { of } from 'rxjs'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; import { ClaimedTaskActionsComponent } from '../../../mydspace-actions/claimed-task/claimed-task-actions.component'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts index 976da4ca528..2a2f3904d40 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts @@ -4,6 +4,15 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { BehaviorSubject, EMPTY, @@ -15,15 +24,6 @@ import { } from 'rxjs/operators'; import { Context } from 'src/app/core/shared/context.model'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Item } from '../../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts index e32774fe759..a5711bd91e4 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts @@ -9,13 +9,13 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { Item } from '@core/shared/item.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Item } from '../../../../../core/shared/item.model'; import { TranslateLoaderMock } from '../../../../mocks/translate-loader.mock'; import { TruncatePipe } from '../../../../utils/truncate.pipe'; import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field.component'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts index 2f78f778f8d..0897d656004 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts @@ -3,10 +3,10 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { Metadata } from '@core/shared/metadata.utils'; import { TranslateModule } from '@ngx-translate/core'; -import { Item } from '../../../../../core/shared/item.model'; -import { Metadata } from '../../../../../core/shared/metadata.utils'; import { MetadataFieldWrapperComponent } from '../../../../metadata-field-wrapper/metadata-field-wrapper.component'; import { SearchResult } from '../../../../search/models/search-result.model'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/themed-item-detail-preview-field.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/themed-item-detail-preview-field.component.ts index 7daf5cac938..342e0b7c6ba 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/themed-item-detail-preview-field.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/themed-item-detail-preview-field.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; -import { Item } from '../../../../../core/shared/item.model'; import { SearchResult } from '../../../../search/models/search-result.model'; import { ThemedComponent } from '../../../../theme-support/themed.component'; import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field.component'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts index 77225f3ed5e..0ad3654973d 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts @@ -9,6 +9,23 @@ import { waitForAsync, } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { AuthService } from '@core/auth/auth.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { FileService } from '@core/shared/file.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { UUIDService } from '@core/shared/uuid.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { Store } from '@ngrx/store'; import { TranslateLoader, @@ -16,32 +33,15 @@ import { } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service'; -import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service'; -import { FindListOptions } from '../../../../core/data/find-list-options.model'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { FileService } from '../../../../core/shared/file.service'; -import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; -import { Item } from '../../../../core/shared/item.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { UUIDService } from '../../../../core/shared/uuid.service'; -import { XSRFService } from '../../../../core/xsrf/xsrf.service'; -import { AuthServiceMock } from '../../../../shared/mocks/auth.service.mock'; -import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock'; -import { SearchServiceStub } from '../../../../shared/testing/search-service.stub'; -import { ThemeService } from '../../../../shared/theme-support/theme.service'; +import { AuthServiceMock } from '../../../mocks/auth.service.mock'; +import { getMockThemeService } from '../../../mocks/theme-service.mock'; import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; import { NotificationsService } from '../../../notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils'; import { HALEndpointServiceStub } from '../../../testing/hal-endpoint-service.stub'; +import { SearchServiceStub } from '../../../testing/search-service.stub'; import { createPaginatedList } from '../../../testing/utils.test'; +import { ThemeService } from '../../../theme-support/theme.service'; import { FileSizePipe } from '../../../utils/file-size-pipe'; import { FollowLinkConfig } from '../../../utils/follow-link-config.model'; import { TruncatePipe } from '../../../utils/truncate.pipe'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts index 31c228d1625..5e1211370ab 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts @@ -5,18 +5,18 @@ import { OnChanges, SimpleChanges, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Context } from '@core/shared/context.model'; +import { FileService } from '@core/shared/file.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteListPayload } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { first } from 'rxjs/operators'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { Context } from '../../../../core/shared/context.model'; -import { FileService } from '../../../../core/shared/file.service'; -import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; -import { Item } from '../../../../core/shared/item.model'; -import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators'; import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component'; import { fadeInOut } from '../../../animations/fade'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts index fb4106f69d3..676503c8ab2 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts @@ -8,11 +8,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; import { of } from 'rxjs'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { ItemActionsComponent } from '../../../mydspace-actions/item/item-actions.component'; import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts index 6ef18dd5117..9f0798956a7 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { ItemActionsComponent } from '../../../mydspace-actions/item/item-actions.component'; import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts index f4a9da69537..06ee5277a8c 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts @@ -12,15 +12,15 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; import { of } from 'rxjs'; import { Context } from 'src/app/core/shared/context.model'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { Item } from '../../../../core/shared/item.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; import { PoolTaskActionsComponent } from '../../../mydspace-actions/pool-task/pool-task-actions.component'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts index fff20d7a724..9cb16bfc945 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts @@ -4,6 +4,15 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; import { BehaviorSubject, EMPTY, @@ -15,15 +24,6 @@ import { } from 'rxjs/operators'; import { Context } from 'src/app/core/shared/context.model'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Item } from '../../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts index 5dcac201890..c7c409fd00e 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts @@ -2,9 +2,9 @@ import { Component, OnInit, } from '@angular/core'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Metadata } from '@core/shared/metadata.utils'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { Metadata } from '../../../core/shared/metadata.utils'; import { hasValue } from '../../empty.util'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { SearchResult } from '../../search/models/search-result.model'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts index bfa7fc9fe5f..1c92944d17e 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts @@ -8,13 +8,13 @@ import { waitForAsync, } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { of } from 'rxjs'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; import { WorkflowitemActionsComponent } from '../../../mydspace-actions/workflowitem/workflowitem-actions.component'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts index a8f649d9e0b..f18f78db86b 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts @@ -2,16 +2,16 @@ import { Component, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { Observable } from 'rxjs'; import { find } from 'rxjs/operators'; import { Context } from 'src/app/core/shared/context.model'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { isNotUndefined } from '../../../empty.util'; import { WorkflowitemActionsComponent } from '../../../mydspace-actions/workflowitem/workflowitem-actions.component'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts index 1c5d6beb7d0..7a82e45abf5 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts @@ -8,13 +8,13 @@ import { waitForAsync, } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Item } from '@core/shared/item.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; import { of } from 'rxjs'; import { Context } from 'src/app/core/shared/context.model'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { Item } from '../../../../core/shared/item.model'; -import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; import { WorkspaceitemActionsComponent } from '../../../mydspace-actions/workspaceitem/workspaceitem-actions.component'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts index 5318320bfa7..79fe1c93aa7 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts @@ -2,16 +2,16 @@ import { Component, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; import { Observable } from 'rxjs'; import { find } from 'rxjs/operators'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; -import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; import { isNotUndefined } from '../../../empty.util'; import { WorkspaceitemActionsComponent } from '../../../mydspace-actions/workspaceitem/workspaceitem-actions.component'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-detail/object-detail.component.spec.ts b/src/app/shared/object-detail/object-detail.component.spec.ts index 8f8e5f7a6e9..527964d9c32 100644 --- a/src/app/shared/object-detail/object-detail.component.spec.ts +++ b/src/app/shared/object-detail/object-detail.component.spec.ts @@ -11,14 +11,14 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { PageInfo } from '../../core/shared/page-info.model'; import { ThemedLoadingComponent } from '../loading/themed-loading.component'; import { TranslateLoaderMock } from '../mocks/translate-loader.mock'; import { ListableObjectComponentLoaderComponent } from '../object-collection/shared/listable-object/listable-object-component-loader.component'; diff --git a/src/app/shared/object-detail/object-detail.component.ts b/src/app/shared/object-detail/object-detail.component.ts index 174b3b0dab8..41193ed51f9 100644 --- a/src/app/shared/object-detail/object-detail.component.ts +++ b/src/app/shared/object-detail/object-detail.component.ts @@ -7,16 +7,16 @@ import { Output, ViewEncapsulation, } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; - import { SortDirection, SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Context } from '../../core/shared/context.model'; -import { ViewMode } from '../../core/shared/view-mode.model'; +} from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { TranslateModule } from '@ngx-translate/core'; + import { fadeIn } from '../animations/fade'; import { ErrorComponent } from '../error/error.component'; import { ThemedLoadingComponent } from '../loading/themed-loading.component'; diff --git a/src/app/shared/object-geospatial-map/object-geospatial-map.component.spec.ts b/src/app/shared/object-geospatial-map/object-geospatial-map.component.spec.ts index 6101e0db6ef..86f11f09843 100644 --- a/src/app/shared/object-geospatial-map/object-geospatial-map.component.spec.ts +++ b/src/app/shared/object-geospatial-map/object-geospatial-map.component.spec.ts @@ -6,6 +6,9 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { StoreModule } from '@ngrx/store'; import { TranslateLoader, @@ -14,9 +17,6 @@ import { TranslateStore, } from '@ngx-translate/core'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { Item } from '../../core/shared/item.model'; -import { PageInfo } from '../../core/shared/page-info.model'; import { GeospatialMapDetail } from '../geospatial-map/models/geospatial-map-detail.model'; import { TranslateLoaderMock } from '../mocks/translate-loader.mock'; import { ItemSearchResult } from '../object-collection/shared/item-search-result.model'; diff --git a/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts b/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts index 80ed5fc21f4..ed91b84e90e 100644 --- a/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts +++ b/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts @@ -7,13 +7,13 @@ import { PLATFORM_ID, ViewEncapsulation, } from '@angular/core'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { ViewMode } from '@core/shared/view-mode.model'; import { Item } from 'src/app/core/shared/item.model'; import { getItemPageRoute } from 'src/app/item-page/item-page-routing-paths'; import { environment } from '../../../environments/environment'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { fadeIn } from '../animations/fade'; import { hasValue } from '../empty.util'; import { GeospatialMapComponent } from '../geospatial-map/geospatial-map.component'; diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts index 27bcf0fe4e0..497a0a6c53b 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts @@ -9,12 +9,12 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Collection } from '@core/shared/collection.model'; import { TranslateModule } from '@ngx-translate/core'; -import { AuthService } from '../../../core/auth/auth.service'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { Collection } from '../../../core/shared/collection.model'; import { AuthServiceMock } from '../../mocks/auth.service.mock'; import { getMockThemeService } from '../../mocks/theme-service.mock'; import { ActivatedRouteStub } from '../../testing/active-router.stub'; diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts index f7bad5ec750..786b53538de 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts @@ -4,12 +4,12 @@ import { Input, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Collection } from '@core/shared/collection.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { ThemedThumbnailComponent } from '../../../thumbnail/themed-thumbnail.component'; import { hasNoValue, diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts index cf2b383de88..9131667a129 100644 --- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts @@ -9,10 +9,10 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Community } from '@core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { Community } from '../../../core/shared/community.model'; import { ThemedThumbnailComponent } from '../../../thumbnail/themed-thumbnail.component'; import { ActivatedRouteStub } from '../../testing/active-router.stub'; import { CommunityGridElementComponent } from './community-grid-element.component'; diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts index 9ad7aaba75b..f92e92cf76f 100644 --- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts +++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts @@ -4,12 +4,12 @@ import { Input, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Community } from '@core/shared/community.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { Community } from '../../../core/shared/community.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { ThemedThumbnailComponent } from '../../../thumbnail/themed-thumbnail.component'; import { hasNoValue, diff --git a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts index 7dcf1969921..f67d112de80 100644 --- a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts @@ -8,12 +8,12 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { of } from 'rxjs'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock'; import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils'; import { TruncatableService } from '../../../../truncatable/truncatable.service'; diff --git a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts index 67b68195a37..2bfc1428e6d 100644 --- a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts +++ b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { focusShadow } from '../../../../animations/focus'; import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../../../object-collection/shared/object-collection-element/abstract-listable-element.component'; diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts index b055a5188a9..082fd5ecc14 100644 --- a/src/app/shared/object-grid/object-grid.component.ts +++ b/src/app/shared/object-grid/object-grid.component.ts @@ -8,6 +8,14 @@ import { Output, ViewEncapsulation, } from '@angular/core'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -20,14 +28,6 @@ import { startWith, } from 'rxjs/operators'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Context } from '../../core/shared/context.model'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { fadeIn } from '../animations/fade'; import { hasNoValue, diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts index 0d879d7749d..651b89a05cf 100644 --- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts @@ -10,23 +10,23 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { BitstreamFormatDataService } from '@core/data/bitstream-format-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { Collection } from '@core/shared/collection.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { UUIDService } from '@core/shared/uuid.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service'; -import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service'; -import { Collection } from '../../../../core/shared/collection.model'; -import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; -import { UUIDService } from '../../../../core/shared/uuid.service'; -import { XSRFService } from '../../../../core/xsrf/xsrf.service'; import { NotificationsService } from '../../../notifications/notifications.service'; import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts index 3c22a15201d..07e2894914a 100644 --- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts @@ -4,13 +4,13 @@ import { Input, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { Collection } from '../../../../core/shared/collection.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component'; import { hasNoValue, diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts index 2a3105232a5..47c0a2ac115 100644 --- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts @@ -10,30 +10,30 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { BitstreamFormatDataService } from '@core/data/bitstream-format-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { Community } from '@core/shared/community.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { UUIDService } from '@core/shared/uuid.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; -import { CommunityDataService } from '../../../../core/data/community-data.service'; -import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service'; -import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service'; -import { Community } from '../../../../core/shared/community.model'; -import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; -import { UUIDService } from '../../../../core/shared/uuid.service'; -import { XSRFService } from '../../../../core/xsrf/xsrf.service'; -import { AuthServiceMock } from '../../../../shared/mocks/auth.service.mock'; -import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock'; -import { StoreMock } from '../../../../shared/testing/store.mock'; -import { ThemeService } from '../../../../shared/theme-support/theme.service'; +import { AuthServiceMock } from '../../../mocks/auth.service.mock'; +import { getMockThemeService } from '../../../mocks/theme-service.mock'; import { NotificationsService } from '../../../notifications/notifications.service'; import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; +import { StoreMock } from '../../../testing/store.mock'; +import { ThemeService } from '../../../theme-support/theme.service'; import { TruncatableService } from '../../../truncatable/truncatable.service'; import { TruncatePipe } from '../../../utils/truncate.pipe'; import { CommunitySearchResultGridElementComponent } from './community-search-result-grid-element.component'; diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts index 1c7c961bb11..ca672068a99 100644 --- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts @@ -4,13 +4,13 @@ import { Input, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { Community } from '@core/shared/community.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { Community } from '../../../../core/shared/community.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component'; import { hasNoValue, diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts index 86a44640829..d571072d5f7 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts @@ -10,6 +10,19 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { UUIDService } from '@core/shared/uuid.service'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -17,19 +30,6 @@ import { of, } from 'rxjs'; -import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../../../../core/cache/object-cache.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { CommunityDataService } from '../../../../../core/data/community-data.service'; -import { DefaultChangeAnalyzer } from '../../../../../core/data/default-change-analyzer.service'; -import { DSOChangeAnalyzer } from '../../../../../core/data/dso-change-analyzer.service'; -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Bitstream } from '../../../../../core/shared/bitstream.model'; -import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service'; -import { Item } from '../../../../../core/shared/item.model'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { UUIDService } from '../../../../../core/shared/uuid.service'; import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component'; import { NotificationsService } from '../../../../notifications/notifications.service'; import { ThemedBadgesComponent } from '../../../../object-collection/shared/badges/themed-badges.component'; diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts index 22df63e22bf..d17b9f6d997 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts @@ -4,12 +4,12 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { getItemPageRoute } from '../../../../../item-page/item-page-routing-paths'; import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component'; import { focusShadow } from '../../../../animations/focus'; diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts index e8b999fb9fc..3088a4e6d7f 100644 --- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts @@ -2,12 +2,12 @@ import { Component, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Metadata } from '@core/shared/metadata.utils'; import { Observable } from 'rxjs'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '../../../core/data/bitstream-data.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { Metadata } from '../../../core/shared/metadata.utils'; import { hasValue } from '../../empty.util'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { SearchResult } from '../../search/models/search-result.model'; diff --git a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.spec.ts b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.spec.ts index b566ad7d7f4..d69c6793301 100644 --- a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.spec.ts +++ b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.spec.ts @@ -4,9 +4,9 @@ import { TestBed, } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { TranslateModule } from '@ngx-translate/core'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock } from '../../mocks/dso-name.service.mock'; import { BitstreamListItemComponent } from './bitstream-list-item.component'; diff --git a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.ts b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.ts index d0a299b0fa5..162da959e49 100644 --- a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.ts +++ b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Bitstream } from '../../../core/shared/bitstream.model'; -import { Context } from '../../../core/shared/context.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts index ced169c7419..eef96742c34 100644 --- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts +++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts @@ -9,12 +9,12 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { RouteService } from '@core/services/route.service'; +import { BrowseEntry } from '@core/shared/browse-entry.model'; import { of } from 'rxjs'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { RouteService } from '../../../core/services/route.service'; -import { BrowseEntry } from '../../../core/shared/browse-entry.model'; import { DSONameServiceMock } from '../../mocks/dso-name.service.mock'; import { ActivatedRouteStub } from '../../testing/active-router.stub'; import { TruncatePipe } from '../../utils/truncate.pipe'; diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts index 03b4441e42c..c09966833fe 100644 --- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts +++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts @@ -7,15 +7,15 @@ import { Params, RouterLink, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { BrowseEntry } from '@core/shared/browse-entry.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { RouteService } from 'src/app/core/services/route.service'; import { BBM_PAGINATION_ID } from '../../../browse-by/browse-by-metadata/browse-by-metadata.component'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { BrowseEntry } from '../../../core/shared/browse-entry.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; diff --git a/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts b/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts index baf4366fdb2..a1eb5261ea3 100644 --- a/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts +++ b/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { Bundle } from '@core/shared/bundle.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Bundle } from '../../../core/shared/bundle.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts index 6d360c3f5e2..600e91d2ebb 100644 --- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts +++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts @@ -9,9 +9,9 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Collection } from '@core/shared/collection.model'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { Collection } from '../../../core/shared/collection.model'; import { DSONameServiceMock } from '../../mocks/dso-name.service.mock'; import { ActivatedRouteStub } from '../../testing/active-router.stub'; import { CollectionListElementComponent } from './collection-list-element.component'; diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts index 7dc0c32990b..86103b9bb33 100644 --- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts +++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts @@ -1,9 +1,9 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Collection } from '@core/shared/collection.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Collection } from '../../../core/shared/collection.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts index cb34d6719c1..4bc12a157dc 100644 --- a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts +++ b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts @@ -9,9 +9,9 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Community } from '@core/shared/community.model'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { Community } from '../../../core/shared/community.model'; import { DSONameServiceMock } from '../../mocks/dso-name.service.mock'; import { ActivatedRouteStub } from '../../testing/active-router.stub'; import { CommunityListElementComponent } from './community-list-element.component'; diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.ts index af13d65cf7a..8987bc7e850 100644 --- a/src/app/shared/object-list/community-list-element/community-list-element.component.ts +++ b/src/app/shared/object-list/community-list-element/community-list-element.component.ts @@ -1,10 +1,10 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Community } from '@core/shared/community.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { Community } from '../../../core/shared/community.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; diff --git a/src/app/shared/object-list/duplicate-data/duplicate.model.ts b/src/app/shared/object-list/duplicate-data/duplicate.model.ts index 4524418343f..1b425c1e45e 100644 --- a/src/app/shared/object-list/duplicate-data/duplicate.model.ts +++ b/src/app/shared/object-list/duplicate-data/duplicate.model.ts @@ -1,12 +1,12 @@ +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { MetadataMap } from '@core/shared/metadata.models'; +import { ResourceType } from '@core/shared/resource-type'; import { autoserialize, deserialize, } from 'cerialize'; -import { CacheableObject } from '../../../core/cache/cacheable-object.model'; -import { HALLink } from '../../../core/shared/hal-link.model'; -import { MetadataMap } from '../../../core/shared/metadata.models'; -import { ResourceType } from '../../../core/shared/resource-type'; import { DUPLICATE } from './duplicate.resource-type'; /** diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts index 79abef538ad..6550fc33064 100644 --- a/src/app/shared/object-list/identifier-data/identifier-data.component.ts +++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts @@ -4,12 +4,12 @@ import { Input, OnInit, } from '@angular/core'; +import { IdentifierDataService } from '@core/data/identifier-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { Item } from 'src/app/core/shared/item.model'; -import { IdentifierDataService } from '../../../core/data/identifier-data.service'; import { hasValue } from '../../empty.util'; import { IdentifierData } from './identifier-data.model'; diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts index 527c152141e..fa69833588e 100644 --- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts +++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts @@ -6,16 +6,16 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment.test'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../../../core/shared/item.model'; -import { XSRFService } from '../../../../../core/xsrf/xsrf.service'; import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock'; import { getMockThemeService } from '../../../../mocks/theme-service.mock'; import { ActivatedRouteStub } from '../../../../testing/active-router.stub'; diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts index 20f2a23b78e..8a7bbccf8e2 100644 --- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts +++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts @@ -2,9 +2,9 @@ import { Component, OnChanges, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { hasValue } from '../../../../empty.util'; import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts index 1b4491318d9..0ee85000d4b 100644 --- a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts +++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { ListableNotificationObject } from './listable-notification-object.model'; diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts index b90b37e6a66..5f91e0c42ee 100644 --- a/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts +++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts @@ -1,7 +1,8 @@ -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { TypedObject } from '../../../core/cache/typed-object.model'; -import { GenericConstructor } from '../../../core/shared/generic-constructor'; -import { ResourceType } from '../../../core/shared/resource-type'; +import { typedObject } from '@core/cache/builders/build-decorators'; +import { TypedObject } from '@core/cache/typed-object.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { ResourceType } from '@core/shared/resource-type'; + import { NotificationType } from '../../notifications/models/notification-type'; import { ListableObject } from '../../object-collection/shared/listable-object.model'; import { LISTABLE_NOTIFICATION_OBJECT } from './listable-notification-object.resource-type'; diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.resource-type.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.resource-type.ts index ed458126bb2..ffb834ceee7 100644 --- a/src/app/shared/object-list/listable-notification-object/listable-notification-object.resource-type.ts +++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for {@link ListableNotificationObject} diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts index 89048db936c..f60e34d9420 100644 --- a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts +++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts @@ -8,10 +8,10 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { MetadataRepresentationType } from '@core/shared/metadata-representation/metadata-representation.model'; +import { MetadatumRepresentation } from '@core/shared/metadata-representation/metadatum/metadatum-representation.model'; +import { ValueListBrowseDefinition } from '@core/shared/value-list-browse-definition.model'; -import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model'; -import { MetadatumRepresentation } from '../../../../core/shared/metadata-representation/metadatum/metadatum-representation.model'; -import { ValueListBrowseDefinition } from '../../../../core/shared/value-list-browse-definition.model'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; import { BrowseLinkMetadataListElementComponent } from './browse-link-metadata-list-element.component'; diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts index 167e27f7f33..c49d6dc5f57 100644 --- a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts +++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { VALUE_LIST_BROWSE_DEFINITION } from '@core/shared/value-list-browse-definition.resource-type'; -import { VALUE_LIST_BROWSE_DEFINITION } from '../../../../core/shared/value-list-browse-definition.resource-type'; import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component'; @Component({ diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts index 293938587f8..cceefdc121c 100644 --- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts +++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts @@ -8,9 +8,9 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { ItemMetadataRepresentation } from '@core/shared/metadata-representation/item/item-metadata-representation.model'; -import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model'; -import { ListableObjectComponentLoaderComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; +import { ListableObjectComponentLoaderComponent } from '../../../object-collection/shared/listable-object/listable-object-component-loader.component'; import { ItemMetadataListElementComponent } from './item-metadata-list-element.component'; const mockItemMetadataRepresentation = new ItemMetadataRepresentation(Object.assign({})); diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts index 3da7570016a..9b1ca0bb52f 100644 --- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts +++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { ListableObjectComponentLoaderComponent } from '../../../object-collection/shared/listable-object/listable-object-component-loader.component'; import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component'; diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts index 7d11870a7ed..0451d0c9886 100644 --- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts +++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts @@ -3,8 +3,8 @@ import { Input, OnInit, } from '@angular/core'; +import { ItemMetadataRepresentation } from '@core/shared/metadata-representation/item/item-metadata-representation.model'; -import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model'; import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths'; import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component'; diff --git a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts index 2bba25ebe1c..a443725c6e9 100644 --- a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts +++ b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts @@ -7,8 +7,8 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { MetadatumRepresentation } from '@core/shared/metadata-representation/metadatum/metadatum-representation.model'; -import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model'; import { mockData } from '../../testing/browse-definition-data-service.stub'; import { MetadataRepresentationListElementComponent } from './metadata-representation-list-element.component'; diff --git a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts index e468dc4af97..f5c36395713 100644 --- a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts +++ b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts @@ -2,9 +2,8 @@ import { Component, Input, } from '@angular/core'; - -import { Context } from '../../../core/shared/context.model'; -import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model'; +import { Context } from '@core/shared/context.model'; +import { MetadataRepresentation } from '@core/shared/metadata-representation/metadata-representation.model'; @Component({ selector: 'ds-metadata-representation-list-element', diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts index e35f7d67590..27a94625139 100644 --- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts +++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts @@ -9,8 +9,8 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { MetadatumRepresentation } from '@core/shared/metadata-representation/metadatum/metadatum-representation.model'; -import { MetadatumRepresentation } from '../../../../core/shared/metadata-representation/metadatum/metadatum-representation.model'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; import { mockData } from '../../../testing/browse-definition-data-service.stub'; import { PlainTextMetadataListElementComponent } from './plain-text-metadata-list-element.component'; diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts index 0132f9b05b1..2322e645cc5 100644 --- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts +++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { VALUE_LIST_BROWSE_DEFINITION } from '@core/shared/value-list-browse-definition.resource-type'; -import { VALUE_LIST_BROWSE_DEFINITION } from '../../../../core/shared/value-list-browse-definition.resource-type'; import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component'; @Component({ diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts index 5264509febb..d1563c02e56 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts @@ -8,17 +8,17 @@ import { waitForAsync, } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model'; import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../../mocks/link-service.mock'; import { mockTruncatableService } from '../../../../mocks/mock-trucatable.service'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts index f3652137d66..12e4e656f12 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts @@ -4,6 +4,12 @@ import { Inject, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteData } from '@core/data/remote-data'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { Context } from 'src/app/core/shared/context.model'; @@ -12,12 +18,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model'; import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model'; import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model'; import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.spec.ts index 3d3d57b5d13..ca700addf16 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.spec.ts @@ -8,17 +8,17 @@ import { waitForAsync, } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model'; import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../../mocks/link-service.mock'; import { mockTruncatableService } from '../../../../mocks/mock-trucatable.service'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts index 9fcf09ab5e3..3280aa07d60 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts @@ -4,6 +4,13 @@ import { Inject, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; @@ -11,13 +18,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Context } from '../../../../../core/shared/context.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model'; import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-search-result.model'; import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model'; import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts index 900fd4ac83a..f6ade3c935f 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts @@ -8,16 +8,16 @@ import { waitForAsync, } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { Item } from '../../../../../core/shared/item.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model'; import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../../mocks/link-service.mock'; import { mockTruncatableService } from '../../../../mocks/mock-trucatable.service'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts index 5a760cf19c0..34b730d8b2e 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts @@ -4,6 +4,13 @@ import { Inject, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { ClaimedDeclinedTaskTaskSearchResult } from 'src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model'; @@ -12,13 +19,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Context } from '../../../../../core/shared/context.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model'; import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model'; import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; import { TruncatableService } from '../../../../truncatable/truncatable.service'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts index 4e087e87709..c9800cfa7d8 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts @@ -12,22 +12,22 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { SubmissionDuplicateDataService } from '@core/submission/submission-duplicate-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { ConfigurationDataService } from '../../../../core/data/configuration-data.service'; -import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; import { mockTruncatableService } from '../../../mocks/mock-trucatable.service'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts index affa6e36055..e5aa95d5079 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts @@ -8,6 +8,20 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { SubmissionDuplicateDataService } from '@core/submission/submission-duplicate-data.service'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -25,20 +39,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { ConfigurationDataService } from '../../../../core/data/configuration-data.service'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service'; -import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts index f56ce20faea..5528495769b 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts @@ -9,6 +9,7 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { Item } from '@core/shared/item.model'; import { TranslateLoader, TranslateModule, @@ -16,7 +17,6 @@ import { import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; -import { Item } from '../../../../core/shared/item.model'; import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component'; import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts index 9ffb1000b6b..edd47d6a27d 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts @@ -8,6 +8,8 @@ import { Input, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { Context } from 'src/app/core/shared/context.model'; import { WorkflowItem } from 'src/app/core/submission/models/workflowitem.model'; @@ -16,8 +18,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { Item } from '../../../../core/shared/item.model'; import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component'; import { fadeInOut } from '../../../animations/fade'; import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts index 7ccc988ec6d..5da03820c20 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts @@ -2,10 +2,10 @@ import { Component, Input, } from '@angular/core'; +import { Item } from '@core/shared/item.model'; import { Context } from 'src/app/core/shared/context.model'; import { WorkflowItem } from 'src/app/core/submission/models/workflowitem.model'; -import { Item } from '../../../../core/shared/item.model'; import { SearchResult } from '../../../search/models/search-result.model'; import { ThemedComponent } from '../../../theme-support/themed.component'; import { ItemListPreviewComponent } from './item-list-preview.component'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts index 242ba70be7a..ef444e67205 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts @@ -11,14 +11,14 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; import { of } from 'rxjs'; import { getMockThemeService } from 'src/app/shared/mocks/theme-service.mock'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../mocks/mock-trucatable.service'; import { ItemActionsComponent } from '../../../mydspace-actions/item/item-actions.component'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts index fd13e9867fa..03ce7a262f4 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts @@ -3,10 +3,10 @@ import { Component, OnInit, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { ItemActionsComponent } from '../../../mydspace-actions/item/item-actions.component'; import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts index 19f4c97b834..5513ba765ef 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts @@ -12,19 +12,19 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { SubmissionDuplicateDataService } from '@core/submission/submission-duplicate-data.service'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { ConfigurationDataService } from '../../../../core/data/configuration-data.service'; -import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service'; -import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; import { getMockThemeService } from '../../../mocks/theme-service.mock'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts index 71d3fff59c1..1976623251c 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts @@ -8,6 +8,20 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { SubmissionDuplicateDataService } from '@core/submission/submission-duplicate-data.service'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -25,20 +39,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { ConfigurationDataService } from '../../../../core/data/configuration-data.service'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service'; -import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts index 3854f8406a1..572c8e8ab01 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts @@ -11,16 +11,16 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { of } from 'rxjs'; import { take } from 'rxjs/operators'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { ItemDataService } from '../../../../core/data/item-data.service'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { ThemedLoadingComponent } from '../../../loading/themed-loading.component'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts index decfaa033f9..7c07c8d7998 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts @@ -7,19 +7,19 @@ import { Inject, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { BehaviorSubject } from 'rxjs'; import { APP_CONFIG, AppConfig, } from '../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { ThemedLoadingComponent } from '../../../loading/themed-loading.component'; import { WorkflowitemActionsComponent } from '../../../mydspace-actions/workflowitem/workflowitem-actions.component'; import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts index b0739e739c4..1d00e024a81 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts @@ -11,16 +11,16 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; import { of } from 'rxjs'; import { take } from 'rxjs/operators'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { ItemDataService } from '../../../../core/data/item-data.service'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; import { ThemedLoadingComponent } from '../../../loading/themed-loading.component'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts index 377676ea8fd..3a7145da474 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts @@ -7,19 +7,19 @@ import { Inject, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; import { BehaviorSubject } from 'rxjs'; import { APP_CONFIG, AppConfig, } from '../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../../core/cache/builders/link.service'; -import { Context } from '../../../../core/shared/context.model'; -import { Item } from '../../../../core/shared/item.model'; -import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; -import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; import { ThemedLoadingComponent } from '../../../loading/themed-loading.component'; import { WorkspaceitemActionsComponent } from '../../../mydspace-actions/workspaceitem/workspaceitem-actions.component'; import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type'; diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts index 3d72e95240a..d3f7304394e 100644 --- a/src/app/shared/object-list/object-list.component.ts +++ b/src/app/shared/object-list/object-list.component.ts @@ -7,15 +7,15 @@ import { Output, ViewEncapsulation, } from '@angular/core'; - import { SortDirection, SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Context } from '../../core/shared/context.model'; -import { ViewMode } from '../../core/shared/view-mode.model'; +} from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; + import { fadeIn } from '../animations/fade'; import { CollectionElementLinkType } from '../object-collection/collection-element-link.type'; import { ImportableListItemControlComponent } from '../object-collection/shared/importable-list-item-control/importable-list-item-control.component'; diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts index a4e319c7472..f785e08133b 100644 --- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts @@ -10,18 +10,18 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Collection } from '@core/shared/collection.model'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { Collection } from '../../../../core/shared/collection.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; +import { getMockThemeService } from '../../../mocks/theme-service.mock'; import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; +import { ThemeService } from '../../../theme-support/theme.service'; import { TruncatableService } from '../../../truncatable/truncatable.service'; import { TruncatePipe } from '../../../utils/truncate.pipe'; -import { getMockThemeService } from './../../../../shared/mocks/theme-service.mock'; -import { ThemeService } from './../../../../shared/theme-support/theme.service'; import { CollectionSearchResultListElementComponent } from './collection-search-result-list-element.component'; let collectionSearchResultListElementComponent: CollectionSearchResultListElementComponent; diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts index bb615635b3f..ef716c8b5d5 100644 --- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts @@ -4,9 +4,9 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Collection } from '@core/shared/collection.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Collection } from '../../../../core/shared/collection.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component'; import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts index 214b99231e0..fd98bcd29f9 100644 --- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts @@ -10,18 +10,18 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Community } from '@core/shared/community.model'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { Community } from '../../../../core/shared/community.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; +import { getMockThemeService } from '../../../mocks/theme-service.mock'; import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; +import { ThemeService } from '../../../theme-support/theme.service'; import { TruncatableService } from '../../../truncatable/truncatable.service'; import { TruncatePipe } from '../../../utils/truncate.pipe'; -import { getMockThemeService } from './../../../../shared/mocks/theme-service.mock'; -import { ThemeService } from './../../../../shared/theme-support/theme.service'; import { CommunitySearchResultListElementComponent } from './community-search-result-list-element.component'; let communitySearchResultListElementComponent: CommunitySearchResultListElementComponent; diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts index 6b413ff14d6..c4df2ccbb55 100644 --- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts @@ -4,9 +4,9 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Community } from '@core/shared/community.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Community } from '../../../../core/shared/community.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component'; import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts index f95bad14fbc..0fada0864fa 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts @@ -9,14 +9,14 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../../../../../config/app-config.interface'; -import { AuthService } from '../../../../../../core/auth/auth.service'; -import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service'; -import { AuthorizationDataService } from '../../../../../../core/data/feature-authorization/authorization-data.service'; -import { Item } from '../../../../../../core/shared/item.model'; import { DSONameServiceMock, UNDEFINED_NAME, diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts index bc0a5c605fc..9791e538d6a 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts @@ -7,9 +7,9 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from '../../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../../core/shared/view-mode.model'; import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths'; import { ThemedThumbnailComponent } from '../../../../../../thumbnail/themed-thumbnail.component'; import { ThemedBadgesComponent } from '../../../../../object-collection/shared/badges/themed-badges.component'; diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts index c4251c3597f..a6ce133f4f6 100644 --- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts @@ -3,15 +3,15 @@ import { Inject, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Metadata } from '@core/shared/metadata.utils'; import { Observable } from 'rxjs'; import { APP_CONFIG, AppConfig, } from '../../../../config/app-config.interface'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { Metadata } from '../../../core/shared/metadata.utils'; import { hasValue } from '../../empty.util'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { SearchResult } from '../../search/models/search-result.model'; diff --git a/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts b/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts index 779a31e7ae0..e95ac2abf9b 100644 --- a/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts +++ b/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; +import { PaginatedList } from '@core/data/paginated-list.model'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; import { AbstractTabulatableElementComponent } from '../../../object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component'; import { SearchResult } from '../../../search/models/search-result.model'; diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts index 5b0e07ba232..e294068af8a 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts @@ -1,5 +1,6 @@ -import { Collection } from '../../../../core/shared/collection.model'; -import { Community } from '../../../../core/shared/community.model'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; + import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model'; import { createSidebarSearchListElementTests } from '../sidebar-search-list-element.component.spec'; import { CollectionSidebarSearchListElementComponent } from './collection-sidebar-search-list-element.component'; diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts index 8fae0c84d06..bff8dc9953c 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts @@ -3,11 +3,11 @@ import { NgClass, } from '@angular/common'; import { Component } from '@angular/core'; +import { Collection } from '@core/shared/collection.model'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Collection } from '../../../../core/shared/collection.model'; -import { Context } from '../../../../core/shared/context.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; import { TruncatablePartComponent } from '../../../truncatable/truncatable-part/truncatable-part.component'; diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts index f3114feda4e..22cf1aeba03 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts @@ -1,4 +1,5 @@ -import { Community } from '../../../../core/shared/community.model'; +import { Community } from '@core/shared/community.model'; + import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model'; import { createSidebarSearchListElementTests } from '../sidebar-search-list-element.component.spec'; import { CommunitySidebarSearchListElementComponent } from './community-sidebar-search-list-element.component'; diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts index 1ba3be3a066..d25fa05ed4a 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts @@ -3,11 +3,11 @@ import { NgClass, } from '@angular/common'; import { Component } from '@angular/core'; +import { Community } from '@core/shared/community.model'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Community } from '../../../../core/shared/community.model'; -import { Context } from '../../../../core/shared/context.model'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; import { TruncatablePartComponent } from '../../../truncatable/truncatable-part/truncatable-part.component'; diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts index d078d8e1c5b..065df793dae 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts @@ -1,5 +1,6 @@ -import { Collection } from '../../../../../core/shared/collection.model'; -import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; + import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model'; import { createSidebarSearchListElementTests } from '../../sidebar-search-list-element.component.spec'; import { PublicationSidebarSearchListElementComponent } from './publication-sidebar-search-list-element.component'; diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts index 30f99200a8b..10533bd75aa 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts @@ -3,11 +3,11 @@ import { NgClass, } from '@angular/common'; import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../core/shared/context.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; import { TruncatablePartComponent } from '../../../../truncatable/truncatable-part/truncatable-part.component'; diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts index 22bf7fd52cc..b2b34d7572e 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts @@ -5,13 +5,13 @@ import { waitForAsync, } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ChildHALResource } from '@core/shared/child-hal-resource.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { HALResource } from '@core/shared/hal-resource.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { ChildHALResource } from '../../../core/shared/child-hal-resource.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { HALResource } from '../../../core/shared/hal-resource.model'; import { mockTruncatableService } from '../../mocks/mock-trucatable.service'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { SearchResult } from '../../search/models/search-result.model'; diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts index 9f7b1aadd25..2be45c43edb 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts @@ -6,6 +6,12 @@ import { Component, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { RemoteData } from '@core/data/remote-data'; +import { ChildHALResource } from '@core/shared/child-hal-resource.model'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, @@ -16,12 +22,6 @@ import { map, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ChildHALResource } from '../../../core/shared/child-hal-resource.model'; -import { Context } from '../../../core/shared/context.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/object-list/themed-object-list.component.ts b/src/app/shared/object-list/themed-object-list.component.ts index d048f0488f7..c58e3f6d21d 100644 --- a/src/app/shared/object-list/themed-object-list.component.ts +++ b/src/app/shared/object-list/themed-object-list.component.ts @@ -4,14 +4,14 @@ import { Input, Output, } from '@angular/core'; - import { SortDirection, SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Context } from '../../core/shared/context.model'; +} from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; + import { CollectionElementLinkType } from '../object-collection/collection-element-link.type'; import { ListableObject } from '../object-collection/shared/listable-object.model'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; diff --git a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts index f1de5eadeee..ca1b08055ea 100644 --- a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts +++ b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts @@ -6,17 +6,17 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { Collection } from '@core/shared/collection.model'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { LinkHeadService } from '../../../core/services/link-head.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { HostWindowService } from '../../host-window.service'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; diff --git a/src/app/shared/object-select/collection-select/collection-select.component.ts b/src/app/shared/object-select/collection-select/collection-select.component.ts index b0aff98208c..3d5afc8e93e 100644 --- a/src/app/shared/object-select/collection-select/collection-select.component.ts +++ b/src/app/shared/object-select/collection-select/collection-select.component.ts @@ -8,6 +8,9 @@ import { } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterLink } from '@angular/router'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { Collection } from '@core/shared/collection.model'; +import { getAllSucceededRemoteDataPayload } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { map, @@ -15,9 +18,6 @@ import { } from 'rxjs'; import { getCollectionPageRoute } from '../../../collection-page/collection-page-routing-paths'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { Collection } from '../../../core/shared/collection.model'; -import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { hasValueOperator, diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts index 656e0716e94..b0752ba9116 100644 --- a/src/app/shared/object-select/item-select/item-select.component.spec.ts +++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts @@ -6,18 +6,18 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Item } from '@core/shared/item.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { LinkHeadService } from '../../../core/services/link-head.service'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; -import { Item } from '../../../core/shared/item.model'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { HostWindowService } from '../../host-window.service'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts index f53ff5a2f10..55e490f7084 100644 --- a/src/app/shared/object-select/item-select/item-select.component.ts +++ b/src/app/shared/object-select/item-select/item-select.component.ts @@ -9,13 +9,13 @@ import { } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterLink } from '@angular/router'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { getAllSucceededRemoteDataPayload } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { Item } from '../../../core/shared/item.model'; -import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { diff --git a/src/app/shared/object-select/object-select.model.ts b/src/app/shared/object-select/object-select.model.ts index e3b66dac31c..f513a12d18b 100644 --- a/src/app/shared/object-select/object-select.model.ts +++ b/src/app/shared/object-select/object-select.model.ts @@ -1,7 +1,6 @@ +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Observable } from 'rxjs'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; - /** * Class used to collect all the data that that is used by the {@link ObjectSelectComponent} in the HTML. */ diff --git a/src/app/shared/object-select/object-select/object-select.component.ts b/src/app/shared/object-select/object-select/object-select.component.ts index 596fd0e4bc4..ffa486af5f1 100644 --- a/src/app/shared/object-select/object-select/object-select.component.ts +++ b/src/app/shared/object-select/object-select/object-select.component.ts @@ -6,6 +6,13 @@ import { OnInit, Output, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Observable, of, @@ -15,13 +22,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { SortOptions } from '../../../core/cache/models/sort-options.model'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; import { ObjectSelectService } from '../object-select.service'; diff --git a/src/app/shared/object-table/object-table.component.ts b/src/app/shared/object-table/object-table.component.ts index 42da109788a..229fd8a863b 100644 --- a/src/app/shared/object-table/object-table.component.ts +++ b/src/app/shared/object-table/object-table.component.ts @@ -7,17 +7,17 @@ import { Output, ViewEncapsulation, } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; -import { BehaviorSubject } from 'rxjs'; - import { SortDirection, SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Context } from '../../core/shared/context.model'; -import { ViewMode } from '../../core/shared/view-mode.model'; +} from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { TranslateModule } from '@ngx-translate/core'; +import { BehaviorSubject } from 'rxjs'; + import { fadeIn } from '../animations/fade'; import { ErrorComponent } from '../error/error.component'; import { ThemedLoadingComponent } from '../loading/themed-loading.component'; diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts index 8ed97ddb37d..1c135795591 100644 --- a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts +++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts @@ -4,10 +4,10 @@ import { TestBed, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { MetadataValue } from '@core/shared/metadata.models'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { MetadataValue } from '../../core/shared/metadata.models'; import { OrcidBadgeAndTooltipComponent } from './orcid-badge-and-tooltip.component'; describe('OrcidBadgeAndTooltipComponent', () => { diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts index 677c752d4b4..26639ac325d 100644 --- a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts +++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts @@ -4,11 +4,10 @@ import { Input, OnInit, } from '@angular/core'; +import { MetadataValue } from '@core/shared/metadata.models'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { MetadataValue } from '../../core/shared/metadata.models'; - /** * Component to display an ORCID badge with a tooltip. * The tooltip text changes based on whether the ORCID is authenticated. diff --git a/src/app/shared/page-size-selector/page-size-selector.component.spec.ts b/src/app/shared/page-size-selector/page-size-selector.component.spec.ts index 7f3fb119e1d..4936f436567 100644 --- a/src/app/shared/page-size-selector/page-size-selector.component.spec.ts +++ b/src/app/shared/page-size-selector/page-size-selector.component.spec.ts @@ -7,6 +7,11 @@ import { import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { PaginationService } from '@core/pagination/pagination.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { @@ -14,11 +19,6 @@ import { take, } from 'rxjs/operators'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginationService } from '../../core/pagination/pagination.service'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; import { PaginationServiceStub } from '../testing/pagination-service.stub'; diff --git a/src/app/shared/page-size-selector/page-size-selector.component.ts b/src/app/shared/page-size-selector/page-size-selector.component.ts index 8fcab457f77..4aaf60ecd8f 100644 --- a/src/app/shared/page-size-selector/page-size-selector.component.ts +++ b/src/app/shared/page-size-selector/page-size-selector.component.ts @@ -9,14 +9,14 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { Observable } from 'rxjs'; import { map, take, } from 'rxjs/operators'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model'; diff --git a/src/app/shared/pagination/pagination.component.spec.ts b/src/app/shared/pagination/pagination.component.spec.ts index 643f3a2c542..03949c2c440 100644 --- a/src/app/shared/pagination/pagination.component.spec.ts +++ b/src/app/shared/pagination/pagination.component.spec.ts @@ -20,6 +20,12 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginationService } from '@core/pagination/pagination.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { StoreModule } from '@ngrx/store'; import { @@ -30,12 +36,6 @@ import { NgxPaginationModule } from 'ngx-pagination'; import { BehaviorSubject } from 'rxjs'; import { storeModuleConfig } from '../../app.reducer'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { PaginationService } from '../../core/pagination/pagination.service'; import { HostWindowService } from '../host-window.service'; import { MockActivatedRoute } from '../mocks/active-router.mock'; import { HostWindowServiceMock } from '../mocks/host-window-service.mock'; diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts index 0d8ce2e0e8c..aa5a68234c8 100644 --- a/src/app/shared/pagination/pagination.component.ts +++ b/src/app/shared/pagination/pagination.component.ts @@ -15,6 +15,15 @@ import { SimpleChanges, ViewEncapsulation, } from '@angular/core'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { PaginationRouteParams } from '@core/pagination/pagination-route-params.interface'; +import { ViewMode } from '@core/shared/view-mode.model'; import { NgbDropdownModule, NgbPaginationModule, @@ -33,15 +42,6 @@ import { take, } from 'rxjs/operators'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { PaginationRouteParams } from '../../core/pagination/pagination-route-params.interface'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { BtnDisabledDirective } from '../btn-disabled.directive'; import { hasValue, diff --git a/src/app/shared/pagination/pagination.utils.ts b/src/app/shared/pagination/pagination.utils.ts index 2add33e2ea8..9170ba58c0d 100644 --- a/src/app/shared/pagination/pagination.utils.ts +++ b/src/app/shared/pagination/pagination.utils.ts @@ -1,4 +1,5 @@ -import { FindListOptions } from '../../core/data/find-list-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; + import { PaginationComponentOptions } from './pagination-component-options.model'; /** diff --git a/src/app/shared/pagination/paginationChangeEvent.interface.ts b/src/app/shared/pagination/paginationChangeEvent.interface.ts index a6b10f9cff5..78e426127e0 100644 --- a/src/app/shared/pagination/paginationChangeEvent.interface.ts +++ b/src/app/shared/pagination/paginationChangeEvent.interface.ts @@ -1,4 +1,5 @@ -import { SortOptions } from '../../core/cache/models/sort-options.model'; +import { SortOptions } from '@core/cache/models/sort-options.model'; + import { PaginationComponentOptions } from './pagination-component-options.model'; diff --git a/src/app/shared/remote-data.utils.ts b/src/app/shared/remote-data.utils.ts index 236e808315c..ba11a4c4060 100644 --- a/src/app/shared/remote-data.utils.ts +++ b/src/app/shared/remote-data.utils.ts @@ -1,12 +1,12 @@ import { HttpErrorResponse } from '@angular/common/http'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestEntryState } from '@core/data/request-entry-state.model'; import { Observable, of, } from 'rxjs'; import { environment } from '../../environments/environment'; -import { RemoteData } from '../core/data/remote-data'; -import { RequestEntryState } from '../core/data/request-entry-state.model'; /** * A fixed timestamp to use in tests diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts b/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts index 9463aba768a..db60171d025 100644 --- a/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts +++ b/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts @@ -14,6 +14,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ActionType } from '@core/resource-policy/models/action-type.model'; +import { PolicyType } from '@core/resource-policy/models/policy-type.model'; +import { ResourcePolicyDataService } from '@core/resource-policy/resource-policy-data.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { cold, @@ -22,11 +27,6 @@ import { import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { ActionType } from '../../../core/resource-policy/models/action-type.model'; -import { PolicyType } from '../../../core/resource-policy/models/policy-type.model'; -import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service'; -import { Item } from '../../../core/shared/item.model'; import { getMockLinkService } from '../../mocks/link-service.mock'; import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service'; import { NotificationsService } from '../../notifications/notifications.service'; diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.ts b/src/app/shared/resource-policies/create/resource-policy-create.component.ts index d2a07892d77..cdcf4a46f6f 100644 --- a/src/app/shared/resource-policies/create/resource-policy-create.component.ts +++ b/src/app/shared/resource-policies/create/resource-policy-create.component.ts @@ -6,6 +6,12 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { ResourcePolicy } from '@core/resource-policy/models/resource-policy.model'; +import { ResourcePolicyDataService } from '@core/resource-policy/resource-policy-data.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -19,12 +25,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model'; -import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths'; import { NotificationsService } from '../../notifications/notifications.service'; import { diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts b/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts index 33cc75912a8..449f094f820 100644 --- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts +++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts @@ -14,6 +14,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ActionType } from '@core/resource-policy/models/action-type.model'; +import { PolicyType } from '@core/resource-policy/models/policy-type.model'; +import { RESOURCE_POLICY } from '@core/resource-policy/models/resource-policy.resource-type'; +import { ResourcePolicyDataService } from '@core/resource-policy/resource-policy-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { cold, @@ -22,11 +27,6 @@ import { import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { LinkService } from '../../../core/cache/builders/link.service'; -import { ActionType } from '../../../core/resource-policy/models/action-type.model'; -import { PolicyType } from '../../../core/resource-policy/models/policy-type.model'; -import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type'; -import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service'; import { getMockLinkService } from '../../mocks/link-service.mock'; import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service'; import { NotificationsService } from '../../notifications/notifications.service'; diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts index 43e7b550fe3..2a6736876d7 100644 --- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts +++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts @@ -6,6 +6,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { ResourcePolicy } from '@core/resource-policy/models/resource-policy.model'; +import { RESOURCE_POLICY } from '@core/resource-policy/models/resource-policy.resource-type'; +import { ResourcePolicyDataService } from '@core/resource-policy/resource-policy-data.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -21,11 +26,6 @@ import { take, } from 'rxjs/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model'; -import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type'; -import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths'; import { NotificationsService } from '../../notifications/notifications.service'; import { diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts b/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts index cf75175fd34..6bfe3a28756 100644 --- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts +++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts @@ -16,15 +16,15 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { ActionType } from '@core/resource-policy/models/action-type.model'; +import { PolicyType } from '@core/resource-policy/models/policy-type.model'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { ActionType } from '../../../core/resource-policy/models/action-type.model'; -import { PolicyType } from '../../../core/resource-policy/models/policy-type.model'; -import { Item } from '../../../core/shared/item.model'; import { createSuccessfulRemoteDataObject } from '../../remote-data.utils'; import { EPersonMock } from '../../testing/eperson.mock'; import { GroupMock } from '../../testing/group-mock'; diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts index 777a5ddbd55..6ad47441063 100644 --- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts +++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts @@ -18,21 +18,21 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Group } from '@core/eperson/models/group.model'; +import { ResourcePolicy } from '@core/resource-policy/models/resource-policy.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { + getAllSucceededRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { getGroupEditRoute } from '../../../access-control/access-control-routing-paths'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { Group } from '../../../core/eperson/models/group.model'; -import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { - getAllSucceededRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; import { dateToString, stringToNgbDateStruct, diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts index 2fb76b2d255..9f94215ecb7 100644 --- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts +++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts @@ -19,6 +19,16 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { ActionType } from '@core/resource-policy/models/action-type.model'; +import { PolicyType } from '@core/resource-policy/models/policy-type.model'; +import { ResourcePolicy } from '@core/resource-policy/models/resource-policy.model'; +import { RESOURCE_POLICY } from '@core/resource-policy/models/resource-policy.resource-type'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core'; import { provideMockStore } from '@ngrx/store/testing'; @@ -34,16 +44,6 @@ import { } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment.test'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { ActionType } from '../../../core/resource-policy/models/action-type.model'; -import { PolicyType } from '../../../core/resource-policy/models/policy-type.model'; -import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model'; -import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type'; -import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service'; import { SubmissionService } from '../../../submission/submission.service'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts index 7cea9dbddcb..59fce3c7b8d 100644 --- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts +++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts @@ -9,6 +9,15 @@ import { Output, ViewChild, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { ResourcePolicy } from '@core/resource-policy/models/resource-policy.model'; +import { RESOURCE_POLICY } from '@core/resource-policy/models/resource-policy.resource-type'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { NgbModal, NgbNavChangeEvent, @@ -34,15 +43,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model'; -import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { dateToISOFormat, diff --git a/src/app/shared/resource-policies/form/resource-policy-form.model.ts b/src/app/shared/resource-policies/form/resource-policy-form.model.ts index 2902f22a2d2..7f6304c9c80 100644 --- a/src/app/shared/resource-policies/form/resource-policy-form.model.ts +++ b/src/app/shared/resource-policies/form/resource-policy-form.model.ts @@ -1,3 +1,5 @@ +import { ActionType } from '@core/resource-policy/models/action-type.model'; +import { PolicyType } from '@core/resource-policy/models/policy-type.model'; import { DynamicDatePickerModelConfig, DynamicFormControlLayout, @@ -6,8 +8,6 @@ import { DynamicSelectModelConfig, } from '@ng-dynamic-forms/core'; -import { ActionType } from '../../../core/resource-policy/models/action-type.model'; -import { PolicyType } from '../../../core/resource-policy/models/policy-type.model'; import { DsDynamicInputModelConfig } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model'; import { DsDynamicTextAreaModelConfig } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model'; diff --git a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts index 4a3712c7d17..85865fdbc2b 100644 --- a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts +++ b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts @@ -8,6 +8,12 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { lazyDataService } from '@core/lazy-data-service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { ResourceType } from '@core/shared/resource-type'; import { Observable } from 'rxjs'; import { switchMap } from 'rxjs/operators'; @@ -15,12 +21,6 @@ import { APP_DATA_SERVICES_MAP, LazyDataServicesMap, } from '../../../../config/app-config.interface'; -import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { lazyDataService } from '../../../core/lazy-data-service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import { ResourceType } from '../../../core/shared/resource-type'; import { isEmpty } from '../../empty.util'; /** diff --git a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts index 70f4b48dcfc..a4c917430d1 100644 --- a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts +++ b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts @@ -5,12 +5,12 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { ResourcePolicy } from '@core/resource-policy/models/resource-policy.model'; +import { ResourcePolicyDataService } from '@core/resource-policy/resource-policy-data.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model'; -import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { isEmpty } from '../../empty.util'; import { followLink } from '../../utils/follow-link-config.model'; diff --git a/src/app/shared/resource-policies/resource-policies.component.spec.ts b/src/app/shared/resource-policies/resource-policies.component.spec.ts index 3ad0ee7acc8..c5f0c858e1e 100644 --- a/src/app/shared/resource-policies/resource-policies.component.spec.ts +++ b/src/app/shared/resource-policies/resource-policies.component.spec.ts @@ -19,6 +19,19 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { LinkService } from '@core/cache/builders/link.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RequestService } from '@core/data/request.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { ActionType } from '@core/resource-policy/models/action-type.model'; +import { PolicyType } from '@core/resource-policy/models/policy-type.model'; +import { ResourcePolicyDataService } from '@core/resource-policy/resource-policy-data.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Bundle } from '@core/shared/bundle.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateModule } from '@ngx-translate/core'; import { cold, @@ -28,19 +41,6 @@ import { import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { LinkService } from '../../core/cache/builders/link.service'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { RequestService } from '../../core/data/request.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../core/eperson/group-data.service'; -import { ActionType } from '../../core/resource-policy/models/action-type.model'; -import { PolicyType } from '../../core/resource-policy/models/policy-type.model'; -import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { Bundle } from '../../core/shared/bundle.model'; -import { Item } from '../../core/shared/item.model'; -import { PageInfo } from '../../core/shared/page-info.model'; import { getMockLinkService } from '../mocks/link-service.mock'; import { getMockResourcePolicyService } from '../mocks/mock-resource-policy-service'; import { getMockRequestService } from '../mocks/request.service.mock'; diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts index 213fe8b7605..45642f7dc83 100644 --- a/src/app/shared/resource-policies/resource-policies.component.ts +++ b/src/app/shared/resource-policies/resource-policies.component.ts @@ -10,6 +10,13 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RequestService } from '@core/data/request.service'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { ResourcePolicy } from '@core/resource-policy/models/resource-policy.model'; +import { ResourcePolicyDataService } from '@core/resource-policy/resource-policy-data.service'; +import { getAllSucceededRemoteData } from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -30,13 +37,6 @@ import { take, } from 'rxjs/operators'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { RequestService } from '../../core/data/request.service'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../core/eperson/group-data.service'; -import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model'; -import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service'; -import { getAllSucceededRemoteData } from '../../core/shared/operators'; import { BtnDisabledDirective } from '../btn-disabled.directive'; import { hasValue, diff --git a/src/app/shared/roles/role.directive.ts b/src/app/shared/roles/role.directive.ts index 2401ac91b61..970b3038865 100644 --- a/src/app/shared/roles/role.directive.ts +++ b/src/app/shared/roles/role.directive.ts @@ -8,6 +8,8 @@ import { TemplateRef, ViewContainerRef, } from '@angular/core'; +import { RoleService } from '@core/roles/role.service'; +import { RoleType } from '@core/roles/role-types'; import { combineLatest, Observable, @@ -19,8 +21,6 @@ import { map, } from 'rxjs/operators'; -import { RoleService } from '../../core/roles/role.service'; -import { RoleType } from '../../core/roles/role-types'; import { hasValue } from '../empty.util'; @Directive({ diff --git a/src/app/shared/rss-feed/rss.component.spec.ts b/src/app/shared/rss-feed/rss.component.spec.ts index 7042fd8ff19..f2ffbe76891 100644 --- a/src/app/shared/rss-feed/rss.component.spec.ts +++ b/src/app/shared/rss-feed/rss.component.spec.ts @@ -7,21 +7,21 @@ import { ActivatedRoute, Router, } from '@angular/router'; -import { TranslateService } from '@ngx-translate/core'; -import { of } from 'rxjs'; - import { SortDirection, SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { GroupDataService } from '../../core/eperson/group-data.service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { LinkHeadService } from '../../core/services/link-head.service'; -import { Collection } from '../../core/shared/collection.model'; -import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; +} from '@core/cache/models/sort-options.model'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { Collection } from '@core/shared/collection.model'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { TranslateService } from '@ngx-translate/core'; +import { of } from 'rxjs'; + import { MockActivatedRoute } from '../mocks/active-router.mock'; import { RouterMock } from '../mocks/router.mock'; import { getMockTranslateService } from '../mocks/translate.service.mock'; diff --git a/src/app/shared/rss-feed/rss.component.ts b/src/app/shared/rss-feed/rss.component.ts index 6a9cecc7cc5..54f590ab0fd 100644 --- a/src/app/shared/rss-feed/rss.component.ts +++ b/src/app/shared/rss-feed/rss.component.ts @@ -14,6 +14,14 @@ import { NavigationEnd, Router, } from '@angular/router'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { LinkHeadService } from '@core/services/link-head.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule, TranslateService, @@ -26,14 +34,6 @@ import { import { map } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; -import { SortOptions } from '../../core/cache/models/sort-options.model'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { GroupDataService } from '../../core/eperson/group-data.service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { LinkHeadService } from '../../core/services/link-head.service'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { hasValue, isUndefined, diff --git a/src/app/shared/sass-helper/css-variable.service.spec.ts b/src/app/shared/sass-helper/css-variable.service.spec.ts index 1b56527c489..2bc3bd0cac4 100644 --- a/src/app/shared/sass-helper/css-variable.service.spec.ts +++ b/src/app/shared/sass-helper/css-variable.service.spec.ts @@ -1,12 +1,12 @@ import { TestBed } from '@angular/core/testing'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { MockStore, provideMockStore, } from '@ngrx/store/testing'; import { getTestScheduler } from 'jasmine-marbles'; -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { PageInfo } from '../../core/shared/page-info.model'; import { KeyValuePair } from '../key-value-pair.model'; import { CSSVariableService } from './css-variable.service'; diff --git a/src/app/shared/sass-helper/css-variable.service.ts b/src/app/shared/sass-helper/css-variable.service.ts index a2be8062850..ff4c34ec929 100644 --- a/src/app/shared/sass-helper/css-variable.service.ts +++ b/src/app/shared/sass-helper/css-variable.service.ts @@ -1,4 +1,9 @@ import { Injectable } from '@angular/core'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { createSelector, MemoizedSelector, @@ -11,11 +16,6 @@ import { AppState, keySelector, } from '../../app.reducer'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { PageInfo } from '../../core/shared/page-info.model'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts index e4d95142490..936a504264b 100644 --- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts +++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts @@ -11,11 +11,11 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { Community } from '@core/shared/community.model'; +import { MetadataValue } from '@core/shared/metadata.models'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { Community } from '../../../core/shared/community.model'; -import { MetadataValue } from '../../../core/shared/metadata.models'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector/dso-selector.component'; import { createSuccessfulRemoteDataObject } from '../../remote-data.utils'; import { RouterStub } from '../../testing/router.stub'; diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts index d6d12a15aaa..0c5efa4f1ae 100644 --- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts +++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts @@ -4,17 +4,17 @@ import { OnInit, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { environment } from '../../../../environments/environment'; -import { - SortDirection, - SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { Context } from '../../../core/shared/context.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector/dso-selector.component'; import { DSOSelectorModalWrapperComponent, diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts index a1c02f3a8e9..d45123f5286 100644 --- a/src/app/shared/search-form/search-form.component.spec.ts +++ b/src/app/shared/search-form/search-form.component.spec.ts @@ -10,15 +10,15 @@ import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Community } from '@core/shared/community.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { Community } from '../../core/shared/community.model'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { SearchService } from '../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../core/shared/search/search-filter.service'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { PaginationServiceStub } from '../testing/pagination-service.stub'; import { RouterStub } from '../testing/router.stub'; diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts index 700e3eb691f..196e38203c2 100644 --- a/src/app/shared/search-form/search-form.component.ts +++ b/src/app/shared/search-form/search-form.component.ts @@ -8,6 +8,14 @@ import { } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { Router } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { NgbModal, NgbTooltipModule, @@ -16,14 +24,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject } from 'rxjs'; import { take } from 'rxjs/operators'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { PaginationService } from '../../core/pagination/pagination.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; -import { SearchService } from '../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../core/shared/search/search-filter.service'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/search/advanced-search/advanced-search.component.spec.ts b/src/app/shared/search/advanced-search/advanced-search.component.spec.ts index ea3394c4aeb..b93f4122ebd 100644 --- a/src/app/shared/search/advanced-search/advanced-search.component.spec.ts +++ b/src/app/shared/search/advanced-search/advanced-search.component.spec.ts @@ -3,13 +3,13 @@ import { TestBed, } from '@angular/core/testing'; import { Router } from '@angular/router'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG } from '../../../../config/app-config.interface'; import { environment } from '../../../../environments/environment.test'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../core/shared/search/search-filter.service'; import { RouterStub } from '../../testing/router.stub'; import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub'; import { SearchFilterServiceStub } from '../../testing/search-filter-service.stub'; diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts index 921e5df2831..a3516bd6e6d 100644 --- a/src/app/shared/search/advanced-search/advanced-search.component.ts +++ b/src/app/shared/search/advanced-search/advanced-search.component.ts @@ -14,6 +14,10 @@ import { Params, Router, } from '@angular/router'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; +import { FilterConfig } from '@core/shared/search/search-filters/search-config.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, @@ -26,10 +30,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../config/app-config.interface'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../core/shared/search/search-filter.service'; -import { FilterConfig } from '../../../core/shared/search/search-filters/search-config.model'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { hasValue, diff --git a/src/app/shared/search/models/facet-config-response.model.ts b/src/app/shared/search/models/facet-config-response.model.ts index 821d4cdaebb..de05f157433 100644 --- a/src/app/shared/search/models/facet-config-response.model.ts +++ b/src/app/shared/search/models/facet-config-response.model.ts @@ -1,9 +1,9 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { deserialize } from 'cerialize'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { CacheableObject } from '../../../core/cache/cacheable-object.model'; -import { HALLink } from '../../../core/shared/hal-link.model'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; import { SearchFilterConfig } from './search-filter-config.model'; import { FACET_CONFIG_RESPONSE } from './types/facet-config-response.resouce-type'; diff --git a/src/app/shared/search/models/facet-value.model.ts b/src/app/shared/search/models/facet-value.model.ts index 6861b452e0d..884636450f7 100644 --- a/src/app/shared/search/models/facet-value.model.ts +++ b/src/app/shared/search/models/facet-value.model.ts @@ -1,12 +1,11 @@ +import { HALLink } from '@core/shared/hal-link.model'; +import { HALResource } from '@core/shared/hal-resource.model'; import { autoserialize, autoserializeAs, deserialize, } from 'cerialize'; -import { HALLink } from '../../../core/shared/hal-link.model'; -import { HALResource } from '../../../core/shared/hal-resource.model'; - /** * Class representing possible values for a certain filter */ diff --git a/src/app/shared/search/models/facet-values.model.ts b/src/app/shared/search/models/facet-values.model.ts index a0cdffb9a57..08a62f19f16 100644 --- a/src/app/shared/search/models/facet-values.model.ts +++ b/src/app/shared/search/models/facet-values.model.ts @@ -1,12 +1,12 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, autoserializeAs, inheritSerialization, } from 'cerialize'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; import { FacetValue } from './facet-value.model'; import { FilterType } from './filter-type.model'; import { SearchQueryResponse } from './search-query-response.model'; diff --git a/src/app/shared/search/models/paginated-search-options.model.spec.ts b/src/app/shared/search/models/paginated-search-options.model.spec.ts index d39e3c958e4..5387156c59c 100644 --- a/src/app/shared/search/models/paginated-search-options.model.spec.ts +++ b/src/app/shared/search/models/paginated-search-options.model.spec.ts @@ -1,8 +1,9 @@ import { SortDirection, SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; +} from '@core/cache/models/sort-options.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; + import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; import { PaginatedSearchOptions } from './paginated-search-options.model'; import { SearchFilter } from './search-filter.model'; diff --git a/src/app/shared/search/models/paginated-search-options.model.ts b/src/app/shared/search/models/paginated-search-options.model.ts index 2c8546d2029..c5fe85cac50 100644 --- a/src/app/shared/search/models/paginated-search-options.model.ts +++ b/src/app/shared/search/models/paginated-search-options.model.ts @@ -1,6 +1,7 @@ -import { SortOptions } from '../../../core/cache/models/sort-options.model'; -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { ViewMode } from '@core/shared/view-mode.model'; + import { isNotEmpty } from '../../empty.util'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; import { SearchFilter } from './search-filter.model'; diff --git a/src/app/shared/search/models/search-filter-config.model.ts b/src/app/shared/search/models/search-filter-config.model.ts index 5ec6b0720fb..c317a6b58c4 100644 --- a/src/app/shared/search/models/search-filter-config.model.ts +++ b/src/app/shared/search/models/search-filter-config.model.ts @@ -1,13 +1,13 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, autoserializeAs, deserialize, } from 'cerialize'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { CacheableObject } from '../../../core/cache/cacheable-object.model'; -import { HALLink } from '../../../core/shared/hal-link.model'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; import { FilterType } from './filter-type.model'; import { SEARCH_FILTER_CONFIG } from './types/search-filter-config.resource-type'; diff --git a/src/app/shared/search/models/search-objects.model.ts b/src/app/shared/search/models/search-objects.model.ts index 5c70e3b0a1a..b6bcbd3870e 100644 --- a/src/app/shared/search/models/search-objects.model.ts +++ b/src/app/shared/search/models/search-objects.model.ts @@ -1,12 +1,12 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserializeAs, inheritSerialization, } from 'cerialize'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; import { SearchQueryResponse } from './search-query-response.model'; import { SearchResult } from './search-result.model'; import { SEARCH_OBJECTS } from './types/search-objects.resource-type'; diff --git a/src/app/shared/search/models/search-options.model.spec.ts b/src/app/shared/search/models/search-options.model.spec.ts index 614ca89160d..f05d3292604 100644 --- a/src/app/shared/search/models/search-options.model.spec.ts +++ b/src/app/shared/search/models/search-options.model.spec.ts @@ -1,4 +1,5 @@ -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; + import { SearchFilter } from './search-filter.model'; import { SearchOptions } from './search-options.model'; diff --git a/src/app/shared/search/models/search-options.model.ts b/src/app/shared/search/models/search-options.model.ts index 531d5254938..b5a7b3bf62d 100644 --- a/src/app/shared/search/models/search-options.model.ts +++ b/src/app/shared/search/models/search-options.model.ts @@ -1,6 +1,7 @@ -import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; -import { URLCombiner } from '../../../core/url-combiner/url-combiner'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; + import { hasValue, isNotEmpty, diff --git a/src/app/shared/search/models/search-query-response.model.ts b/src/app/shared/search/models/search-query-response.model.ts index d149a21c6f3..e99575caf8b 100644 --- a/src/app/shared/search/models/search-query-response.model.ts +++ b/src/app/shared/search/models/search-query-response.model.ts @@ -1,10 +1,10 @@ +import { PaginatedList } from '@core/data/paginated-list.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { autoserialize, autoserializeAs, } from 'cerialize'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; import { AppliedFilter } from './applied-filter.model'; import { SearchResultSorting } from './search-result-sorting.model'; diff --git a/src/app/shared/search/models/search-result.model.ts b/src/app/shared/search/models/search-result.model.ts index e3bc9279414..8f2e5acc5c3 100644 --- a/src/app/shared/search/models/search-result.model.ts +++ b/src/app/shared/search/models/search-result.model.ts @@ -1,18 +1,18 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { HALLink } from '@core/shared/hal-link.model'; +import { HALResource } from '@core/shared/hal-resource.model'; +import { MetadataMap } from '@core/shared/metadata.models'; +import { + excludeFromEquals, + fieldsForEquals, +} from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, } from 'cerialize'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { GenericConstructor } from '../../../core/shared/generic-constructor'; -import { HALLink } from '../../../core/shared/hal-link.model'; -import { HALResource } from '../../../core/shared/hal-resource.model'; -import { MetadataMap } from '../../../core/shared/metadata.models'; -import { - excludeFromEquals, - fieldsForEquals, -} from '../../../core/utilities/equals.decorators'; import { ListableObject } from '../../object-collection/shared/listable-object.model'; import { SEARCH_RESULT } from './types/search-result.resource-type'; diff --git a/src/app/shared/search/models/types/facet-config-response.resouce-type.ts b/src/app/shared/search/models/types/facet-config-response.resouce-type.ts index 83f2ca0e666..0ae1ae584d9 100644 --- a/src/app/shared/search/models/types/facet-config-response.resouce-type.ts +++ b/src/app/shared/search/models/types/facet-config-response.resouce-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for FacetConfigResponse diff --git a/src/app/shared/search/models/types/facet-values.resource-type.ts b/src/app/shared/search/models/types/facet-values.resource-type.ts index c9d6c69c2ec..74c7b5a5d14 100644 --- a/src/app/shared/search/models/types/facet-values.resource-type.ts +++ b/src/app/shared/search/models/types/facet-values.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for FacetValues diff --git a/src/app/shared/search/models/types/search-filter-config.resource-type.ts b/src/app/shared/search/models/types/search-filter-config.resource-type.ts index eb7521b8dfc..6a4ccc359d1 100644 --- a/src/app/shared/search/models/types/search-filter-config.resource-type.ts +++ b/src/app/shared/search/models/types/search-filter-config.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for SearchFilterConfig diff --git a/src/app/shared/search/models/types/search-objects.resource-type.ts b/src/app/shared/search/models/types/search-objects.resource-type.ts index 650b02f0058..42dcfe13194 100644 --- a/src/app/shared/search/models/types/search-objects.resource-type.ts +++ b/src/app/shared/search/models/types/search-objects.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for SearchObjects diff --git a/src/app/shared/search/models/types/search-result.resource-type.ts b/src/app/shared/search/models/types/search-result.resource-type.ts index 354c1898c4d..a233a83d747 100644 --- a/src/app/shared/search/models/types/search-result.resource-type.ts +++ b/src/app/shared/search/models/types/search-result.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for SearchResult diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts index 64a3cf6487f..562296bd87a 100644 --- a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts +++ b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts @@ -5,13 +5,13 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { ScriptDataService } from '../../../core/data/processes/script-data.service'; import { getProcessDetailRoute } from '../../../process-page/process-page-routing.paths'; import { Process } from '../../../process-page/processes/process.model'; import { NotificationsService } from '../../notifications/notifications.service'; diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.ts index df2e3ddba77..a7b4b36d3e1 100644 --- a/src/app/shared/search/search-export-csv/search-export-csv.component.ts +++ b/src/app/shared/search/search-export-csv/search-export-csv.component.ts @@ -7,6 +7,13 @@ import { SimpleChanges, } from '@angular/core'; import { Router } from '@angular/router'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -20,13 +27,6 @@ import { switchMap, } from 'rxjs/operators'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { ScriptDataService } from '../../../core/data/processes/script-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { getProcessDetailRoute } from '../../../process-page/process-page-routing.paths'; import { Process } from '../../../process-page/processes/process.model'; import { diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts index d761a8d95db..ebeafb8e7fb 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts @@ -14,17 +14,17 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { SearchService } from '../../../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service'; -import { ActivatedRouteStub } from '../../../../../../shared/testing/active-router.stub'; import { LiveRegionService } from '../../../../../live-region/live-region.service'; import { getLiveRegionServiceStub } from '../../../../../live-region/live-region.service.stub'; import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model'; +import { ActivatedRouteStub } from '../../../../../testing/active-router.stub'; import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub'; import { RouterStub } from '../../../../../testing/router.stub'; import { SearchConfigurationServiceStub } from '../../../../../testing/search-configuration-service.stub'; diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts index 69f3a5fb7dc..4443fbc9450 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts @@ -9,6 +9,10 @@ import { Router, RouterLink, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule, TranslateService, @@ -16,11 +20,7 @@ import { import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { SearchService } from '../../../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service'; -import { LiveRegionService } from '../../../../../../shared/live-region/live-region.service'; +import { LiveRegionService } from '../../../../../live-region/live-region.service'; import { currentPath } from '../../../../../utils/route.utils'; import { ShortNumberPipe } from '../../../../../utils/short-number.pipe'; import { FacetValue } from '../../../../models/facet-value.model'; diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts index 4f46a5dd2a7..f1412562b11 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts @@ -14,13 +14,13 @@ import { Router, RouterLink, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { SearchService } from '../../../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service'; import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model'; import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub'; import { RouterStub } from '../../../../../testing/router.stub'; diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts index 8e72b766bf8..7dc07b570a7 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts @@ -10,16 +10,16 @@ import { Router, RouterLink, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { Observable, Subscription, } from 'rxjs'; import { map } from 'rxjs/operators'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { SearchService } from '../../../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service'; import { hasValue } from '../../../../../empty.util'; import { currentPath } from '../../../../../utils/route.utils'; import { ShortNumberPipe } from '../../../../../utils/short-number.pipe'; diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts index 1faeb045833..5f2fc41d12a 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts @@ -9,12 +9,12 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { SearchService } from '../../../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service'; import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model'; import { ActivatedRouteStub } from '../../../../../testing/active-router.stub'; import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub'; diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts index 2732a116e7f..978d46ac958 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts @@ -9,13 +9,13 @@ import { Router, RouterLink, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { PaginationService } from '../../../../../../core/pagination/pagination.service'; -import { SearchService } from '../../../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service'; import { currentPath } from '../../../../../utils/route.utils'; import { AppliedFilter } from '../../../../models/applied-filter.model'; import { SearchFilterConfig } from '../../../../models/search-filter-config.model'; diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts index 5c201eecfee..fe37c893d8e 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts @@ -2,9 +2,9 @@ import { Component, Input, } from '@angular/core'; +import { GenericConstructor } from '@core/shared/generic-constructor'; import { BehaviorSubject } from 'rxjs'; -import { GenericConstructor } from '../../../../../core/shared/generic-constructor'; import { AbstractComponentLoaderComponent } from '../../../../abstract-component-loader/abstract-component-loader.component'; import { DynamicComponentLoaderDirective } from '../../../../abstract-component-loader/dynamic-component-loader.directive'; import { SearchFilterConfig } from '../../../models/search-filter-config.model'; diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts index 5ea39f4d539..77b5db50907 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts @@ -10,6 +10,10 @@ import { import { FormsModule } from '@angular/forms'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { Router } from '@angular/router'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { @@ -17,10 +21,6 @@ import { of, } from 'rxjs'; -import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { SearchService } from '../../../../../core/shared/search/search.service'; -import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils'; import { RouterStub } from '../../../../testing/router.stub'; diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts index cc26851c095..3db4881daf5 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts @@ -16,6 +16,11 @@ import { Params, Router, } from '@angular/router'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { BehaviorSubject, combineLatest as observableCombineLatest, @@ -31,11 +36,6 @@ import { tap, } from 'rxjs/operators'; -import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators'; -import { SearchService } from '../../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; import { hasNoValue, diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts index 125713e76e4..dc68ffb322c 100644 --- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts @@ -9,6 +9,8 @@ import { } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterModule } from '@angular/router'; +import { SearchService } from '@core/shared/search/search.service'; +import { SequenceService } from '@core/shared/sequence.service'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { @@ -17,8 +19,6 @@ import { } from 'rxjs'; import { SearchFilterService } from 'src/app/core/shared/search/search-filter.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { SequenceService } from '../../../../core/shared/sequence.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service'; import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils'; import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub'; diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts index 2b740734f68..e3ee07395fe 100644 --- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts @@ -13,6 +13,11 @@ import { OnInit, Output, } from '@angular/core'; +import { RemoteData } from '@core/data/remote-data'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; +import { SequenceService } from '@core/shared/sequence.service'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -26,11 +31,6 @@ import { switchMap, } from 'rxjs'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../core/shared/search/search-filter.service'; -import { SequenceService } from '../../../../core/shared/sequence.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service'; import { slide } from '../../../animations/slide'; import { diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts index 6d57335bbc3..8c75a2a8a4d 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts @@ -12,6 +12,15 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestEntryState } from '@core/data/request-entry-state.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbModal, NgbModule, @@ -24,15 +33,6 @@ import { import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment.test'; -import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { RequestEntryState } from '../../../../../core/data/request-entry-state.model'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { SearchService } from '../../../../../core/shared/search/search.service'; -import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service'; -import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; import { RouterStub } from '../../../../testing/router.stub'; import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub'; diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts index c979b82828e..56bacba05a4 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts @@ -13,6 +13,13 @@ import { Params, Router, } from '@angular/router'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbModal, NgbModalRef, @@ -34,13 +41,6 @@ import { AppConfig, } from '../../../../../../config/app-config.interface'; import { FilterVocabularyConfig } from '../../../../../../config/filter-vocabulary-config'; -import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { SearchService } from '../../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service'; -import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; import { hasValue } from '../../../../empty.util'; import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component'; diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts index a546d1ba707..12cd7ec459c 100644 --- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts @@ -10,6 +10,11 @@ import { } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { Router } from '@angular/router'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { RouteService } from '@core/services/route.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule, TranslateService, @@ -22,11 +27,6 @@ import { } from 'rxjs/operators'; import { yearFromString } from 'src/app/shared/date.util'; -import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { RouteService } from '../../../../../core/services/route.service'; -import { SearchService } from '../../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; import { hasValue } from '../../../../empty.util'; import { DebounceDirective } from '../../../../utils/debounce.directive'; diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts index 878b3a5f7ec..8540c050196 100644 --- a/src/app/shared/search/search-filters/search-filters.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts @@ -9,12 +9,12 @@ import { } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterModule } from '@angular/router'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG } from '../../../../config/app-config.interface'; import { environment } from '../../../../environments/environment'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { SearchFilterService } from '../../../core/shared/search/search-filter.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub'; import { SearchFilterServiceStub } from '../../testing/search-filter-service.stub'; diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts index 8532fcb3a10..d02f7eeba79 100644 --- a/src/app/shared/search/search-filters/search-filters.component.ts +++ b/src/app/shared/search/search-filters/search-filters.component.ts @@ -9,6 +9,10 @@ import { Router, RouterLink, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { @@ -25,10 +29,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../config/app-config.interface'; -import { RemoteData } from '../../../core/data/remote-data'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../core/shared/search/search-filter.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { currentPath } from '../../utils/route.utils'; import { AppliedFilter } from '../models/applied-filter.model'; diff --git a/src/app/shared/search/search-filters/themed-search-filters.component.ts b/src/app/shared/search/search-filters/themed-search-filters.component.ts index 47dbc140d40..e0594f37384 100644 --- a/src/app/shared/search/search-filters/themed-search-filters.component.ts +++ b/src/app/shared/search/search-filters/themed-search-filters.component.ts @@ -2,9 +2,9 @@ import { Component, Input, } from '@angular/core'; +import { RemoteData } from '@core/data/remote-data'; import { Observable } from 'rxjs'; -import { RemoteData } from '../../../core/data/remote-data'; import { ThemedComponent } from '../../theme-support/themed.component'; import { SearchFilterConfig } from '../models/search-filter-config.model'; import { SearchFiltersComponent } from './search-filters.component'; diff --git a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.spec.ts b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.spec.ts index eee1c75850d..e3be8657dfd 100644 --- a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.spec.ts +++ b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.spec.ts @@ -8,12 +8,12 @@ import { Params, RouterModule, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../core/shared/search/search-filter.service'; import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; import { PaginationServiceStub } from '../../../testing/pagination-service.stub'; diff --git a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts index ade3e432272..a606b0d6970 100644 --- a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts +++ b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts @@ -9,13 +9,13 @@ import { Router, RouterLink, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../core/shared/search/search-filter.service'; import { currentPath } from '../../../utils/route.utils'; import { AppliedFilter } from '../../models/applied-filter.model'; diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts index 179f1714ebc..402fba7a11d 100644 --- a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts +++ b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts @@ -13,12 +13,12 @@ import { RouterLink, RouterModule, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../core/shared/search/search-filter.service'; import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; import { PaginationServiceStub } from '../../../testing/pagination-service.stub'; diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.ts b/src/app/shared/search/search-labels/search-label/search-label.component.ts index 22c63c71c35..3a699d084d3 100644 --- a/src/app/shared/search/search-labels/search-label/search-label.component.ts +++ b/src/app/shared/search/search-labels/search-label/search-label.component.ts @@ -9,13 +9,13 @@ import { Router, RouterLink, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../../../core/shared/search/search-filter.service'; import { currentPath } from '../../../utils/route.utils'; import { AppliedFilter } from '../../models/applied-filter.model'; diff --git a/src/app/shared/search/search-labels/search-labels.component.spec.ts b/src/app/shared/search/search-labels/search-labels.component.spec.ts index 775077b2fa9..c46541d7329 100644 --- a/src/app/shared/search/search-labels/search-labels.component.spec.ts +++ b/src/app/shared/search/search-labels/search-labels.component.spec.ts @@ -10,10 +10,10 @@ import { import { FormsModule } from '@angular/forms'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; +import { SearchService } from '@core/shared/search/search.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { SearchService } from '../../../core/shared/search/search.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { SearchServiceStub } from '../../testing/search-service.stub'; import { ObjectKeysPipe } from '../../utils/object-keys-pipe'; diff --git a/src/app/shared/search/search-labels/search-labels.component.ts b/src/app/shared/search/search-labels/search-labels.component.ts index 14d2d5e86ef..e8279a9db19 100644 --- a/src/app/shared/search/search-labels/search-labels.component.ts +++ b/src/app/shared/search/search-labels/search-labels.component.ts @@ -7,9 +7,9 @@ import { Input, OnInit, } from '@angular/core'; +import { SearchService } from '@core/shared/search/search.service'; import { BehaviorSubject } from 'rxjs'; -import { SearchService } from '../../../core/shared/search/search.service'; import { ObjectKeysPipe } from '../../utils/object-keys-pipe'; import { AppliedFilter } from '../models/applied-filter.model'; import { SearchLabelComponent } from './search-label/search-label.component'; diff --git a/src/app/shared/search/search-result-element-decorator.ts b/src/app/shared/search/search-result-element-decorator.ts index 56d712ce269..2a0c831425b 100644 --- a/src/app/shared/search/search-result-element-decorator.ts +++ b/src/app/shared/search/search-result-element-decorator.ts @@ -1,13 +1,14 @@ +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { GenericConstructor } from '@core/shared/generic-constructor'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { PoolTask } from '@core/tasks/models/pool-task-object.model'; + import { AdminNotifyMessage } from '../../admin/admin-notify-dashboard/models/admin-notify-message.model'; import { AdminNotifySearchResult } from '../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model'; -import { Collection } from '../../core/shared/collection.model'; -import { Community } from '../../core/shared/community.model'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; -import { Item } from '../../core/shared/item.model'; -import { WorkflowItem } from '../../core/submission/models/workflowitem.model'; -import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; -import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model'; -import { PoolTask } from '../../core/tasks/models/pool-task-object.model'; import { ClaimedTaskSearchResult } from '../object-collection/shared/claimed-task-search-result.model'; import { CollectionSearchResult } from '../object-collection/shared/collection-search-result.model'; import { CommunitySearchResult } from '../object-collection/shared/community-search-result.model'; diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts index 68c8db5a8eb..b963ad024ca 100644 --- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts +++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts @@ -2,9 +2,9 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { SearchService } from '@core/shared/search/search.service'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { SearchService } from '../../../../core/shared/search/search.service'; import { SearchServiceStub } from '../../../testing/search-service.stub'; import { SearchResultsSkeletonComponent } from './search-results-skeleton.component'; diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts index c44bb9c2ac7..1c71752ce25 100644 --- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts +++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts @@ -4,11 +4,11 @@ import { Input, OnInit, } from '@angular/core'; +import { SearchService } from '@core/shared/search/search.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { Observable } from 'rxjs'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { ViewMode } from '../../../../core/shared/view-mode.model'; import { hasValue } from '../../../empty.util'; @Component({ diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts index 33b8432b749..928b95f22f8 100644 --- a/src/app/shared/search/search-results/search-results.component.spec.ts +++ b/src/app/shared/search/search-results/search-results.component.spec.ts @@ -10,11 +10,11 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; +import { Community } from '@core/shared/community.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; -import { Community } from '../../../core/shared/community.model'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { ErrorComponent } from '../../error/error.component'; import { getMockThemeService } from '../../mocks/theme-service.mock'; import { ObjectCollectionComponent } from '../../object-collection/object-collection.component'; diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts index 421f361bc00..c7c89042ee1 100644 --- a/src/app/shared/search/search-results/search-results.component.ts +++ b/src/app/shared/search/search-results/search-results.component.ts @@ -6,6 +6,14 @@ import { Output, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { @@ -13,14 +21,6 @@ import { Observable, } from 'rxjs'; -import { SortOptions } from '../../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Context } from '../../../core/shared/context.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { fadeIn, fadeInOut, diff --git a/src/app/shared/search/search-results/themed-search-results.component.ts b/src/app/shared/search/search-results/themed-search-results.component.ts index 540615f309d..beda00aa571 100644 --- a/src/app/shared/search/search-results/themed-search-results.component.ts +++ b/src/app/shared/search/search-results/themed-search-results.component.ts @@ -4,13 +4,13 @@ import { Input, Output, } from '@angular/core'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { SortOptions } from '../../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Context } from '../../../core/shared/context.model'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type'; import { ListableObject } from '../../object-collection/shared/listable-object.model'; import { ThemedComponent } from '../../theme-support/themed.component'; diff --git a/src/app/shared/search/search-settings/search-settings.component.spec.ts b/src/app/shared/search/search-settings/search-settings.component.spec.ts index 3b809653762..351beb6580e 100644 --- a/src/app/shared/search/search-settings/search-settings.component.spec.ts +++ b/src/app/shared/search/search-settings/search-settings.component.spec.ts @@ -7,16 +7,16 @@ import { import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { TranslateModule } from '@ngx-translate/core'; -import { of } from 'rxjs'; - import { SortDirection, SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { SearchFilterService } from '../../../core/shared/search/search-filter.service'; +} from '@core/cache/models/sort-options.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; +import { TranslateModule } from '@ngx-translate/core'; +import { of } from 'rxjs'; + import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; import { SidebarService } from '../../sidebar/sidebar.service'; diff --git a/src/app/shared/search/search-settings/search-settings.component.ts b/src/app/shared/search/search-settings/search-settings.component.ts index 058986c820a..252808bb8ae 100644 --- a/src/app/shared/search/search-settings/search-settings.component.ts +++ b/src/app/shared/search/search-settings/search-settings.component.ts @@ -5,14 +5,14 @@ import { Input, } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { TranslateModule } from '@ngx-translate/core'; - import { SortDirection, SortOptions, -} from '../../../core/cache/models/sort-options.model'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; +} from '@core/cache/models/sort-options.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { TranslateModule } from '@ngx-translate/core'; + import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { PageSizeSelectorComponent } from '../../page-size-selector/page-size-selector.component'; import { SidebarDropdownComponent } from '../../sidebar/sidebar-dropdown.component'; diff --git a/src/app/shared/search/search-settings/themed-search-settings.component.ts b/src/app/shared/search/search-settings/themed-search-settings.component.ts index 4a6aeea235c..0ebafa51a08 100644 --- a/src/app/shared/search/search-settings/themed-search-settings.component.ts +++ b/src/app/shared/search/search-settings/themed-search-settings.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { SortOptions } from '@core/cache/models/sort-options.model'; -import { SortOptions } from '../../../core/cache/models/sort-options.model'; import { ThemedComponent } from '../../theme-support/themed.component'; import { SearchSettingsComponent } from './search-settings.component'; diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts index b9c61629fcf..3c6b8643d4c 100644 --- a/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts +++ b/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts @@ -8,12 +8,12 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG } from '../../../../config/app-config.interface'; import { environment } from '../../../../environments/environment.test'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub'; import { AdvancedSearchComponent } from '../advanced-search/advanced-search.component'; import { ThemedSearchFiltersComponent } from '../search-filters/themed-search-filters.component'; diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.ts index 2aa69a14837..512c0f0fcd3 100644 --- a/src/app/shared/search/search-sidebar/search-sidebar.component.ts +++ b/src/app/shared/search/search-sidebar/search-sidebar.component.ts @@ -7,6 +7,11 @@ import { OnInit, Output, } from '@angular/core'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { RemoteData } from '@core/data/remote-data'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { FilterConfig } from '@core/shared/search/search-filters/search-config.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -18,11 +23,6 @@ import { APP_CONFIG, AppConfig, } from '../../../../config/app-config.interface'; -import { SortOptions } from '../../../core/cache/models/sort-options.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; -import { FilterConfig } from '../../../core/shared/search/search-filters/search-config.model'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { ViewModeSwitchComponent } from '../../view-mode-switch/view-mode-switch.component'; import { AdvancedSearchComponent } from '../advanced-search/advanced-search.component'; import { PaginatedSearchOptions } from '../models/paginated-search-options.model'; diff --git a/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts b/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts index 20a12083353..e2f872fe4a7 100644 --- a/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts +++ b/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts @@ -4,14 +4,14 @@ import { Input, Output, } from '@angular/core'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { RemoteData } from '@core/data/remote-data'; +import { ViewMode } from '@core/shared/view-mode.model'; import { BehaviorSubject, Observable, } from 'rxjs'; -import { SortOptions } from '../../../core/cache/models/sort-options.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ViewMode } from '../../../core/shared/view-mode.model'; import { ThemedComponent } from '../../theme-support/themed.component'; import { PaginatedSearchOptions } from '../models/paginated-search-options.model'; import { SearchFilterConfig } from '../models/search-filter-config.model'; diff --git a/src/app/shared/search/search-switch-configuration/search-configuration-option.model.ts b/src/app/shared/search/search-switch-configuration/search-configuration-option.model.ts index d59f7b74b19..fadee65aa8f 100644 --- a/src/app/shared/search/search-switch-configuration/search-configuration-option.model.ts +++ b/src/app/shared/search/search-switch-configuration/search-configuration-option.model.ts @@ -1,7 +1,7 @@ /** * Represents a search configuration select option */ -import { Context } from '../../../core/shared/context.model'; +import { Context } from '@core/shared/context.model'; export interface SearchConfigurationOption { diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts index 28fd6c793dd..c0a73422bf9 100644 --- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts +++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts @@ -9,14 +9,14 @@ import { NavigationExtras, Router, } from '@angular/router'; +import { Context } from '@core/shared/context.model'; +import { SearchService } from '@core/shared/search/search.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Context } from '../../../core/shared/context.model'; -import { SearchService } from '../../../core/shared/search/search.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type'; import { MYDSPACE_ROUTE } from '../../../my-dspace-page/my-dspace-page.component'; diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts index 0e244fdf224..ca0870a1728 100644 --- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts +++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts @@ -13,12 +13,12 @@ import { NavigationExtras, Router, } from '@angular/router'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; import findIndex from 'lodash/findIndex'; import { Subscription } from 'rxjs'; -import { SearchService } from '../../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type'; import { hasValue } from '../../empty.util'; diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts index 0a8d63f1ab7..809ac3400e6 100644 --- a/src/app/shared/search/search.component.spec.ts +++ b/src/app/shared/search/search.component.spec.ts @@ -14,6 +14,23 @@ import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RouteService } from '@core/services/route.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; +import { + SearchConfig, + SortConfig, +} from '@core/shared/search/search-filters/search-config.model'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,23 +48,6 @@ import { import { environment } from '../../../environments/environment.test'; import { getCollectionPageRoute } from '../../collection-page/collection-page-routing-paths'; import { getCommunityPageRoute } from '../../community-page/community-page-routing-paths'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { CommunityDataService } from '../../core/data/community-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { RouteService } from '../../core/services/route.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { Item } from '../../core/shared/item.model'; -import { SearchService } from '../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; -import { SearchFilterService } from '../../core/shared/search/search-filter.service'; -import { - SearchConfig, - SortConfig, -} from '../../core/shared/search/search-filters/search-config.model'; -import { XSRFService } from '../../core/xsrf/xsrf.service'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; import { HostWindowService } from '../host-window.service'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts index 6969a741e48..942fc82c195 100644 --- a/src/app/shared/search/search.component.ts +++ b/src/app/shared/search/search.component.ts @@ -18,6 +18,20 @@ import { NavigationStart, Router, } from '@angular/router'; +import { SortOptions } from '@core/cache/models/sort-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RouteService } from '@core/services/route.service'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { SearchService } from '@core/shared/search/search.service'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; +import { SearchConfig } from '@core/shared/search/search-filters/search-config.model'; +import { ViewMode } from '@core/shared/view-mode.model'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; import { TranslateModule } from '@ngx-translate/core'; import uniqueId from 'lodash/uniqueId'; import { @@ -41,20 +55,6 @@ import { import { environment } from '../../../environments/environment'; import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths'; import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths'; -import { SortOptions } from '../../core/cache/models/sort-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { RouteService } from '../../core/services/route.service'; -import { Context } from '../../core/shared/context.model'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { Item } from '../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { SearchService } from '../../core/shared/search/search.service'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; -import { SearchConfig } from '../../core/shared/search/search-filters/search-config.model'; -import { ViewMode } from '../../core/shared/view-mode.model'; -import { SubmissionObject } from '../../core/submission/models/submission-object.model'; -import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; import { ITEM_MODULE_PATH } from '../../item-page/item-page-routing-paths'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; import { pushInOut } from '../animations/push'; diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts index e76a4d2f1a5..de8deeec064 100644 --- a/src/app/shared/search/themed-search.component.ts +++ b/src/app/shared/search/themed-search.component.ts @@ -4,10 +4,10 @@ import { Input, Output, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Context } from '../../core/shared/context.model'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { CollectionElementLinkType } from '../object-collection/collection-element-link.type'; import { ListableObject } from '../object-collection/shared/listable-object.model'; import { ThemedComponent } from '../theme-support/themed.component'; diff --git a/src/app/shared/sidebar/sidebar-effects.service.ts b/src/app/shared/sidebar/sidebar-effects.service.ts index e8a0e763579..87da1cff87e 100644 --- a/src/app/shared/sidebar/sidebar-effects.service.ts +++ b/src/app/shared/sidebar/sidebar-effects.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { URLBaser } from '@core/url-baser/url-baser'; import { Actions, createEffect, @@ -11,7 +12,6 @@ import { tap, } from 'rxjs/operators'; -import { URLBaser } from '../../core/url-baser/url-baser'; import { SidebarCollapseAction } from './sidebar.actions'; /** diff --git a/src/app/shared/starts-with/date/starts-with-date.component.spec.ts b/src/app/shared/starts-with/date/starts-with-date.component.spec.ts index 6a48f0db227..a55ea3d1ce4 100644 --- a/src/app/shared/starts-with/date/starts-with-date.component.spec.ts +++ b/src/app/shared/starts-with/date/starts-with-date.component.spec.ts @@ -11,10 +11,10 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { PaginationService } from '@core/pagination/pagination.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { PaginationService } from '../../../core/pagination/pagination.service'; import { ActivatedRouteStub } from '../../testing/active-router.stub'; import { PaginationServiceStub } from '../../testing/pagination-service.stub'; import { RouterStub } from '../../testing/router.stub'; diff --git a/src/app/shared/starts-with/starts-with-abstract.component.ts b/src/app/shared/starts-with/starts-with-abstract.component.ts index e2d5ca3e0f0..0c31bbb7a31 100644 --- a/src/app/shared/starts-with/starts-with-abstract.component.ts +++ b/src/app/shared/starts-with/starts-with-abstract.component.ts @@ -12,9 +12,9 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; import { Subscription } from 'rxjs'; -import { PaginationService } from '../../core/pagination/pagination.service'; import { hasValue } from '../empty.util'; import { StartsWithType } from './starts-with-type'; diff --git a/src/app/shared/starts-with/starts-with-loader.component.spec.ts b/src/app/shared/starts-with/starts-with-loader.component.spec.ts index 4989eb6bcc0..309ef3b2893 100644 --- a/src/app/shared/starts-with/starts-with-loader.component.spec.ts +++ b/src/app/shared/starts-with/starts-with-loader.component.spec.ts @@ -11,9 +11,9 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { PaginationService } from '@core/pagination/pagination.service'; import { TranslateModule } from '@ngx-translate/core'; -import { PaginationService } from '../../core/pagination/pagination.service'; import { DynamicComponentLoaderDirective } from '../abstract-component-loader/dynamic-component-loader.directive'; import { getMockThemeService } from '../mocks/theme-service.mock'; import { ActivatedRouteStub } from '../testing/active-router.stub'; diff --git a/src/app/shared/starts-with/starts-with-loader.component.ts b/src/app/shared/starts-with/starts-with-loader.component.ts index 884e05055ad..8f92588c5fb 100644 --- a/src/app/shared/starts-with/starts-with-loader.component.ts +++ b/src/app/shared/starts-with/starts-with-loader.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { GenericConstructor } from '@core/shared/generic-constructor'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; import { AbstractComponentLoaderComponent } from '../abstract-component-loader/abstract-component-loader.component'; import { StartsWithAbstractComponent } from './starts-with-abstract.component'; import { getStartsWithComponent } from './starts-with-decorator'; diff --git a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts index c0c6996d966..7c5900cbbc2 100644 --- a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts +++ b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts @@ -11,10 +11,10 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { PaginationService } from '@core/pagination/pagination.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { PaginationService } from '../../../core/pagination/pagination.service'; import { ActivatedRouteStub } from '../../testing/active-router.stub'; import { PaginationServiceStub } from '../../testing/pagination-service.stub'; import { RouterStub } from '../../testing/router.stub'; diff --git a/src/app/shared/subscriptions/models/subscription.model.ts b/src/app/shared/subscriptions/models/subscription.model.ts index 513b239259e..d3fa1291f25 100644 --- a/src/app/shared/subscriptions/models/subscription.model.ts +++ b/src/app/shared/subscriptions/models/subscription.model.ts @@ -1,3 +1,13 @@ +import { + link, + typedObject, +} from '@core/cache/builders/build-decorators'; +import { RemoteData } from '@core/data/remote-data'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { EPERSON } from '@core/eperson/models/eperson.resource-type'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { DSPACE_OBJECT } from '@core/shared/dspace-object.resource-type'; +import { HALLink } from '@core/shared/hal-link.model'; import { autoserialize, deserialize, @@ -5,16 +15,6 @@ import { } from 'cerialize'; import { Observable } from 'rxjs'; -import { - link, - typedObject, -} from '../../../core/cache/builders/build-decorators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { EPERSON } from '../../../core/eperson/models/eperson.resource-type'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { DSPACE_OBJECT } from '../../../core/shared/dspace-object.resource-type'; -import { HALLink } from '../../../core/shared/hal-link.model'; import { SUBSCRIPTION } from './subscription.resource-type'; @typedObject diff --git a/src/app/shared/subscriptions/models/subscription.resource-type.ts b/src/app/shared/subscriptions/models/subscription.resource-type.ts index a1dad5cba0e..1cab6cd03f1 100644 --- a/src/app/shared/subscriptions/models/subscription.resource-type.ts +++ b/src/app/shared/subscriptions/models/subscription.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../../../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for Subscription diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts index a5dfbd40935..fe74bbd6e08 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts @@ -14,6 +14,11 @@ import { UntypedFormGroup, } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { AuthService } from '@core/auth/auth.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbActiveModal, NgbModalModule, @@ -23,11 +28,6 @@ import { TranslateModule, } from '@ngx-translate/core'; -import { AuthService } from '../../../core/auth/auth.service'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { Item } from '../../../core/shared/item.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; import { getMockThemeService } from '../../mocks/theme-service.mock'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; import { NotificationsService } from '../../notifications/notifications.service'; diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts index d03cb4d0d85..3352079f34f 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts @@ -16,6 +16,15 @@ import { UntypedFormGroup, Validators, } from '@angular/forms'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; import { NgbActiveModal, NgbModal, @@ -38,15 +47,6 @@ import { tap, } from 'rxjs/operators'; -import { AuthService } from '../../../core/auth/auth.service'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; import { AlertComponent } from '../../alert/alert.component'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { isNotEmpty } from '../../empty.util'; diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts index e3479f3af04..2ca85c3b144 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts @@ -15,6 +15,8 @@ import { By, } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -22,8 +24,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { Item } from '../../../core/shared/item.model'; -import { ITEM } from '../../../core/shared/item.resource-type'; import { getMockThemeService } from '../../mocks/theme-service.mock'; // Import mocks import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts index 7470ef5dab9..1ed241fe91a 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts @@ -6,6 +6,8 @@ import { Output, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { NgbModal, NgbModalRef, @@ -14,8 +16,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { take } from 'rxjs/operators'; import { getDSORoute } from 'src/app/app-routing-paths'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component'; import { hasValue } from '../../empty.util'; diff --git a/src/app/shared/subscriptions/subscriptions-data.service.spec.ts b/src/app/shared/subscriptions/subscriptions-data.service.spec.ts index 860d3ad5ef5..cdc88719559 100644 --- a/src/app/shared/subscriptions/subscriptions-data.service.spec.ts +++ b/src/app/shared/subscriptions/subscriptions-data.service.spec.ts @@ -1,12 +1,12 @@ import { HttpClient } from '@angular/common/http'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { RequestService } from '@core/data/request.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { Store } from '@ngrx/store'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service'; -import { ObjectCacheService } from '../../core/cache/object-cache.service'; -import { DSOChangeAnalyzer } from '../../core/data/dso-change-analyzer.service'; -import { RequestService } from '../../core/data/request.service'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; import { getMockRemoteDataBuildService } from '../mocks/remote-data-build.service.mock'; import { getMockRequestService } from '../mocks/request.service.mock'; import { NotificationsService } from '../notifications/notifications.service'; diff --git a/src/app/shared/subscriptions/subscriptions-data.service.ts b/src/app/shared/subscriptions/subscriptions-data.service.ts index 81e258d017e..f0c3f579fbb 100644 --- a/src/app/shared/subscriptions/subscriptions-data.service.ts +++ b/src/app/shared/subscriptions/subscriptions-data.service.ts @@ -1,5 +1,26 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { DeleteDataImpl } from '@core/data/base/delete-data'; +import { FindAllData } from '@core/data/base/find-all-data'; +import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; +import { SearchDataImpl } from '@core/data/base/search-data'; +import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { + CreateRequest, + PutRequest, +} from '@core/data/request.models'; +import { RequestService } from '@core/data/request.service'; +import { RestRequest } from '@core/data/rest-request.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { @@ -11,27 +32,6 @@ import { } from 'rxjs/operators'; import { sendRequest } from 'src/app/core/shared/request.operators'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service'; -import { RequestParam } from '../../core/cache/models/request-param.model'; -import { ObjectCacheService } from '../../core/cache/object-cache.service'; -import { DeleteDataImpl } from '../../core/data/base/delete-data'; -import { FindAllData } from '../../core/data/base/find-all-data'; -import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service'; -import { SearchDataImpl } from '../../core/data/base/search-data'; -import { DSOChangeAnalyzer } from '../../core/data/dso-change-analyzer.service'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { - CreateRequest, - PutRequest, -} from '../../core/data/request.models'; -import { RequestService } from '../../core/data/request.service'; -import { RestRequest } from '../../core/data/rest-request.model'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { isNotEmpty, isNotEmptyOperator, diff --git a/src/app/shared/testing/auth-request-service.stub.ts b/src/app/shared/testing/auth-request-service.stub.ts index 6a8f39f04e5..3aaf89c1c6d 100644 --- a/src/app/shared/testing/auth-request-service.stub.ts +++ b/src/app/shared/testing/auth-request-service.stub.ts @@ -1,12 +1,12 @@ +import { AuthStatus } from '@core/auth/models/auth-status.model'; +import { AuthTokenInfo } from '@core/auth/models/auth-token-info.model'; +import { HttpOptions } from '@core/dspace-rest/dspace-rest.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; import { Observable, of, } from 'rxjs'; -import { AuthStatus } from '../../core/auth/models/auth-status.model'; -import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; -import { HttpOptions } from '../../core/dspace-rest/dspace-rest.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; import { isNotEmpty } from '../empty.util'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { EPersonMock } from './eperson.mock'; diff --git a/src/app/shared/testing/auth-service.stub.ts b/src/app/shared/testing/auth-service.stub.ts index 121b4bf16e5..5d43e112542 100644 --- a/src/app/shared/testing/auth-service.stub.ts +++ b/src/app/shared/testing/auth-service.stub.ts @@ -1,14 +1,14 @@ +import { RetrieveAuthMethodsAction } from '@core/auth/auth.actions'; +import { AuthMethod } from '@core/auth/models/auth.method'; +import { AuthMethodType } from '@core/auth/models/auth.method-type'; +import { AuthStatus } from '@core/auth/models/auth-status.model'; +import { AuthTokenInfo } from '@core/auth/models/auth-token-info.model'; +import { EPerson } from '@core/eperson/models/eperson.model'; import { Observable, of, } from 'rxjs'; -import { RetrieveAuthMethodsAction } from '../../core/auth/auth.actions'; -import { AuthMethod } from '../../core/auth/models/auth.method'; -import { AuthMethodType } from '../../core/auth/models/auth.method-type'; -import { AuthStatus } from '../../core/auth/models/auth-status.model'; -import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; -import { EPerson } from '../../core/eperson/models/eperson.model'; import { hasValue } from '../empty.util'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { EPersonMock } from './eperson.mock'; diff --git a/src/app/shared/testing/authorization-service.stub.ts b/src/app/shared/testing/authorization-service.stub.ts index bafa8eefafd..550a59d528c 100644 --- a/src/app/shared/testing/authorization-service.stub.ts +++ b/src/app/shared/testing/authorization-service.stub.ts @@ -1,10 +1,9 @@ +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { Observable, of, } from 'rxjs'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; - export class AuthorizationDataServiceStub { isAuthorized(featureId?: FeatureID, objectUrl?: string, ePersonUuid?: string): Observable { return of(false); diff --git a/src/app/shared/testing/base-data-service.stub.ts b/src/app/shared/testing/base-data-service.stub.ts index 1dc6afe36bf..44b9c8d4b7b 100644 --- a/src/app/shared/testing/base-data-service.stub.ts +++ b/src/app/shared/testing/base-data-service.stub.ts @@ -1,10 +1,10 @@ +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { RemoteData } from '@core/data/remote-data'; import { Observable, of, } from 'rxjs'; -import { CacheableObject } from '../../core/cache/cacheable-object.model'; -import { RemoteData } from '../../core/data/remote-data'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { FollowLinkConfig } from '../utils/follow-link-config.model'; diff --git a/src/app/shared/testing/bitstream-data-service.stub.ts b/src/app/shared/testing/bitstream-data-service.stub.ts index 5470486a197..1aab3a1b4b6 100644 --- a/src/app/shared/testing/bitstream-data-service.stub.ts +++ b/src/app/shared/testing/bitstream-data-service.stub.ts @@ -1,13 +1,12 @@ +import { RemoteData } from '@core/data/remote-data'; +import { RequestEntryState } from '@core/data/request-entry-state.model'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { NoContent } from '@core/shared/NoContent.model'; import { Observable, of, } from 'rxjs'; -import { RemoteData } from '../../core/data/remote-data'; -import { RequestEntryState } from '../../core/data/request-entry-state.model'; -import { Bitstream } from '../../core/shared/bitstream.model'; -import { NoContent } from '../../core/shared/NoContent.model'; - export class BitstreamDataServiceStub { removeMultiple(_bitstreams: Bitstream[]): Observable> { diff --git a/src/app/shared/testing/browse-definition-data-service.stub.ts b/src/app/shared/testing/browse-definition-data-service.stub.ts index c24040edf53..fb4e4890014 100644 --- a/src/app/shared/testing/browse-definition-data-service.stub.ts +++ b/src/app/shared/testing/browse-definition-data-service.stub.ts @@ -1,19 +1,19 @@ +import { BrowseService } from '@core/browse/browse.service'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; +import { FlatBrowseDefinition } from '@core/shared/flat-browse-definition.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { ValueListBrowseDefinition } from '@core/shared/value-list-browse-definition.model'; import { EMPTY, Observable, of, } from 'rxjs'; -import { BrowseService } from '../../core/browse/browse.service'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { BrowseDefinition } from '../../core/shared/browse-definition.model'; -import { FlatBrowseDefinition } from '../../core/shared/flat-browse-definition.model'; -import { PageInfo } from '../../core/shared/page-info.model'; -import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model'; import { createSuccessfulRemoteDataObject } from '../remote-data.utils'; // This data is in post-serialized form (metadata -> metadataKeys) diff --git a/src/app/shared/testing/browse-service.stub.ts b/src/app/shared/testing/browse-service.stub.ts index 85ca717cb03..26de6805574 100644 --- a/src/app/shared/testing/browse-service.stub.ts +++ b/src/app/shared/testing/browse-service.stub.ts @@ -1,18 +1,18 @@ +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { BrowseDefinition } from '@core/shared/browse-definition.model'; +import { FlatBrowseDefinition } from '@core/shared/flat-browse-definition.model'; +import { HierarchicalBrowseDefinition } from '@core/shared/hierarchical-browse-definition.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { ValueListBrowseDefinition } from '@core/shared/value-list-browse-definition.model'; import { EMPTY, Observable, } from 'rxjs'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { BrowseDefinition } from '../../core/shared/browse-definition.model'; -import { FlatBrowseDefinition } from '../../core/shared/flat-browse-definition.model'; -import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model'; -import { PageInfo } from '../../core/shared/page-info.model'; -import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; const mockData = [ diff --git a/src/app/shared/testing/claimed-task-data-service.stub.ts b/src/app/shared/testing/claimed-task-data-service.stub.ts index 610098a3378..0c6f2e9d4fb 100644 --- a/src/app/shared/testing/claimed-task-data-service.stub.ts +++ b/src/app/shared/testing/claimed-task-data-service.stub.ts @@ -1,12 +1,11 @@ +import { RemoteData } from '@core/data/remote-data'; +import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; import { EMPTY, Observable, } from 'rxjs'; -import { RemoteData } from '../../core/data/remote-data'; -import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model'; -import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response'; - export class ClaimedTaskDataServiceStub { public submitTask(_scopeId: string, _body: any): Observable { diff --git a/src/app/shared/testing/configuration-data.service.stub.ts b/src/app/shared/testing/configuration-data.service.stub.ts index 66324218f5f..277833a0ec8 100644 --- a/src/app/shared/testing/configuration-data.service.stub.ts +++ b/src/app/shared/testing/configuration-data.service.stub.ts @@ -1,7 +1,7 @@ +import { RemoteData } from '@core/data/remote-data'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; import { Observable } from 'rxjs'; -import { RemoteData } from '../../core/data/remote-data'; -import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; export class ConfigurationDataServiceStub { diff --git a/src/app/shared/testing/dso-edit-metadata-field.service.stub.ts b/src/app/shared/testing/dso-edit-metadata-field.service.stub.ts index 3e87348545d..2b62a0b8bac 100644 --- a/src/app/shared/testing/dso-edit-metadata-field.service.stub.ts +++ b/src/app/shared/testing/dso-edit-metadata-field.service.stub.ts @@ -1,11 +1,10 @@ +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Vocabulary } from '@core/submission/vocabularies/models/vocabulary.model'; import { Observable, of, } from 'rxjs'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { Vocabulary } from '../../core/submission/vocabularies/models/vocabulary.model'; - /** * Stub class of {@link DsoEditMetadataFieldService} */ diff --git a/src/app/shared/testing/edit-item-relationships.service.stub.ts b/src/app/shared/testing/edit-item-relationships.service.stub.ts index 1d295697936..b343cffdedb 100644 --- a/src/app/shared/testing/edit-item-relationships.service.stub.ts +++ b/src/app/shared/testing/edit-item-relationships.service.stub.ts @@ -1,17 +1,17 @@ /* eslint-disable no-empty, @typescript-eslint/no-empty-function */ +import { + DeleteRelationship, + RelationshipIdentifiable, +} from '@core/data/object-updates/object-updates.reducer'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { NoContent } from '@core/shared/NoContent.model'; import { Observable, Subscription, } from 'rxjs'; -import { - DeleteRelationship, - RelationshipIdentifiable, -} from '../../core/data/object-updates/object-updates.reducer'; -import { RemoteData } from '../../core/data/remote-data'; -import { Item } from '../../core/shared/item.model'; -import { Relationship } from '../../core/shared/item-relationships/relationship.model'; -import { NoContent } from '../../core/shared/NoContent.model'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; /** diff --git a/src/app/shared/testing/entity-type-data.service.stub.ts b/src/app/shared/testing/entity-type-data.service.stub.ts index d558dc3c31d..8cf44422613 100644 --- a/src/app/shared/testing/entity-type-data.service.stub.ts +++ b/src/app/shared/testing/entity-type-data.service.stub.ts @@ -1,9 +1,9 @@ +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { ItemType } from '@core/shared/item-relationships/item-type.model'; import { Observable } from 'rxjs'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { ItemType } from '../../core/shared/item-relationships/item-type.model'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { FollowLinkConfig } from '../utils/follow-link-config.model'; import { createPaginatedList } from './utils.test'; diff --git a/src/app/shared/testing/eperson.mock.ts b/src/app/shared/testing/eperson.mock.ts index 36daad1e579..84d89d9450d 100644 --- a/src/app/shared/testing/eperson.mock.ts +++ b/src/app/shared/testing/eperson.mock.ts @@ -1,4 +1,4 @@ -import { EPerson } from '../../core/eperson/models/eperson.model'; +import { EPerson } from '@core/eperson/models/eperson.model'; export const EPersonMock: EPerson = Object.assign(new EPerson(), { handle: null, diff --git a/src/app/shared/testing/group-mock.ts b/src/app/shared/testing/group-mock.ts index 599afaa20d2..ec0455575ca 100644 --- a/src/app/shared/testing/group-mock.ts +++ b/src/app/shared/testing/group-mock.ts @@ -1,4 +1,5 @@ -import { Group } from '../../core/eperson/models/group.model'; +import { Group } from '@core/eperson/models/group.model'; + import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { EPersonMock } from './eperson.mock'; diff --git a/src/app/shared/testing/identifiable-data-service.stub.ts b/src/app/shared/testing/identifiable-data-service.stub.ts index e8928b568db..a43e7e8fbd5 100644 --- a/src/app/shared/testing/identifiable-data-service.stub.ts +++ b/src/app/shared/testing/identifiable-data-service.stub.ts @@ -1,10 +1,10 @@ +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { RemoteData } from '@core/data/remote-data'; import { EMPTY, Observable, } from 'rxjs'; -import { CacheableObject } from '../../core/cache/cacheable-object.model'; -import { RemoteData } from '../../core/data/remote-data'; import { FollowLinkConfig } from '../utils/follow-link-config.model'; import { BaseDataServiceStub } from './base-data-service.stub'; diff --git a/src/app/shared/testing/item-data.service.stub.ts b/src/app/shared/testing/item-data.service.stub.ts index eed5d4bb119..1d236921fcc 100644 --- a/src/app/shared/testing/item-data.service.stub.ts +++ b/src/app/shared/testing/item-data.service.stub.ts @@ -1,4 +1,5 @@ -import { Item } from '../../core/shared/item.model'; +import { Item } from '@core/shared/item.model'; + import { IdentifiableDataServiceStub } from './identifiable-data-service.stub'; /** diff --git a/src/app/shared/testing/object-cache-service.stub.ts b/src/app/shared/testing/object-cache-service.stub.ts index d6b558c8d01..a3bdd0b1c51 100644 --- a/src/app/shared/testing/object-cache-service.stub.ts +++ b/src/app/shared/testing/object-cache-service.stub.ts @@ -1,11 +1,10 @@ +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { ObjectCacheEntry } from '@core/cache/object-cache.reducer'; import { Observable, of, } from 'rxjs'; -import { CacheableObject } from '../../core/cache/cacheable-object.model'; -import { ObjectCacheEntry } from '../../core/cache/object-cache.reducer'; - /* eslint-disable @typescript-eslint/no-empty-function */ /** * Stub class of {@link ObjectCacheService} diff --git a/src/app/shared/testing/object-updates.service.stub.ts b/src/app/shared/testing/object-updates.service.stub.ts index 69ec80d4363..e4c6b5825ee 100644 --- a/src/app/shared/testing/object-updates.service.stub.ts +++ b/src/app/shared/testing/object-updates.service.stub.ts @@ -1,14 +1,13 @@ /* eslint-disable no-empty, @typescript-eslint/no-empty-function */ +import { FieldUpdates } from '@core/data/object-updates/field-updates.model'; +import { Identifiable } from '@core/data/object-updates/identifiable.model'; +import { PatchOperationService } from '@core/data/object-updates/patch-operation-service/patch-operation.service'; +import { GenericConstructor } from '@core/shared/generic-constructor'; import { Observable, of, } from 'rxjs'; -import { FieldUpdates } from '../../core/data/object-updates/field-updates.model'; -import { Identifiable } from '../../core/data/object-updates/identifiable.model'; -import { PatchOperationService } from '../../core/data/object-updates/patch-operation-service/patch-operation.service'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; - /** * Stub class of {@link ObjectUpdatesService} */ diff --git a/src/app/shared/testing/pagination-service.stub.ts b/src/app/shared/testing/pagination-service.stub.ts index 16a2f48ce75..c86e4a81766 100644 --- a/src/app/shared/testing/pagination-service.stub.ts +++ b/src/app/shared/testing/pagination-service.stub.ts @@ -1,10 +1,10 @@ -import { of } from 'rxjs'; - import { SortDirection, SortOptions, -} from '../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../core/data/find-list-options.model'; +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { of } from 'rxjs'; + import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; export class PaginationServiceStub { diff --git a/src/app/shared/testing/registry.service.stub.ts b/src/app/shared/testing/registry.service.stub.ts index a28ca7feef8..c85bbf3beb8 100644 --- a/src/app/shared/testing/registry.service.stub.ts +++ b/src/app/shared/testing/registry.service.stub.ts @@ -1,15 +1,15 @@ /* eslint-disable no-empty,@typescript-eslint/no-empty-function */ +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { NoContent } from '@core/shared/NoContent.model'; import { Observable, of, } from 'rxjs'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { MetadataField } from '../../core/metadata/metadata-field.model'; -import { MetadataSchema } from '../../core/metadata/metadata-schema.model'; -import { NoContent } from '../../core/shared/NoContent.model'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { FollowLinkConfig } from '../utils/follow-link-config.model'; import { createPaginatedList } from './utils.test'; diff --git a/src/app/shared/testing/relationship-data.service.stub.ts b/src/app/shared/testing/relationship-data.service.stub.ts index f520ddb1ff7..156025182ea 100644 --- a/src/app/shared/testing/relationship-data.service.stub.ts +++ b/src/app/shared/testing/relationship-data.service.stub.ts @@ -1,18 +1,18 @@ /* eslint-disable no-empty, @typescript-eslint/no-empty-function */ +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { MetadataRepresentation } from '@core/shared/metadata-representation/metadata-representation.model'; +import { NoContent } from '@core/shared/NoContent.model'; import { Observable, of, } from 'rxjs'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { Item } from '../../core/shared/item.model'; -import { Relationship } from '../../core/shared/item-relationships/relationship.model'; -import { MetadataValue } from '../../core/shared/metadata.models'; -import { MetadataRepresentation } from '../../core/shared/metadata-representation/metadata-representation.model'; -import { NoContent } from '../../core/shared/NoContent.model'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { FollowLinkConfig } from '../utils/follow-link-config.model'; diff --git a/src/app/shared/testing/search-configuration-service.stub.ts b/src/app/shared/testing/search-configuration-service.stub.ts index e06f2ab6910..1f72d48c3db 100644 --- a/src/app/shared/testing/search-configuration-service.stub.ts +++ b/src/app/shared/testing/search-configuration-service.stub.ts @@ -1,14 +1,14 @@ import { Params } from '@angular/router'; +import { + FilterConfig, + SearchConfig, +} from '@core/shared/search/search-filters/search-config.model'; import { BehaviorSubject, Observable, of, } from 'rxjs'; -import { - FilterConfig, - SearchConfig, -} from '../../core/shared/search/search-filters/search-config.model'; import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model'; import { SearchOptions } from '../search/models/search-options.model'; diff --git a/src/app/shared/testing/search-filter-service.stub.ts b/src/app/shared/testing/search-filter-service.stub.ts index 6600796e030..18a5fd18759 100644 --- a/src/app/shared/testing/search-filter-service.stub.ts +++ b/src/app/shared/testing/search-filter-service.stub.ts @@ -1,13 +1,13 @@ import { Params } from '@angular/router'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; import { Observable, of, } from 'rxjs'; -import { - SortDirection, - SortOptions, -} from '../../core/cache/models/sort-options.model'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; import { SearchFilterConfig } from '../search/models/search-filter-config.model'; diff --git a/src/app/shared/testing/search-service.stub.ts b/src/app/shared/testing/search-service.stub.ts index 68ffba74a0a..e255555e30e 100644 --- a/src/app/shared/testing/search-service.stub.ts +++ b/src/app/shared/testing/search-service.stub.ts @@ -1,10 +1,10 @@ +import { ViewMode } from '@core/shared/view-mode.model'; import { BehaviorSubject, Observable, of, } from 'rxjs'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { AppliedFilter } from '../search/models/applied-filter.model'; import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model'; import { SearchFilterConfig } from '../search/models/search-filter-config.model'; diff --git a/src/app/shared/testing/special-group.mock.ts b/src/app/shared/testing/special-group.mock.ts index 6d5f123ffe2..654f768d8df 100644 --- a/src/app/shared/testing/special-group.mock.ts +++ b/src/app/shared/testing/special-group.mock.ts @@ -1,12 +1,12 @@ -import { Observable } from 'rxjs'; - import { buildPaginatedList, PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Group } from '../../core/eperson/models/group.model'; -import { PageInfo } from '../../core/shared/page-info.model'; +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Group } from '@core/eperson/models/group.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { Observable } from 'rxjs'; + import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$, diff --git a/src/app/shared/testing/submission-json-patch-operations-service.stub.ts b/src/app/shared/testing/submission-json-patch-operations-service.stub.ts index 593cf921553..eb846d74e29 100644 --- a/src/app/shared/testing/submission-json-patch-operations-service.stub.ts +++ b/src/app/shared/testing/submission-json-patch-operations-service.stub.ts @@ -1,4 +1,4 @@ -import { SubmissionPatchRequest } from '../../core/data/request.models'; +import { SubmissionPatchRequest } from '@core/data/request.models'; export class SubmissionJsonPatchOperationsServiceStub { protected linkPath = 'workspaceitems'; diff --git a/src/app/shared/testing/submission-rest-service.stub.ts b/src/app/shared/testing/submission-rest-service.stub.ts index 9942d2c4fac..00009edea20 100644 --- a/src/app/shared/testing/submission-rest-service.stub.ts +++ b/src/app/shared/testing/submission-rest-service.stub.ts @@ -1,10 +1,9 @@ +import { CoreState } from '@core/core-state.model'; +import { RequestService } from '@core/data/request.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { Store } from '@ngrx/store'; import { of } from 'rxjs'; -import { CoreState } from '../../core/core-state.model'; -import { RequestService } from '../../core/data/request.service'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; - export class SubmissionRestServiceStub { protected linkPath = 'workspaceitems'; protected requestService: RequestService; diff --git a/src/app/shared/testing/subscriptions-data.mock.ts b/src/app/shared/testing/subscriptions-data.mock.ts index 771f1e38fb8..0442dee051a 100644 --- a/src/app/shared/testing/subscriptions-data.mock.ts +++ b/src/app/shared/testing/subscriptions-data.mock.ts @@ -1,6 +1,7 @@ -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { Item } from '../../core/shared/item.model'; -import { ITEM_TYPE } from '../../core/shared/item-relationships/item-type.resource-type'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Item } from '@core/shared/item.model'; +import { ITEM_TYPE } from '@core/shared/item-relationships/item-type.resource-type'; + import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; export const mockSubscriptionEperson = Object.assign(new EPerson(), { diff --git a/src/app/shared/testing/supervision-order.mock.ts b/src/app/shared/testing/supervision-order.mock.ts index bc98de0dfb8..9a9c7034e63 100644 --- a/src/app/shared/testing/supervision-order.mock.ts +++ b/src/app/shared/testing/supervision-order.mock.ts @@ -1,7 +1,8 @@ -import { buildPaginatedList } from '../../core/data/paginated-list.model'; -import { Item } from '../../core/shared/item.model'; -import { PageInfo } from '../../core/shared/page-info.model'; -import { SupervisionOrder } from '../../core/supervision-order/models/supervision-order.model'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { Item } from '@core/shared/item.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SupervisionOrder } from '@core/supervision-order/models/supervision-order.model'; + import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$, diff --git a/src/app/shared/testing/test-data-service.mock.ts b/src/app/shared/testing/test-data-service.mock.ts index b5529f4a070..de53e6ab18b 100644 --- a/src/app/shared/testing/test-data-service.mock.ts +++ b/src/app/shared/testing/test-data-service.mock.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; import { Operation } from 'fast-json-patch'; import { Observable, of, } from 'rxjs'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { Item } from '../../core/shared/item.model'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { FollowLinkConfig } from '../utils/follow-link-config.model'; diff --git a/src/app/shared/testing/utils.test.ts b/src/app/shared/testing/utils.test.ts index 134b2bc05d8..c109e2ca6b6 100644 --- a/src/app/shared/testing/utils.test.ts +++ b/src/app/shared/testing/utils.test.ts @@ -4,20 +4,19 @@ import { MetadataOverride, TestBed, } from '@angular/core/testing'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RequestEntry } from '@core/data/request-entry.model'; +import { RequestEntryState } from '@core/data/request-entry-state.model'; +import { PageInfo } from '@core/shared/page-info.model'; +import { UnCacheableObject } from '@core/shared/uncacheable-object.model'; import { Observable, of, } from 'rxjs'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RequestEntry } from '../../core/data/request-entry.model'; -import { RequestEntryState } from '../../core/data/request-entry-state.model'; -import { PageInfo } from '../../core/shared/page-info.model'; -import { UnCacheableObject } from '../../core/shared/uncacheable-object.model'; - /** * Returns true if a Native Element has a specified css class. * diff --git a/src/app/shared/testing/vocabulary-service.stub.ts b/src/app/shared/testing/vocabulary-service.stub.ts index d81a14a9630..0f96620740d 100644 --- a/src/app/shared/testing/vocabulary-service.stub.ts +++ b/src/app/shared/testing/vocabulary-service.stub.ts @@ -1,17 +1,17 @@ +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { PageInfo } from '@core/shared/page-info.model'; +import { Vocabulary } from '@core/submission/vocabularies/models/vocabulary.model'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; import { Observable, of, } from 'rxjs'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { PageInfo } from '../../core/shared/page-info.model'; -import { Vocabulary } from '../../core/submission/vocabularies/models/vocabulary.model'; -import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; export class VocabularyServiceStub { diff --git a/src/app/shared/testing/workflow-action-data-service.stub.ts b/src/app/shared/testing/workflow-action-data-service.stub.ts index 9cd61d7955a..9bdcf3b045b 100644 --- a/src/app/shared/testing/workflow-action-data-service.stub.ts +++ b/src/app/shared/testing/workflow-action-data-service.stub.ts @@ -1,12 +1,12 @@ +import { FindListOptions } from '@core/data/find-list-options.model'; +import { RemoteData } from '@core/data/remote-data'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; import { EMPTY, Observable, } from 'rxjs'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { WorkflowItem } from '../../core/submission/models/workflowitem.model'; -import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; import { FollowLinkConfig } from '../utils/follow-link-config.model'; import { IdentifiableDataServiceStub } from './identifiable-data-service.stub'; diff --git a/src/app/shared/testing/workflow-item-data-service.stub.ts b/src/app/shared/testing/workflow-item-data-service.stub.ts index 3b5ce938f85..dcd43532791 100644 --- a/src/app/shared/testing/workflow-item-data-service.stub.ts +++ b/src/app/shared/testing/workflow-item-data-service.stub.ts @@ -1,4 +1,5 @@ -import { WorkflowItem } from '../../core/submission/models/workflowitem.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; + import { IdentifiableDataServiceStub } from './identifiable-data-service.stub'; /** diff --git a/src/app/shared/theme-support/theme.model.ts b/src/app/shared/theme-support/theme.model.ts index 4ff81b96b0c..9fd0f8ac00c 100644 --- a/src/app/shared/theme-support/theme.model.ts +++ b/src/app/shared/theme-support/theme.model.ts @@ -1,5 +1,7 @@ /* eslint-disable max-classes-per-file */ import { Injector } from '@angular/core'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { HandleObject } from '@core/shared/handle-object.model'; import { combineLatest, Observable, @@ -18,8 +20,6 @@ import { UUIDThemeConfig, } from '../../../config/theme.config'; import { getDSORoute } from '../../app-routing-paths'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { HandleObject } from '../../core/shared/handle-object.model'; import { hasNoValue, hasValue, diff --git a/src/app/shared/theme-support/theme.service.spec.ts b/src/app/shared/theme-support/theme.service.spec.ts index 1bf761c7f99..8066f8172e1 100644 --- a/src/app/shared/theme-support/theme.service.spec.ts +++ b/src/app/shared/theme-support/theme.service.spec.ts @@ -7,22 +7,22 @@ import { ActivatedRouteSnapshot, Router, } from '@angular/router'; +import { LinkService } from '@core/cache/builders/link.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { COLLECTION } from '@core/shared/collection.resource-type'; +import { Community } from '@core/shared/community.model'; +import { COMMUNITY } from '@core/shared/community.resource-type'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; import { provideMockActions } from '@ngrx/effects/testing'; import { ROUTER_NAVIGATED } from '@ngrx/router-store'; import { provideMockStore } from '@ngrx/store/testing'; import { hot } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { LinkService } from '../../core/cache/builders/link.service'; -import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { Collection } from '../../core/shared/collection.model'; -import { COLLECTION } from '../../core/shared/collection.resource-type'; -import { Community } from '../../core/shared/community.model'; -import { COMMUNITY } from '../../core/shared/community.resource-type'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { Item } from '../../core/shared/item.model'; -import { ITEM } from '../../core/shared/item.resource-type'; import { RouterMock } from '../mocks/router.mock'; import { NoOpAction } from '../ngrx/no-op.action'; import { diff --git a/src/app/shared/theme-support/theme.service.ts b/src/app/shared/theme-support/theme.service.ts index 197312777c1..d7d4b536e6c 100644 --- a/src/app/shared/theme-support/theme.service.ts +++ b/src/app/shared/theme-support/theme.service.ts @@ -9,6 +9,16 @@ import { ResolveEnd, Router, } from '@angular/router'; +import { LinkService } from '@core/cache/builders/link.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { distinctNext } from '@core/shared/distinct-next'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { createFeatureSelector, createSelector, @@ -39,16 +49,6 @@ import { ThemeConfig, } from '../../../config/theme.config'; import { environment } from '../../../environments/environment'; -import { LinkService } from '../../core/cache/builders/link.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { distinctNext } from '../../core/shared/distinct-next'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../core/shared/operators'; import { hasNoValue, hasValue, diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts index 92383473486..06966da99b1 100644 --- a/src/app/shared/theme-support/themed.component.ts +++ b/src/app/shared/theme-support/themed.component.ts @@ -11,6 +11,7 @@ import { ViewChild, ViewContainerRef, } from '@angular/core'; +import { GenericConstructor } from '@core/shared/generic-constructor'; import { BehaviorSubject, combineLatest, @@ -26,7 +27,6 @@ import { tap, } from 'rxjs/operators'; -import { GenericConstructor } from '../../core/shared/generic-constructor'; import { hasNoValue, hasValue, diff --git a/src/app/shared/trackable/abstract-trackable.component.spec.ts b/src/app/shared/trackable/abstract-trackable.component.spec.ts index 2b295b8e9cf..769e06bbb99 100644 --- a/src/app/shared/trackable/abstract-trackable.component.spec.ts +++ b/src/app/shared/trackable/abstract-trackable.component.spec.ts @@ -5,12 +5,12 @@ import { waitForAsync, } from '@angular/core/testing'; import { Router } from '@angular/router'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; import { TranslateModule } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service'; import { INotification, Notification, diff --git a/src/app/shared/trackable/abstract-trackable.component.ts b/src/app/shared/trackable/abstract-trackable.component.ts index ec886ccd47c..9bb9761bfe6 100644 --- a/src/app/shared/trackable/abstract-trackable.component.ts +++ b/src/app/shared/trackable/abstract-trackable.component.ts @@ -3,10 +3,10 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; +import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service'; import { NotificationsService } from '../notifications/notifications.service'; /** diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts index 196c93d74d0..c9284cdf286 100644 --- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts +++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts @@ -9,6 +9,10 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; import { TranslateLoader, TranslateModule, @@ -16,10 +20,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { - NativeWindowRef, - NativeWindowService, -} from '../../../core/services/window.service'; import { mockTruncatableService } from '../../mocks/mock-trucatable.service'; import { getMockTranslateService } from '../../mocks/translate.service.mock'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; diff --git a/src/app/shared/upload/uploader/uploader-options.model.ts b/src/app/shared/upload/uploader/uploader-options.model.ts index e21628d06e0..6952406dc32 100644 --- a/src/app/shared/upload/uploader/uploader-options.model.ts +++ b/src/app/shared/upload/uploader/uploader-options.model.ts @@ -1,4 +1,4 @@ -import { RestRequestMethod } from '../../../core/data/rest-request-method'; +import { RestRequestMethod } from '@core/data/rest-request-method'; export class UploaderOptions { /** diff --git a/src/app/shared/upload/uploader/uploader-properties.model.ts b/src/app/shared/upload/uploader/uploader-properties.model.ts index b84ae30bf84..3fd81dd7c24 100644 --- a/src/app/shared/upload/uploader/uploader-properties.model.ts +++ b/src/app/shared/upload/uploader/uploader-properties.model.ts @@ -1,4 +1,4 @@ -import { MetadataMap } from '../../../core/shared/metadata.models'; +import { MetadataMap } from '@core/shared/metadata.models'; /** * Properties to send to the REST API for uploading a bitstream diff --git a/src/app/shared/upload/uploader/uploader.component.spec.ts b/src/app/shared/upload/uploader/uploader.component.spec.ts index 5b8bf98829d..6db69b93b0b 100644 --- a/src/app/shared/upload/uploader/uploader.component.spec.ts +++ b/src/app/shared/upload/uploader/uploader.component.spec.ts @@ -11,11 +11,11 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { DragService } from '@core/drag.service'; +import { CookieService } from '@core/services/cookie.service'; import { TranslateModule } from '@ngx-translate/core'; import { FileUploadModule } from 'ng2-file-upload'; -import { DragService } from '../../../core/drag.service'; -import { CookieService } from '../../../core/services/cookie.service'; import { CookieServiceMock } from '../../mocks/cookie.service.mock'; import { HttpXsrfTokenExtractorMock } from '../../mocks/http-xsrf-token-extractor.mock'; import { createTestComponent } from '../../testing/utils.test'; diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts index 6a80230e8a2..667f9dedbac 100644 --- a/src/app/shared/upload/uploader/uploader.component.ts +++ b/src/app/shared/upload/uploader/uploader.component.ts @@ -12,6 +12,13 @@ import { Output, ViewEncapsulation, } from '@angular/core'; +import { DragService } from '@core/drag.service'; +import { CookieService } from '@core/services/cookie.service'; +import { + XSRF_COOKIE, + XSRF_REQUEST_HEADER, + XSRF_RESPONSE_HEADER, +} from '@core/xsrf/xsrf.constants'; import { TranslateModule } from '@ngx-translate/core'; import uniqueId from 'lodash/uniqueId'; import { @@ -20,13 +27,6 @@ import { } from 'ng2-file-upload'; import { of } from 'rxjs'; -import { DragService } from '../../../core/drag.service'; -import { CookieService } from '../../../core/services/cookie.service'; -import { - XSRF_COOKIE, - XSRF_REQUEST_HEADER, - XSRF_RESPONSE_HEADER, -} from '../../../core/xsrf/xsrf.constants'; import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { hasValue, diff --git a/src/app/shared/utils/follow-link-config.model.ts b/src/app/shared/utils/follow-link-config.model.ts index 0eb1ad0cae3..588b6f9a353 100644 --- a/src/app/shared/utils/follow-link-config.model.ts +++ b/src/app/shared/utils/follow-link-config.model.ts @@ -1,5 +1,6 @@ -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { HALResource } from '../../core/shared/hal-resource.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { HALResource } from '@core/shared/hal-resource.model'; + import { hasValue } from '../empty.util'; /** diff --git a/src/app/shared/utils/markdown.directive.spec.ts b/src/app/shared/utils/markdown.directive.spec.ts index 133a0de91f5..7af29d149d5 100644 --- a/src/app/shared/utils/markdown.directive.spec.ts +++ b/src/app/shared/utils/markdown.directive.spec.ts @@ -7,10 +7,10 @@ import { TestBed, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { MathService } from '@core/shared/math.service'; +import { MockMathService } from '@core/shared/math.service.spec'; import { environment } from '../../../environments/environment.test'; -import { MathService } from '../../core/shared/math.service'; -import { MockMathService } from '../../core/shared/math.service.spec'; import { MarkdownDirective } from './markdown.directive'; @Component({ diff --git a/src/app/shared/utils/markdown.directive.ts b/src/app/shared/utils/markdown.directive.ts index de13acb3036..3b632cf5092 100644 --- a/src/app/shared/utils/markdown.directive.ts +++ b/src/app/shared/utils/markdown.directive.ts @@ -12,6 +12,7 @@ import { DomSanitizer, SafeHtml, } from '@angular/platform-browser'; +import { MathService } from '@core/shared/math.service'; import { Subject } from 'rxjs'; import { filter, @@ -20,7 +21,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; -import { MathService } from '../../core/shared/math.service'; import { isEmpty } from '../empty.util'; const markdownItLoader = async () => (await import('markdown-it')).default; diff --git a/src/app/shared/utils/metadatafield-validator.directive.ts b/src/app/shared/utils/metadatafield-validator.directive.ts index 0d45cd057ee..53bdeaaf9a0 100644 --- a/src/app/shared/utils/metadatafield-validator.directive.ts +++ b/src/app/shared/utils/metadatafield-validator.directive.ts @@ -8,6 +8,11 @@ import { NG_VALIDATORS, ValidationErrors, } from '@angular/forms'; +import { MetadataFieldDataService } from '@core/data/metadata-field-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { Observable, of, @@ -19,12 +24,6 @@ import { take, } from 'rxjs/operators'; -import { MetadataFieldDataService } from '../../core/data/metadata-field-data.service'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { MetadataField } from '../../core/metadata/metadata-field.model'; -import { getFirstSucceededRemoteData } from '../../core/shared/operators'; - /** * Directive for validating if a ngModel value is a valid metadata field */ diff --git a/src/app/shared/utils/relation-query.utils.ts b/src/app/shared/utils/relation-query.utils.ts index 158744e78c3..4ab9bf70f1d 100644 --- a/src/app/shared/utils/relation-query.utils.ts +++ b/src/app/shared/utils/relation-query.utils.ts @@ -1,5 +1,6 @@ -import { Item } from '../../core/shared/item.model'; -import { Relationship } from '../../core/shared/item-relationships/relationship.model'; +import { Item } from '@core/shared/item.model'; +import { Relationship } from '@core/shared/item-relationships/relationship.model'; + import { followLink, FollowLinkConfig, diff --git a/src/app/shared/utils/route.utils.ts b/src/app/shared/utils/route.utils.ts index 9f45b7ec239..fc5f05afd40 100644 --- a/src/app/shared/utils/route.utils.ts +++ b/src/app/shared/utils/route.utils.ts @@ -2,8 +2,8 @@ import { ActivatedRouteSnapshot, Router, } from '@angular/router'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; -import { URLCombiner } from '../../core/url-combiner/url-combiner'; import { hasValue } from '../empty.util'; /** diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts index e4d92bece46..e3a020d4dfb 100644 --- a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts +++ b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts @@ -11,13 +11,13 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { SearchService } from '@core/shared/search/search.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; -import { SearchService } from '../../core/shared/search/search.service'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { TranslateLoaderMock } from '../mocks/translate-loader.mock'; import { SearchServiceStub } from '../testing/search-service.stub'; import { ViewModeSwitchComponent } from './view-mode-switch.component'; diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.ts index c47f55a2671..b26857a1106 100644 --- a/src/app/shared/view-mode-switch/view-mode-switch.component.ts +++ b/src/app/shared/view-mode-switch/view-mode-switch.component.ts @@ -12,13 +12,13 @@ import { RouterLink, RouterLinkActive, } from '@angular/router'; +import { SearchService } from '@core/shared/search/search.service'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; import { filter } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; -import { SearchService } from '../../core/shared/search/search.service'; -import { ViewMode } from '../../core/shared/view-mode.model'; import { isEmpty, isNotEmpty, diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts index 3c481d40bd3..19f77c51c34 100644 --- a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts +++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts @@ -10,15 +10,15 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { UsageReport } from '@core/statistics/models/usage-report.model'; +import { UsageReportDataService } from '@core/statistics/usage-report-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { Collection } from '../../core/shared/collection.model'; -import { UsageReport } from '../../core/statistics/models/usage-report.model'; -import { UsageReportDataService } from '../../core/statistics/usage-report-data.service'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { StatisticsTableComponent } from '../statistics-table/statistics-table.component'; import { CollectionStatisticsPageComponent } from './collection-statistics-page.component'; diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts index c8ab4173976..cd7eb71ba9d 100644 --- a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts +++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { Collection } from '@core/shared/collection.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Collection } from '../../core/shared/collection.model'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { VarDirective } from '../../shared/utils/var.directive'; import { StatisticsPageDirective } from '../statistics-page/statistics-page.directive'; diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts index 6cd69c7da71..d24ab805f7d 100644 --- a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts +++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts @@ -10,15 +10,15 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { Community } from '@core/shared/community.model'; +import { UsageReport } from '@core/statistics/models/usage-report.model'; +import { UsageReportDataService } from '@core/statistics/usage-report-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { Community } from '../../core/shared/community.model'; -import { UsageReport } from '../../core/statistics/models/usage-report.model'; -import { UsageReportDataService } from '../../core/statistics/usage-report-data.service'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { StatisticsTableComponent } from '../statistics-table/statistics-table.component'; import { CommunityStatisticsPageComponent } from './community-statistics-page.component'; diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts index 7ae4d3baefc..8f2db2769b9 100644 --- a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts +++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { Community } from '@core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Community } from '../../core/shared/community.model'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { VarDirective } from '../../shared/utils/var.directive'; import { StatisticsPageDirective } from '../statistics-page/statistics-page.directive'; diff --git a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts index 422c9e3bfe5..aebe4469308 100644 --- a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts +++ b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts @@ -10,15 +10,15 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { Item } from '@core/shared/item.model'; +import { UsageReport } from '@core/statistics/models/usage-report.model'; +import { UsageReportDataService } from '@core/statistics/usage-report-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { Item } from '../../core/shared/item.model'; -import { UsageReport } from '../../core/statistics/models/usage-report.model'; -import { UsageReportDataService } from '../../core/statistics/usage-report-data.service'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { StatisticsTableComponent } from '../statistics-table/statistics-table.component'; import { ItemStatisticsPageComponent } from './item-statistics-page.component'; diff --git a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts index 4d4c7b7d384..ae66d4eb795 100644 --- a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts +++ b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Item } from '../../core/shared/item.model'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { VarDirective } from '../../shared/utils/var.directive'; import { StatisticsPageDirective } from '../statistics-page/statistics-page.directive'; diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts index b7996bfadcd..2a53f03998d 100644 --- a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts +++ b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts @@ -10,16 +10,16 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { SiteDataService } from '@core/data/site-data.service'; +import { Site } from '@core/shared/site.model'; +import { UsageReport } from '@core/statistics/models/usage-report.model'; +import { UsageReportDataService } from '@core/statistics/usage-report-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { SiteDataService } from '../../core/data/site-data.service'; -import { Site } from '../../core/shared/site.model'; -import { UsageReport } from '../../core/statistics/models/usage-report.model'; -import { UsageReportDataService } from '../../core/statistics/usage-report-data.service'; import { StatisticsTableComponent } from '../statistics-table/statistics-table.component'; import { SiteStatisticsPageComponent } from './site-statistics-page.component'; diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts index 7c188cd6f87..65680fd0d49 100644 --- a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts +++ b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { SiteDataService } from '@core/data/site-data.service'; +import { Site } from '@core/shared/site.model'; import { TranslateModule } from '@ngx-translate/core'; import { switchMap } from 'rxjs/operators'; -import { SiteDataService } from '../../core/data/site-data.service'; -import { Site } from '../../core/shared/site.model'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { VarDirective } from '../../shared/utils/var.directive'; import { StatisticsPageDirective } from '../statistics-page/statistics-page.directive'; diff --git a/src/app/statistics-page/statistics-page-routes.ts b/src/app/statistics-page/statistics-page-routes.ts index 96de7b82734..4908a2c200e 100644 --- a/src/app/statistics-page/statistics-page-routes.ts +++ b/src/app/statistics-page/statistics-page-routes.ts @@ -1,9 +1,9 @@ import { Route } from '@angular/router'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; +import { statisticsAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard'; import { collectionPageResolver } from '../collection-page/collection-page.resolver'; import { communityPageResolver } from '../community-page/community-page.resolver'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { statisticsAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard'; import { itemResolver } from '../item-page/item.resolver'; import { ThemedCollectionStatisticsPageComponent } from './collection-statistics-page/themed-collection-statistics-page.component'; import { ThemedCommunityStatisticsPageComponent } from './community-statistics-page/themed-community-statistics-page.component'; diff --git a/src/app/statistics-page/statistics-page/statistics-page.directive.ts b/src/app/statistics-page/statistics-page/statistics-page.directive.ts index e781b89487e..f9f4c297887 100644 --- a/src/app/statistics-page/statistics-page/statistics-page.directive.ts +++ b/src/app/statistics-page/statistics-page/statistics-page.directive.ts @@ -7,6 +7,17 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { UsageReport } from '@core/statistics/models/usage-report.model'; +import { UsageReportDataService } from '@core/statistics/usage-report-data.service'; import { combineLatest, Observable, @@ -16,18 +27,6 @@ import { switchMap, } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { redirectOn4xx } from '../../core/shared/authorized.operators'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../core/shared/operators'; -import { UsageReport } from '../../core/statistics/models/usage-report.model'; -import { UsageReportDataService } from '../../core/statistics/usage-report-data.service'; - @Directive() /** * Class representing an abstract statistics page component. diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts b/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts index d50b03aed0c..7b31330653d 100644 --- a/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts +++ b/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts @@ -5,11 +5,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { UsageReport } from '@core/statistics/models/usage-report.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { UsageReport } from '../../core/statistics/models/usage-report.model'; import { StatisticsTableComponent } from './statistics-table.component'; describe('StatisticsTableComponent', () => { diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.ts b/src/app/statistics-page/statistics-table/statistics-table.component.ts index b60a2cb3178..14e132f052a 100644 --- a/src/app/statistics-page/statistics-table/statistics-table.component.ts +++ b/src/app/statistics-page/statistics-table/statistics-table.component.ts @@ -4,12 +4,11 @@ import { Input, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { DSpaceObjectDataService } from '@core/data/dspace-object-data.service'; +import { UsageReport } from '@core/statistics/models/usage-report.model'; import { TranslateModule } from '@ngx-translate/core'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { UsageReport } from '../../core/statistics/models/usage-report.model'; - /** * Component representing a statistics table for a given usage report. */ diff --git a/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts b/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts index 004864cc68d..88ec119c551 100644 --- a/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts +++ b/src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts @@ -5,6 +5,7 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { ReferrerService } from '@core/services/referrer.service'; import { Angulartics2 } from 'angulartics2'; import { switchMap } from 'rxjs'; import { @@ -12,8 +13,6 @@ import { take, } from 'rxjs/operators'; -import { ReferrerService } from '../../../core/services/referrer.service'; - /** * This component triggers a page view statistic */ diff --git a/src/app/statistics/google-analytics.service.spec.ts b/src/app/statistics/google-analytics.service.spec.ts index 1b8783f3bf7..43bfacfeb59 100644 --- a/src/app/statistics/google-analytics.service.spec.ts +++ b/src/app/statistics/google-analytics.service.spec.ts @@ -1,11 +1,11 @@ +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; import { Angulartics2GoogleAnalytics, Angulartics2GoogleGlobalSiteTag, } from 'angulartics2'; import { of } from 'rxjs'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { ConfigurationProperty } from '../core/shared/configuration-property.model'; import { OrejimeService } from '../shared/cookies/orejime.service'; import { GOOGLE_ANALYTICS_OREJIME_KEY } from '../shared/cookies/orejime-configuration'; import { diff --git a/src/app/statistics/google-analytics.service.ts b/src/app/statistics/google-analytics.service.ts index d638b0ce391..ba2dae41c3b 100644 --- a/src/app/statistics/google-analytics.service.ts +++ b/src/app/statistics/google-analytics.service.ts @@ -3,14 +3,14 @@ import { Inject, Injectable, } from '@angular/core'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Angulartics2GoogleAnalytics, Angulartics2GoogleGlobalSiteTag, } from 'angulartics2'; import { combineLatest } from 'rxjs'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { OrejimeService } from '../shared/cookies/orejime.service'; import { GOOGLE_ANALYTICS_OREJIME_KEY } from '../shared/cookies/orejime-configuration'; import { isEmpty } from '../shared/empty.util'; diff --git a/src/app/statistics/matomo.service.spec.ts b/src/app/statistics/matomo.service.spec.ts index 7e7a9cd8473..70b3667d832 100644 --- a/src/app/statistics/matomo.service.spec.ts +++ b/src/app/statistics/matomo.service.spec.ts @@ -7,6 +7,12 @@ import { TestBed, tick, } from '@angular/core/testing'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { + NativeWindowRef, + NativeWindowService, +} from '@core/services/window.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; import { MatomoInitializerService, MatomoTracker, @@ -15,12 +21,6 @@ import { MatomoTestingModule } from 'ngx-matomo-client/testing'; import { of } from 'rxjs'; import { environment } from '../../environments/environment'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { - NativeWindowRef, - NativeWindowService, -} from '../core/services/window.service'; -import { ConfigurationProperty } from '../core/shared/configuration-property.model'; import { OrejimeService } from '../shared/cookies/orejime.service'; import { createFailedRemoteDataObject$, diff --git a/src/app/statistics/matomo.service.ts b/src/app/statistics/matomo.service.ts index e1c47589758..288c8030474 100644 --- a/src/app/statistics/matomo.service.ts +++ b/src/app/statistics/matomo.service.ts @@ -4,6 +4,11 @@ import { Injectable, runInInjectionContext, } from '@angular/core'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { NativeWindowService } from '@core/services/window.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { MatomoInitializerService, MatomoTracker, @@ -20,11 +25,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../environments/environment'; -import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { NativeWindowService } from '../core/services/window.service'; -import { ConfigurationProperty } from '../core/shared/configuration-property.model'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { OrejimeService } from '../shared/cookies/orejime.service'; import { isNotEmpty } from '../shared/empty.util'; diff --git a/src/app/statistics/statistics-endpoint.model.ts b/src/app/statistics/statistics-endpoint.model.ts index 8bee88c7dab..9941d096683 100644 --- a/src/app/statistics/statistics-endpoint.model.ts +++ b/src/app/statistics/statistics-endpoint.model.ts @@ -1,13 +1,13 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, } from 'cerialize'; -import { typedObject } from '../core/cache/builders/build-decorators'; -import { CacheableObject } from '../core/cache/cacheable-object.model'; -import { HALLink } from '../core/shared/hal-link.model'; -import { ResourceType } from '../core/shared/resource-type'; -import { excludeFromEquals } from '../core/utilities/equals.decorators'; import { STATISTICS_ENDPOINT } from './statistics-endpoint.resource-type'; /** diff --git a/src/app/statistics/statistics-endpoint.resource-type.ts b/src/app/statistics/statistics-endpoint.resource-type.ts index 9ebca600f49..23de7f31e23 100644 --- a/src/app/statistics/statistics-endpoint.resource-type.ts +++ b/src/app/statistics/statistics-endpoint.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from '../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for the statistics endpoint diff --git a/src/app/statistics/statistics.service.spec.ts b/src/app/statistics/statistics.service.spec.ts index ff57e319703..1368a166d08 100644 --- a/src/app/statistics/statistics.service.spec.ts +++ b/src/app/statistics/statistics.service.spec.ts @@ -1,8 +1,8 @@ +import { RequestService } from '@core/data/request.service'; +import { RestRequest } from '@core/data/rest-request.model'; +import { DSpaceObjectType } from '@core/shared/dspace-object-type.model'; import isEqual from 'lodash/isEqual'; -import { RequestService } from '../core/data/request.service'; -import { RestRequest } from '../core/data/rest-request.model'; -import { DSpaceObjectType } from '../core/shared/dspace-object-type.model'; import { getMockRequestService } from '../shared/mocks/request.service.mock'; import { SearchOptions } from '../shared/search/models/search-options.model'; import { HALEndpointServiceStub } from '../shared/testing/hal-endpoint-service.stub'; diff --git a/src/app/statistics/statistics.service.ts b/src/app/statistics/statistics.service.ts index 9c63b67be73..d21de470d72 100644 --- a/src/app/statistics/statistics.service.ts +++ b/src/app/statistics/statistics.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; +import { RequestService } from '@core/data/request.service'; +import { RestRequest } from '@core/data/rest-request.model'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { map, take, } from 'rxjs/operators'; -import { RequestService } from '../core/data/request.service'; -import { RestRequest } from '../core/data/rest-request.model'; -import { DSpaceObject } from '../core/shared/dspace-object.model'; -import { HALEndpointService } from '../core/shared/hal-endpoint.service'; import { hasValue, isNotEmpty, diff --git a/src/app/statistics/track-request.model.ts b/src/app/statistics/track-request.model.ts index 770d3146c6a..ee947c9fc68 100644 --- a/src/app/statistics/track-request.model.ts +++ b/src/app/statistics/track-request.model.ts @@ -1,7 +1,7 @@ -import { ResponseParsingService } from '../core/data/parsing.service'; -import { PostRequest } from '../core/data/request.models'; -import { StatusCodeOnlyResponseParsingService } from '../core/data/status-code-only-response-parsing.service'; -import { GenericConstructor } from '../core/shared/generic-constructor'; +import { ResponseParsingService } from '@core/data/parsing.service'; +import { PostRequest } from '@core/data/request.models'; +import { StatusCodeOnlyResponseParsingService } from '@core/data/status-code-only-response-parsing.service'; +import { GenericConstructor } from '@core/shared/generic-constructor'; export class TrackRequest extends PostRequest { diff --git a/src/app/submission/edit/submission-edit.component.spec.ts b/src/app/submission/edit/submission-edit.component.spec.ts index 156bc200ace..f4df42deefe 100644 --- a/src/app/submission/edit/submission-edit.component.spec.ts +++ b/src/app/submission/edit/submission-edit.component.spec.ts @@ -10,16 +10,16 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { ItemDataService } from '@core/data/item-data.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; -import { AuthService } from '../../core/auth/auth.service'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; -import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service'; -import { XSRFService } from '../../core/xsrf/xsrf.service'; import { mockSubmissionObject } from '../../shared/mocks/submission.mock'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/submission/edit/submission-edit.component.ts b/src/app/submission/edit/submission-edit.component.ts index c2a914c85da..c7d5acd8c2f 100644 --- a/src/app/submission/edit/submission-edit.component.ts +++ b/src/app/submission/edit/submission-edit.component.ts @@ -9,6 +9,15 @@ import { ParamMap, Router, } from '@angular/router'; +import { SubmissionDefinitionsModel } from '@core/config/models/config-submission-definitions.model'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Collection } from '@core/shared/collection.model'; +import { Item } from '@core/shared/item.model'; +import { getAllSucceededRemoteData } from '@core/shared/operators'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { WorkspaceitemSectionsObject } from '@core/submission/models/workspaceitem-sections.model'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, @@ -20,15 +29,6 @@ import { switchMap, } from 'rxjs/operators'; -import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { Collection } from '../../core/shared/collection.model'; -import { Item } from '../../core/shared/item.model'; -import { getAllSucceededRemoteData } from '../../core/shared/operators'; -import { SubmissionObject } from '../../core/submission/models/submission-object.model'; -import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model'; -import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service'; import { hasValue, isEmpty, diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts index 0d247ac2cfe..2a12b762b3f 100644 --- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts +++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts @@ -17,19 +17,19 @@ import { ReactiveFormsModule, } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { Collection } from '@core/shared/collection.model'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { CommunityDataService } from '../../../core/data/community-data.service'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { Collection } from '../../../core/shared/collection.model'; -import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component'; import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock'; diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts index c9759d81608..a32a95a380a 100644 --- a/src/app/submission/form/collection/submission-form-collection.component.ts +++ b/src/app/submission/form/collection/submission-form-collection.component.ts @@ -11,6 +11,15 @@ import { SimpleChanges, ViewChild, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { Collection } from '@core/shared/collection.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -25,15 +34,6 @@ import { mergeMap, } from 'rxjs/operators'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { Collection } from '../../../core/shared/collection.model'; -import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; -import { SubmissionObject } from '../../../core/submission/models/submission-object.model'; -import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component'; import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component'; diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts index d21982f3254..e746d349c91 100644 --- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts +++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts @@ -11,6 +11,7 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { SubmissionRestService } from '@core/submission/submission-rest.service'; import { NgbModal, NgbModule, @@ -24,7 +25,6 @@ import { import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { SubmissionRestService } from '../../../core/submission/submission-rest.service'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { mockSubmissionId } from '../../../shared/mocks/submission.mock'; import { SubmissionRestServiceStub } from '../../../shared/testing/submission-rest-service.stub'; diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts index 5b92b7087f0..4a98519abf6 100644 --- a/src/app/submission/form/footer/submission-form-footer.component.ts +++ b/src/app/submission/form/footer/submission-form-footer.component.ts @@ -5,6 +5,8 @@ import { OnChanges, SimpleChanges, } from '@angular/core'; +import { SubmissionRestService } from '@core/submission/submission-rest.service'; +import { SubmissionScopeType } from '@core/submission/submission-scope-type'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslatePipe } from '@ngx-translate/core'; import { @@ -13,8 +15,6 @@ import { } from 'rxjs'; import { map } from 'rxjs/operators'; -import { SubmissionRestService } from '../../../core/submission/submission-rest.service'; -import { SubmissionScopeType } from '../../../core/submission/submission-scope-type'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { isNotEmpty } from '../../../shared/empty.util'; import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe'; diff --git a/src/app/submission/form/submission-form.component.spec.ts b/src/app/submission/form/submission-form.component.spec.ts index 86058bfada7..dd1cde07ded 100644 --- a/src/app/submission/form/submission-form.component.spec.ts +++ b/src/app/submission/form/submission-form.component.spec.ts @@ -9,6 +9,9 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { cold, @@ -17,9 +20,6 @@ import { import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { AuthService } from '../../core/auth/auth.service'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; -import { Item } from '../../core/shared/item.model'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { mockSectionsData, diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts index 348c1770e49..53b291ccfbe 100644 --- a/src/app/submission/form/submission-form.component.ts +++ b/src/app/submission/form/submission-form.component.ts @@ -7,6 +7,14 @@ import { OnDestroy, SimpleChanges, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { SubmissionDefinitionsModel } from '@core/config/models/config-submission-definitions.model'; +import { SubmissionSectionModel } from '@core/config/models/config-submission-section.model'; +import { Collection } from '@core/shared/collection.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { WorkspaceitemSectionsObject } from '@core/submission/models/workspaceitem-sections.model'; import { TranslatePipe } from '@ngx-translate/core'; import isEqual from 'lodash/isEqual'; import { @@ -21,14 +29,6 @@ import { switchMap, } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; -import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model'; -import { SubmissionSectionModel } from '../../core/config/models/config-submission-section.model'; -import { Collection } from '../../core/shared/collection.model'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; -import { Item } from '../../core/shared/item.model'; -import { SubmissionObject } from '../../core/submission/models/submission-object.model'; -import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model'; import { hasValue, isNotEmpty, diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts index 75bdb4e109c..f969863ed22 100644 --- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts +++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts @@ -9,6 +9,7 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; import { Store } from '@ngrx/store'; import { TranslateModule, @@ -20,7 +21,6 @@ import { } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service'; import { mockSectionsData, mockSubmissionCollectionId, diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts index 44562b29c25..5db8e9bdac8 100644 --- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts +++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts @@ -5,6 +5,9 @@ import { OnChanges, OnDestroy, } from '@angular/core'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; +import { normalizeSectionData } from '@core/submission/submission-response-parsing.service'; import { TranslateService } from '@ngx-translate/core'; import { Observable, @@ -16,9 +19,6 @@ import { take, } from 'rxjs/operators'; -import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; -import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service'; -import { normalizeSectionData } from '../../../core/submission/submission-response-parsing.service'; import { hasValue, isEmpty, diff --git a/src/app/submission/form/themed-submission-form.component.ts b/src/app/submission/form/themed-submission-form.component.ts index 514ab9c317c..ab767aa2146 100644 --- a/src/app/submission/form/themed-submission-form.component.ts +++ b/src/app/submission/form/themed-submission-form.component.ts @@ -2,10 +2,10 @@ import { Component, Input, } from '@angular/core'; +import { SubmissionDefinitionsModel } from '@core/config/models/config-submission-definitions.model'; +import { Item } from '@core/shared/item.model'; +import { WorkspaceitemSectionsObject } from '@core/submission/models/workspaceitem-sections.model'; -import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model'; -import { Item } from '../../core/shared/item.model'; -import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model'; import { ThemedComponent } from '../../shared/theme-support/themed.component'; import { SubmissionError } from '../objects/submission-error.model'; import { SubmissionFormComponent } from './submission-form.component'; diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts index 44a822d3ea2..a1c909c4532 100644 --- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts +++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts @@ -9,6 +9,8 @@ import { waitForAsync, } from '@angular/core/testing'; import { Router } from '@angular/router'; +import { ExternalSourceEntry } from '@core/shared/external-source-entry.model'; +import { Metadata } from '@core/shared/metadata.utils'; import { NgbActiveModal, NgbModal, @@ -18,8 +20,6 @@ import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { ExternalSourceEntry } from '../../../core/shared/external-source-entry.model'; -import { Metadata } from '../../../core/shared/metadata.utils'; import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts index 7194b59f6a2..1f5906e66c7 100644 --- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts +++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts @@ -5,6 +5,10 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; +import { ExternalSourceEntry } from '@core/shared/external-source-entry.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { Metadata } from '@core/shared/metadata.utils'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; import { NgbActiveModal, NgbModal, @@ -13,10 +17,6 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { mergeMap } from 'rxjs/operators'; -import { ExternalSourceEntry } from '../../../core/shared/external-source-entry.model'; -import { MetadataValue } from '../../../core/shared/metadata.models'; -import { Metadata } from '../../../core/shared/metadata.utils'; -import { SubmissionObject } from '../../../core/submission/models/submission-object.model'; import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { SubmissionService } from '../../submission.service'; diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts index 6a51ba28be6..f9eb2a6a1d1 100644 --- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts +++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts @@ -9,20 +9,20 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { ExternalSourceDataService } from '@core/data/external-source-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { ExternalSource } from '@core/shared/external-source.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateModule } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { RequestParam } from '../../../core/cache/models/request-param.model'; -import { ExternalSourceDataService } from '../../../core/data/external-source-data.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../core/data/paginated-list.model'; -import { ExternalSource } from '../../../core/shared/external-source.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; import { HostWindowService } from '../../../shared/host-window.service'; import { externalSourceCiencia, diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts index 23f0bffaafe..4ccd6d1c02e 100644 --- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts +++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts @@ -9,6 +9,20 @@ import { Output, } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { ExternalSourceDataService } from '@core/data/external-source-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { ExternalSource } from '@core/shared/external-source.model'; +import { + getFirstSucceededRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; @@ -22,20 +36,6 @@ import { tap, } from 'rxjs/operators'; -import { RequestParam } from '../../../core/cache/models/request-param.model'; -import { ExternalSourceDataService } from '../../../core/data/external-source-data.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ExternalSource } from '../../../core/shared/external-source.model'; -import { - getFirstSucceededRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../../../core/shared/operators'; -import { PageInfo } from '../../../core/shared/page-info.model'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { hasValue } from '../../../shared/empty.util'; import { HostWindowService } from '../../../shared/host-window.service'; diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts index dc7e0e290d2..f6f856647f9 100644 --- a/src/app/submission/import-external/submission-import-external.component.spec.ts +++ b/src/app/submission/import-external/submission-import-external.component.spec.ts @@ -14,16 +14,16 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { ExternalSourceDataService } from '@core/data/external-source-data.service'; +import { RouteService } from '@core/services/route.service'; +import { ExternalSourceEntry } from '@core/shared/external-source-entry.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { ExternalSourceDataService } from '../../core/data/external-source-data.service'; -import { RouteService } from '../../core/services/route.service'; -import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { AlertComponent } from '../../shared/alert/alert.component'; import { HostWindowService } from '../../shared/host-window.service'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; diff --git a/src/app/submission/import-external/submission-import-external.component.ts b/src/app/submission/import-external/submission-import-external.component.ts index 8a7c7cdd5f5..2e72d519545 100644 --- a/src/app/submission/import-external/submission-import-external.component.ts +++ b/src/app/submission/import-external/submission-import-external.component.ts @@ -8,6 +8,19 @@ import { Router, RouterLink, } from '@angular/router'; +import { ExternalSourceDataService } from '@core/data/external-source-data.service'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RouteService } from '@core/services/route.service'; +import { Context } from '@core/shared/context.model'; +import { ExternalSourceEntry } from '@core/shared/external-source-entry.model'; +import { NONE_ENTITY_TYPE } from '@core/shared/item-relationships/item-type.resource-type'; +import { getFinishedRemoteData } from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModal, NgbModalRef, @@ -27,19 +40,6 @@ import { } from 'rxjs/operators'; import { AlertType } from 'src/app/shared/alert/alert-type'; -import { ExternalSourceDataService } from '../../core/data/external-source-data.service'; -import { - buildPaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { RouteService } from '../../core/services/route.service'; -import { Context } from '../../core/shared/context.model'; -import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model'; -import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type'; -import { getFinishedRemoteData } from '../../core/shared/operators'; -import { PageInfo } from '../../core/shared/page-info.model'; -import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { AlertComponent } from '../../shared/alert/alert.component'; import { fadeIn } from '../../shared/animations/fade'; import { diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts index 956c8f95336..a7312d8c4c3 100644 --- a/src/app/submission/objects/submission-objects.actions.ts +++ b/src/app/submission/objects/submission-objects.actions.ts @@ -1,14 +1,14 @@ /* eslint-disable max-classes-per-file */ -import { Action } from '@ngrx/store'; - -import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model'; -import { Item } from '../../core/shared/item.model'; -import { SubmissionObject } from '../../core/submission/models/submission-object.model'; -import { WorkspaceitemSectionUploadFileObject } from '../../core/submission/models/workspaceitem-section-upload-file.model'; +import { SubmissionDefinitionsModel } from '@core/config/models/config-submission-definitions.model'; +import { Item } from '@core/shared/item.model'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { WorkspaceitemSectionUploadFileObject } from '@core/submission/models/workspaceitem-section-upload-file.model'; import { WorkspaceitemSectionDataType, WorkspaceitemSectionsObject, -} from '../../core/submission/models/workspaceitem-sections.model'; +} from '@core/submission/models/workspaceitem-sections.model'; +import { Action } from '@ngrx/store'; + import { type } from '../../shared/ngrx/type'; import { SectionsType } from '../sections/sections-type'; import { diff --git a/src/app/submission/objects/submission-objects.effects.spec.ts b/src/app/submission/objects/submission-objects.effects.spec.ts index 4076a92679d..ce99d61f31d 100644 --- a/src/app/submission/objects/submission-objects.effects.spec.ts +++ b/src/app/submission/objects/submission-objects.effects.spec.ts @@ -1,4 +1,11 @@ import { TestBed } from '@angular/core/testing'; +import { SubmissionSectionModel } from '@core/config/models/config-submission-section.model'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Item } from '@core/shared/item.model'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { provideMockActions } from '@ngrx/effects/testing'; import { Store, @@ -23,13 +30,6 @@ import { AppState, storeModuleConfig, } from '../../app.reducer'; -import { SubmissionSectionModel } from '../../core/config/models/config-submission-section.model'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; -import { Item } from '../../core/shared/item.model'; -import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service'; -import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service'; -import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service'; -import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; import { mockSectionsData, mockSectionsDataTwo, diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts index 98e8c4f39f7..4071b7c539b 100644 --- a/src/app/submission/objects/submission-objects.effects.ts +++ b/src/app/submission/objects/submission-objects.effects.ts @@ -1,4 +1,16 @@ import { Injectable } from '@angular/core'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { WorkspaceitemSectionDuplicatesObject } from '@core/submission/models/workspaceitem-section-duplicates.model'; +import { WorkspaceitemSectionUploadObject } from '@core/submission/models/workspaceitem-section-upload.model'; +import { WorkspaceitemSectionsObject } from '@core/submission/models/workspaceitem-sections.model'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { Actions, createEffect, @@ -26,18 +38,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; -import { RemoteData } from '../../core/data/remote-data'; -import { Item } from '../../core/shared/item.model'; -import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; -import { SubmissionObject } from '../../core/submission/models/submission-object.model'; -import { WorkflowItem } from '../../core/submission/models/workflowitem.model'; -import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; -import { WorkspaceitemSectionDuplicatesObject } from '../../core/submission/models/workspaceitem-section-duplicates.model'; -import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model'; -import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model'; -import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service'; -import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service'; -import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; import { isEmpty, isNotEmpty, diff --git a/src/app/submission/objects/submission-objects.reducer.spec.ts b/src/app/submission/objects/submission-objects.reducer.spec.ts index 2bbb875c3cd..4797347075e 100644 --- a/src/app/submission/objects/submission-objects.reducer.spec.ts +++ b/src/app/submission/objects/submission-objects.reducer.spec.ts @@ -1,4 +1,5 @@ -import { Item } from '../../core/shared/item.model'; +import { Item } from '@core/shared/item.model'; + import { mockSubmissionCollectionId, mockSubmissionDefinitionResponse, diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts index a34cf236b94..38afb3ef528 100644 --- a/src/app/submission/objects/submission-objects.reducer.ts +++ b/src/app/submission/objects/submission-objects.reducer.ts @@ -1,9 +1,9 @@ +import { WorkspaceitemSectionUploadObject } from '@core/submission/models/workspaceitem-section-upload.model'; import differenceWith from 'lodash/differenceWith'; import findKey from 'lodash/findKey'; import isEqual from 'lodash/isEqual'; import uniqWith from 'lodash/uniqWith'; -import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model'; import { hasValue, isEmpty, diff --git a/src/app/submission/objects/submission-section-object.model.ts b/src/app/submission/objects/submission-section-object.model.ts index 5d8a14c7450..9841aba952a 100644 --- a/src/app/submission/objects/submission-section-object.model.ts +++ b/src/app/submission/objects/submission-section-object.model.ts @@ -1,4 +1,5 @@ -import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model'; +import { WorkspaceitemSectionDataType } from '@core/submission/models/workspaceitem-sections.model'; + import { SectionsType } from '../sections/sections-type'; import { SectionScope, diff --git a/src/app/submission/sections/accesses/section-accesses.component.spec.ts b/src/app/submission/sections/accesses/section-accesses.component.spec.ts index 56857ec3ec8..c7351c8cfeb 100644 --- a/src/app/submission/sections/accesses/section-accesses.component.spec.ts +++ b/src/app/submission/sections/accesses/section-accesses.component.spec.ts @@ -3,6 +3,11 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { SubmissionAccessesConfigDataService } from '@core/config/submission-accesses-config-data.service'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicCheckboxModel, @@ -21,11 +26,6 @@ import { } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment.test'; -import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service'; -import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service'; -import { XSRFService } from '../../../core/xsrf/xsrf.service'; import { dsDynamicFormControlMapFn } from '../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn'; import { DsDynamicTypeBindRelationService } from '../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; diff --git a/src/app/submission/sections/accesses/section-accesses.component.ts b/src/app/submission/sections/accesses/section-accesses.component.ts index 53c67a8bf2d..2d2c1ab37f3 100644 --- a/src/app/submission/sections/accesses/section-accesses.component.ts +++ b/src/app/submission/sections/accesses/section-accesses.component.ts @@ -5,6 +5,13 @@ import { ViewChild, } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; +import { AccessesConditionOption } from '@core/config/models/config-accesses-conditions-options.model'; +import { SubmissionAccessesConfigDataService } from '@core/config/submission-accesses-config-data.service'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; +import { WorkspaceitemSectionAccessesObject } from '@core/submission/models/workspaceitem-section-accesses.model'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; import { DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX, DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER, @@ -34,13 +41,6 @@ import { take, } from 'rxjs/operators'; -import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model'; -import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; -import { WorkspaceitemSectionAccessesObject } from '../../../core/submission/models/workspaceitem-section-accesses.model'; -import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service'; import { dateToISOFormat } from '../../../shared/date.util'; import { hasValue, diff --git a/src/app/submission/sections/accesses/section-accesses.service.ts b/src/app/submission/sections/accesses/section-accesses.service.ts index 4fa3a632d67..79addb1f018 100644 --- a/src/app/submission/sections/accesses/section-accesses.service.ts +++ b/src/app/submission/sections/accesses/section-accesses.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { WorkspaceitemSectionAccessesObject } from '@core/submission/models/workspaceitem-section-accesses.model'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { @@ -6,7 +7,6 @@ import { filter, } from 'rxjs/operators'; -import { WorkspaceitemSectionAccessesObject } from '../../../core/submission/models/workspaceitem-section-accesses.model'; import { isNotUndefined } from '../../../shared/empty.util'; import { submissionSectionDataFromIdSelector } from '../../selectors'; import { SubmissionState } from '../../submission.reducers'; diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts index 568ef820b2e..aa8245c685a 100644 --- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts +++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts @@ -5,18 +5,18 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { SUBMISSION_CC_LICENSE } from '@core/submission/models/submission-cc-licence.resource-type'; +import { SubmissionCcLicence } from '@core/submission/models/submission-cc-license.model'; +import { SubmissionCcLicenseDataService } from '@core/submission/submission-cc-license-data.service'; +import { SubmissionCcLicenseUrlDataService } from '@core/submission/submission-cc-license-url-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; import { FormBuilderService } from 'src/app/shared/form/builder/form-builder.service'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; -import { SUBMISSION_CC_LICENSE } from '../../../core/submission/models/submission-cc-licence.resource-type'; -import { SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model'; -import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service'; -import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { createPaginatedList } from '../../../shared/testing/utils.test'; diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts index fcee83e0368..2c11345e4f5 100644 --- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts +++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts @@ -8,6 +8,23 @@ import { SimpleChanges, } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { + Field, + Option, + SubmissionCcLicence, +} from '@core/submission/models/submission-cc-license.model'; +import { WorkspaceitemSectionCcLicenseObject } from '@core/submission/models/workspaceitem-section-cc-license.model'; +import { SubmissionCcLicenseDataService } from '@core/submission/submission-cc-license-data.service'; +import { SubmissionCcLicenseUrlDataService } from '@core/submission/submission-cc-license-url-data.service'; import { NgbDropdownModule, NgbModal, @@ -28,23 +45,6 @@ import { tap, } from 'rxjs/operators'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, - getRemoteDataPayload, -} from '../../../core/shared/operators'; -import { - Field, - Option, - SubmissionCcLicence, -} from '../../../core/submission/models/submission-cc-license.model'; -import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model'; -import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service'; -import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service'; import { DsSelectComponent } from '../../../shared/ds-select/ds-select.component'; import { hasNoValue, diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts index c911fe84ed0..598f7039695 100644 --- a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts +++ b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts @@ -17,20 +17,20 @@ import { } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { SubmissionFormsConfigDataService } from '@core/config/submission-forms-config-data.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Collection } from '@core/shared/collection.model'; +import { License } from '@core/shared/license.model'; +import { MetadataValue } from '@core/shared/metadata.models'; +import { SubmissionScopeType } from '@core/submission/submission-scope-type'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { NgxPaginationModule } from 'ngx-pagination'; import { of } from 'rxjs'; -import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { License } from '../../../core/shared/license.model'; -import { MetadataValue } from '../../../core/shared/metadata.models'; -import { SubmissionScopeType } from '../../../core/submission/submission-scope-type'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; import { FormService } from '../../../shared/form/form.service'; import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock'; diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.ts b/src/app/submission/sections/duplicates/section-duplicates.component.ts index edcf099333b..3c908278e3b 100644 --- a/src/app/submission/sections/duplicates/section-duplicates.component.ts +++ b/src/app/submission/sections/duplicates/section-duplicates.component.ts @@ -5,6 +5,9 @@ import { Inject, OnInit, } from '@angular/core'; +import { Metadata } from '@core/shared/metadata.utils'; +import { WorkspaceitemSectionDuplicatesObject } from '@core/submission/models/workspaceitem-section-duplicates.model'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; import { TranslateModule, TranslateService, @@ -15,9 +18,6 @@ import { Subscription, } from 'rxjs'; -import { Metadata } from '../../../core/shared/metadata.utils'; -import { WorkspaceitemSectionDuplicatesObject } from '../../../core/submission/models/workspaceitem-section-duplicates.model'; -import { URLCombiner } from '../../../core/url-combiner/url-combiner'; import { getItemModuleRoute } from '../../../item-page/item-page-routing-paths'; import { AlertType } from '../../../shared/alert/alert-type'; import { VarDirective } from '../../../shared/utils/var.directive'; diff --git a/src/app/submission/sections/form/section-form-operations.service.spec.ts b/src/app/submission/sections/form/section-form-operations.service.spec.ts index cd169a76ace..abe556e4397 100644 --- a/src/app/submission/sections/form/section-form-operations.service.spec.ts +++ b/src/app/submission/sections/form/section-form-operations.service.spec.ts @@ -2,6 +2,9 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; import { DYNAMIC_FORM_CONTROL_TYPE_ARRAY, DYNAMIC_FORM_CONTROL_TYPE_GROUP, @@ -14,9 +17,6 @@ import { } from '@ngx-translate/core'; import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model'; import { DynamicRowArrayModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model'; diff --git a/src/app/submission/sections/form/section-form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts index 6ef2fc51b84..d1bbe5c36a0 100644 --- a/src/app/submission/sections/form/section-form-operations.service.ts +++ b/src/app/submission/sections/form/section-form-operations.service.ts @@ -1,4 +1,8 @@ import { Injectable } from '@angular/core'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { DYNAMIC_FORM_CONTROL_TYPE_ARRAY, DYNAMIC_FORM_CONTROL_TYPE_GROUP, @@ -11,10 +15,6 @@ import { deepClone } from 'fast-json-patch'; import isEqual from 'lodash/isEqual'; import isObject from 'lodash/isObject'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { dateToString, isNgbDateStruct, diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts index dccdcac6e27..d4aa2efb3b3 100644 --- a/src/app/submission/sections/form/section-form.component.spec.ts +++ b/src/app/submission/sections/form/section-form.component.spec.ts @@ -14,6 +14,14 @@ import { FormsModule, ReactiveFormsModule, } from '@angular/forms'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { FormRowModel } from '@core/config/models/config-submission-form.model'; +import { SubmissionFormsConfigDataService } from '@core/config/submission-forms-config-data.service'; +import { RequestService } from '@core/data/request.service'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; import { DynamicFormControlEvent, DynamicFormControlEventType, @@ -25,14 +33,6 @@ import { import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { FormRowModel } from '../../../core/config/models/config-submission-form.model'; -import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service'; -import { RequestService } from '../../../core/data/request.service'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; -import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; -import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service'; import { DsDynamicInputModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model'; import { DynamicRowGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-group-model'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts index 75950bfe526..93609bce45d 100644 --- a/src/app/submission/sections/form/section-form.component.ts +++ b/src/app/submission/sections/form/section-form.component.ts @@ -5,6 +5,24 @@ import { Inject, ViewChild, } from '@angular/core'; +import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { ConfigObject } from '@core/config/models/config.model'; +import { FormRowModel } from '@core/config/models/config-submission-form.model'; +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; +import { SubmissionFormsConfigDataService } from '@core/config/submission-forms-config-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { + getFirstSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { WorkspaceitemSectionFormObject } from '@core/submission/models/workspaceitem-section-form.model'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; +import { SubmissionScopeType } from '@core/submission/submission-scope-type'; import { DynamicFormControlEvent, DynamicFormControlModel, @@ -28,24 +46,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../../environments/environment'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { ConfigObject } from '../../../core/config/models/config.model'; -import { FormRowModel } from '../../../core/config/models/config-submission-form.model'; -import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model'; -import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { RequestService } from '../../../core/data/request.service'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { - getFirstSucceededRemoteData, - getRemoteDataPayload, -} from '../../../core/shared/operators'; -import { SubmissionObject } from '../../../core/submission/models/submission-object.model'; -import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; -import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; -import { WorkspaceitemSectionFormObject } from '../../../core/submission/models/workspaceitem-section-form.model'; -import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service'; -import { SubmissionScopeType } from '../../../core/submission/submission-scope-type'; import { hasValue, isEmpty, diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts index fbeee4091b8..fa5c794b62b 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts +++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts @@ -15,23 +15,23 @@ import { ReactiveFormsModule, } from '@angular/forms'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { SubmissionFormsConfigDataService } from '@core/config/submission-forms-config-data.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { Collection } from '@core/shared/collection.model'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Item } from '@core/shared/item.model'; +import { License } from '@core/shared/license.model'; +import { WorkspaceitemSectionIdentifiersObject } from '@core/submission/models/workspaceitem-section-identifiers.model'; +import { SubmissionScopeType } from '@core/submission/submission-scope-type'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { NgxPaginationModule } from 'ngx-pagination'; import { of } from 'rxjs'; -import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { PaginationService } from '../../../core/pagination/pagination.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; -import { Item } from '../../../core/shared/item.model'; -import { License } from '../../../core/shared/license.model'; -import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/models/workspaceitem-section-identifiers.model'; -import { SubmissionScopeType } from '../../../core/submission/submission-scope-type'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; import { FormService } from '../../../shared/form/form.service'; import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock'; diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts index 04dfbfac850..cd71a7359a0 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.ts +++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts @@ -5,6 +5,7 @@ import { Inject, OnInit, } from '@angular/core'; +import { WorkspaceitemSectionIdentifiersObject } from '@core/submission/models/workspaceitem-section-identifiers.model'; import { TranslateModule, TranslateService, @@ -14,7 +15,6 @@ import { of, } from 'rxjs'; -import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/models/workspaceitem-section-identifiers.model'; import { VarDirective } from '../../../shared/utils/var.directive'; import { SubmissionService } from '../../submission.service'; import { SectionModelComponent } from '../models/section.model'; diff --git a/src/app/submission/sections/license/section-license.component.spec.ts b/src/app/submission/sections/license/section-license.component.spec.ts index 3b8054c067d..00b4806a8c5 100644 --- a/src/app/submission/sections/license/section-license.component.spec.ts +++ b/src/app/submission/sections/license/section-license.component.spec.ts @@ -14,6 +14,14 @@ import { FormsModule, ReactiveFormsModule, } from '@angular/forms'; +import { SubmissionFormsConfigDataService } from '@core/config/submission-forms-config-data.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { Collection } from '@core/shared/collection.model'; +import { License } from '@core/shared/license.model'; +import { SubmissionObjectDataService } from '@core/submission/submission-object-data.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicCheckboxModel, @@ -32,14 +40,6 @@ import { } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment.test'; -import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { Collection } from '../../../core/shared/collection.model'; -import { License } from '../../../core/shared/license.model'; -import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service'; -import { XSRFService } from '../../../core/xsrf/xsrf.service'; import { dsDynamicFormControlMapFn } from '../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model'; diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts index 0bd786424cb..ea2da4ae395 100644 --- a/src/app/submission/sections/license/section-license.component.ts +++ b/src/app/submission/sections/license/section-license.component.ts @@ -6,6 +6,13 @@ import { Inject, ViewChild, } from '@angular/core'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { Collection } from '@core/shared/collection.model'; +import { License } from '@core/shared/license.model'; +import { WorkspaceitemSectionLicenseObject } from '@core/submission/models/workspaceitem-section-license.model'; import { DynamicCheckboxModel, DynamicFormControlEvent, @@ -27,13 +34,6 @@ import { take, } from 'rxjs/operators'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { Collection } from '../../../core/shared/collection.model'; -import { License } from '../../../core/shared/license.model'; -import { WorkspaceitemSectionLicenseObject } from '../../../core/submission/models/workspaceitem-section-license.model'; import { hasValue, isNotEmpty, diff --git a/src/app/submission/sections/models/section-data.model.ts b/src/app/submission/sections/models/section-data.model.ts index 7ecb820db77..ac7d031faeb 100644 --- a/src/app/submission/sections/models/section-data.model.ts +++ b/src/app/submission/sections/models/section-data.model.ts @@ -1,4 +1,5 @@ -import { WorkspaceitemSectionDataType } from '../../../core/submission/models/workspaceitem-sections.model'; +import { WorkspaceitemSectionDataType } from '@core/submission/models/workspaceitem-sections.model'; + import { SubmissionSectionError } from '../../objects/submission-section-error.model'; import { SectionsType } from '../sections-type'; diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.spec.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.spec.ts index 635b0a9f444..aa06fc9d73c 100644 --- a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.spec.ts +++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.spec.ts @@ -3,23 +3,23 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { SubmissionCoarNotifyModel } from '@core/coar-notify/models/submission-coar-notify.model'; +import { NotifyServicePattern } from '@core/data/admin-ldn-services/ldn-services-model/ldn-service-patterns.model'; +import { + LdnService, + LdnServiceByPattern, +} from '@core/data/admin-ldn-services/ldn-services-model/ldn-services.model'; +import { CoarNotifyConfigDataService } from '@core/data/coar-notify-config-data.service'; +import { LdnServicesService } from '@core/data/ldn-services-data.service'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { LdnServicesService } from '../../../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service'; -import { NotifyServicePattern } from '../../../admin/admin-ldn-services/ldn-services-model/ldn-service-patterns.model'; -import { - LdnService, - LdnServiceByPattern, -} from '../../../admin/admin-ldn-services/ldn-services-model/ldn-services.model'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { createPaginatedList } from '../../../shared/testing/utils.test'; import { SectionsService } from '../sections.service'; -import { CoarNotifyConfigDataService } from './coar-notify-config-data.service'; import { SubmissionSectionCoarNotifyComponent } from './section-coar-notify.component'; -import { SubmissionCoarNotifyConfig } from './submission-coar-notify.config'; describe('SubmissionSectionCoarNotifyComponent', () => { let component: SubmissionSectionCoarNotifyComponent; @@ -33,8 +33,8 @@ describe('SubmissionSectionCoarNotifyComponent', () => { let cdRefStub: any; - const patterns: SubmissionCoarNotifyConfig[] = Object.assign( - [new SubmissionCoarNotifyConfig()], + const patterns: SubmissionCoarNotifyModel[] = Object.assign( + [new SubmissionCoarNotifyModel()], { patterns: [{ pattern: 'review', multipleRequest: false }, { pattern: 'endorsment', multipleRequest: false }], }, diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts index 5c1af7ff872..d60e443f9d3 100644 --- a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts +++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts @@ -7,6 +7,20 @@ import { Component, Inject, } from '@angular/core'; +import { LdnPattern } from '@core/coar-notify/models/submission-coar-notify.model'; +import { + LdnService, + LdnServiceByPattern, +} from '@core/data/admin-ldn-services/ldn-services-model/ldn-services.model'; +import { CoarNotifyConfigDataService } from '@core/data/coar-notify-config-data.service'; +import { LdnServicesService } from '@core/data/ldn-services-data.service'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { + getFirstCompletedRemoteData, + getPaginatedListPayload, + getRemoteDataPayload, +} from '@core/shared/operators'; import { NgbDropdown, NgbDropdownModule, @@ -24,18 +38,6 @@ import { tap, } from 'rxjs/operators'; -import { LdnServicesService } from '../../../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service'; -import { - LdnService, - LdnServiceByPattern, -} from '../../../admin/admin-ldn-services/ldn-services-model/ldn-services.model'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { - getFirstCompletedRemoteData, - getPaginatedListPayload, - getRemoteDataPayload, -} from '../../../core/shared/operators'; import { hasValue, isEmpty, @@ -45,8 +47,6 @@ import { SubmissionSectionError } from '../../objects/submission-section-error.m import { SectionModelComponent } from '../models/section.model'; import { SectionDataObject } from '../models/section-data.model'; import { SectionsService } from '../sections.service'; -import { CoarNotifyConfigDataService } from './coar-notify-config-data.service'; -import { LdnPattern } from './submission-coar-notify.config'; /** * This component represents a section that contains the submission section-coar-notify form. diff --git a/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts b/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts index b80244c2723..67fc532a0ae 100644 --- a/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts +++ b/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts @@ -1,3 +1,7 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { COAR_NOTIFY_WORKSPACEITEM } from '@core/shared/section-coar-notify-service.resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, @@ -5,11 +9,6 @@ import { inheritSerialization, } from 'cerialize'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { CacheableObject } from '../../../core/cache/cacheable-object.model'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; -import { COAR_NOTIFY_WORKSPACEITEM } from './section-coar-notify-service.resource-type'; - /** An CoarNotify and its properties. */ @typedObject @inheritSerialization(CacheableObject) diff --git a/src/app/submission/sections/sections.service.spec.ts b/src/app/submission/sections/sections.service.spec.ts index 765715b6051..3936c30c871 100644 --- a/src/app/submission/sections/sections.service.spec.ts +++ b/src/app/submission/sections/sections.service.spec.ts @@ -2,6 +2,7 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { SubmissionScopeType } from '@core/submission/submission-scope-type'; import { Store, StoreModule, @@ -19,7 +20,6 @@ import { import { of } from 'rxjs'; import { storeModuleConfig } from '../../app.reducer'; -import { SubmissionScopeType } from '../../core/submission/submission-scope-type'; import { FormClearErrorsAction } from '../../shared/form/form.actions'; import { FormService } from '../../shared/form/form.service'; import { getMockFormService } from '../../shared/mocks/form-service.mock'; diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts index cec60a9cdf3..23579291009 100644 --- a/src/app/submission/sections/sections.service.ts +++ b/src/app/submission/sections/sections.service.ts @@ -1,4 +1,9 @@ import { Injectable } from '@angular/core'; +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { WorkspaceitemSectionDataType } from '@core/submission/models/workspaceitem-sections.model'; +import { normalizeSectionData } from '@core/submission/submission-response-parsing.service'; +import { SubmissionScopeType } from '@core/submission/submission-scope-type'; import { parseReviver } from '@ng-dynamic-forms/core'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; @@ -21,11 +26,6 @@ import { take, } from 'rxjs/operators'; -import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model'; -import { JsonPatchOperationPathCombiner } from '../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model'; -import { normalizeSectionData } from '../../core/submission/submission-response-parsing.service'; -import { SubmissionScopeType } from '../../core/submission/submission-scope-type'; import { hasValue, isEmpty, diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts index fd38f7b3e52..fd832480e36 100644 --- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts +++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts @@ -3,11 +3,10 @@ import { Component, Input, } from '@angular/core'; +import { PermittedVersions } from '@core/submission/models/sherpa-policies-details.model'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { PermittedVersions } from '../../../../core/submission/models/sherpa-policies-details.model'; - /** * This component represents a section that contains the inner accordions for the publisher policy versions. */ diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts index 127c4810f9b..1a81e309075 100644 --- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts +++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts @@ -3,10 +3,9 @@ import { Component, Input, } from '@angular/core'; +import { Metadata } from '@core/submission/models/sherpa-policies-details.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Metadata } from '../../../../core/submission/models/sherpa-policies-details.model'; - /** * This component represents a section that contains the metadata information. */ diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts index 27f54a1bbaa..35c650ca558 100644 --- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts +++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts @@ -3,10 +3,9 @@ import { Component, Input, } from '@angular/core'; +import { Journal } from '@core/submission/models/sherpa-policies-details.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Journal } from '../../../../core/submission/models/sherpa-policies-details.model'; - /** * This component represents a section that contains the journal publication information. */ diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts index be6cef65f14..1731c5a51a9 100644 --- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts +++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts @@ -3,9 +3,9 @@ import { Component, Input, } from '@angular/core'; +import { Policy } from '@core/submission/models/sherpa-policies-details.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Policy } from '../../../../core/submission/models/sherpa-policies-details.model'; import { AlertType } from '../../../../shared/alert/alert-type'; import { ContentAccordionComponent } from '../content-accordion/content-accordion.component'; diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts index 086b6ab064d..9d568c6abe3 100644 --- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts +++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts @@ -9,6 +9,7 @@ import { By, } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { Store } from '@ngrx/store'; import { @@ -19,7 +20,6 @@ import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; import { AppState } from '../../../app.reducer'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { SherpaDataResponse } from '../../../shared/mocks/section-sherpa-policies.service.mock'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts index 4d444e8ac48..70b9cfa49c5 100644 --- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts +++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts @@ -3,6 +3,9 @@ import { Component, Inject, } from '@angular/core'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { WorkspaceitemSectionSherpaPoliciesObject } from '@core/submission/models/workspaceitem-section-sherpa-policies.model'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -12,9 +15,6 @@ import { Subscription, } from 'rxjs'; -import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { WorkspaceitemSectionSherpaPoliciesObject } from '../../../core/submission/models/workspaceitem-section-sherpa-policies.model'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { AlertType } from '../../../shared/alert/alert-type'; import { diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts index eb167f5501c..28746b00d1e 100644 --- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts +++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts @@ -4,13 +4,13 @@ import { Input, OnInit, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { RemoteData } from '@core/data/remote-data'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Group } from '@core/eperson/models/group.model'; +import { ResourcePolicy } from '@core/resource-policy/models/resource-policy.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { ResourcePolicy } from '../../../../core/resource-policy/models/resource-policy.model'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { isEmpty } from '../../../../shared/empty.util'; /** diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts index 4ada2792a1b..f9467c62a75 100644 --- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts +++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts @@ -15,6 +15,10 @@ import { FormsModule, ReactiveFormsModule, } from '@angular/forms'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { NgbActiveModal, NgbModal, @@ -35,10 +39,6 @@ import { APP_DATA_SERVICES_MAP, } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment.test'; -import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder'; -import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service'; -import { XSRFService } from '../../../../../core/xsrf/xsrf.service'; import { dateToISOFormat } from '../../../../../shared/date.util'; import { DsDynamicTypeBindRelationService } from '../../../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service'; import { DynamicCustomSwitchModel } from '../../../../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model'; diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts index 4a70381fd62..3db69c3a753 100644 --- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts +++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts @@ -7,6 +7,12 @@ import { ViewChild, } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; +import { AccessConditionOption } from '@core/config/models/config-access-condition-option.model'; +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { WorkspaceitemSectionUploadFileObject } from '@core/submission/models/workspaceitem-section-upload-file.model'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER, @@ -32,12 +38,6 @@ import { SubmissionObject } from 'src/app/core/submission/models/submission-obje import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model'; import { DynamicCustomSwitchModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model'; -import { AccessConditionOption } from '../../../../../core/config/models/config-access-condition-option.model'; -import { SubmissionFormsModel } from '../../../../../core/config/models/config-submission-forms.model'; -import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder'; -import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model'; -import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service'; import { BtnDisabledDirective } from '../../../../../shared/btn-disabled.directive'; import { dateToISOFormat } from '../../../../../shared/date.util'; import { diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts index 8bf9b944744..bd2901cd0ea 100644 --- a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts +++ b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts @@ -13,6 +13,10 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; import { NgbModal, NgbModule, @@ -21,10 +25,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../../../config/app-config.interface'; -import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder'; -import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; -import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service'; import { ThemedFileDownloadLinkComponent } from '../../../../shared/file-download-link/themed-file-download-link.component'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { FormService } from '../../../../shared/form/form.service'; diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts index 0ef67333be6..cbd8551ec12 100644 --- a/src/app/submission/sections/upload/file/section-upload-file.component.ts +++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts @@ -8,6 +8,12 @@ import { SimpleChanges, ViewChild, } from '@angular/core'; +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { WorkspaceitemSectionUploadFileObject } from '@core/submission/models/workspaceitem-section-upload-file.model'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap/modal/modal-config'; import { DynamicFormControlModel } from '@ng-dynamic-forms/core'; @@ -19,12 +25,6 @@ import { } from 'rxjs'; import { filter } from 'rxjs/operators'; -import { SubmissionFormsModel } from '../../../../core/config/models/config-submission-forms.model'; -import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder'; -import { Bitstream } from '../../../../core/shared/bitstream.model'; -import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model'; -import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service'; import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive'; import { hasValue, diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.spec.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.spec.ts index 1ff35abc48e..40773481343 100644 --- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.spec.ts +++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.spec.ts @@ -9,9 +9,9 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { Metadata } from '@core/shared/metadata.utils'; import { TranslateModule } from '@ngx-translate/core'; -import { Metadata } from '../../../../../core/shared/metadata.utils'; import { FormComponent } from '../../../../../shared/form/form.component'; import { mockUploadFiles } from '../../../../../shared/mocks/submission.mock'; import { createTestComponent } from '../../../../../shared/testing/utils.test'; diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts index 8574c2c8c9f..f7cc0267809 100644 --- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts +++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts @@ -4,14 +4,14 @@ import { Input, OnInit, } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; - import { MetadataMap, MetadataValue, -} from '../../../../../core/shared/metadata.models'; -import { Metadata } from '../../../../../core/shared/metadata.utils'; -import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model'; +} from '@core/shared/metadata.models'; +import { Metadata } from '@core/shared/metadata.utils'; +import { WorkspaceitemSectionUploadFileObject } from '@core/submission/models/workspaceitem-section-upload-file.model'; +import { TranslateModule } from '@ngx-translate/core'; + import { isNotEmpty } from '../../../../../shared/empty.util'; import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe'; import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe'; diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts index 67058ba0f8a..771bc8bd6b9 100644 --- a/src/app/submission/sections/upload/section-upload.component.spec.ts +++ b/src/app/submission/sections/upload/section-upload.component.spec.ts @@ -10,22 +10,22 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { SubmissionUploadsModel } from '@core/config/models/config-submission-uploads.model'; +import { SubmissionFormsConfigDataService } from '@core/config/submission-forms-config-data.service'; +import { SubmissionUploadsConfigDataService } from '@core/config/submission-uploads-config-data.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Group } from '@core/eperson/models/group.model'; +import { ResourcePolicy } from '@core/resource-policy/models/resource-policy.model'; +import { ResourcePolicyDataService } from '@core/resource-policy/resource-policy-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; -import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model'; -import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service'; -import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { Group } from '../../../core/eperson/models/group.model'; -import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model'; -import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { getMockSectionUploadService } from '../../../shared/mocks/section-upload.service.mock'; import { diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts index 6a690ebc108..55257578d36 100644 --- a/src/app/submission/sections/upload/section-upload.component.ts +++ b/src/app/submission/sections/upload/section-upload.component.ts @@ -4,6 +4,18 @@ import { Component, Inject, } from '@angular/core'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { AccessConditionOption } from '@core/config/models/config-access-condition-option.model'; +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; +import { SubmissionUploadsModel } from '@core/config/models/config-submission-uploads.model'; +import { SubmissionUploadsConfigDataService } from '@core/config/submission-uploads-config-data.service'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { Group } from '@core/eperson/models/group.model'; +import { ResourcePolicyDataService } from '@core/resource-policy/resource-policy-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -22,18 +34,6 @@ import { } from 'rxjs/operators'; import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model'; -import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { AccessConditionOption } from '../../../core/config/models/config-access-condition-option.model'; -import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model'; -import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model'; -import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service'; -import { CollectionDataService } from '../../../core/data/collection-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { Group } from '../../../core/eperson/models/group.model'; -import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service'; -import { Collection } from '../../../core/shared/collection.model'; -import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { AlertType } from '../../../shared/alert/alert-type'; import { diff --git a/src/app/submission/sections/upload/section-upload.service.ts b/src/app/submission/sections/upload/section-upload.service.ts index b4abe366c04..11c0c90945b 100644 --- a/src/app/submission/sections/upload/section-upload.service.ts +++ b/src/app/submission/sections/upload/section-upload.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { WorkspaceitemSectionUploadFileObject } from '@core/submission/models/workspaceitem-section-upload-file.model'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { @@ -10,7 +11,6 @@ import { JsonPatchOperationPathObject } from 'src/app/core/json-patch/builder/js import { JsonPatchOperationsBuilder } from 'src/app/core/json-patch/builder/json-patch-operations-builder'; import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model'; -import { WorkspaceitemSectionUploadFileObject } from '../../../core/submission/models/workspaceitem-section-upload-file.model'; import { isUndefined } from '../../../shared/empty.util'; import { DeleteUploadedFileAction, diff --git a/src/app/submission/server-submission.service.ts b/src/app/submission/server-submission.service.ts index a993c5fe35d..07cc5487c0b 100644 --- a/src/app/submission/server-submission.service.ts +++ b/src/app/submission/server-submission.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; +import { RemoteData } from '@core/data/remote-data'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; import { Observable, of, } from 'rxjs'; -import { RemoteData } from '../core/data/remote-data'; -import { SubmissionObject } from '../core/submission/models/submission-object.model'; import { SubmissionService } from './submission.service'; /** diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts index df558240666..297fc3a858a 100644 --- a/src/app/submission/submission.service.spec.ts +++ b/src/app/submission/submission.service.spec.ts @@ -10,6 +10,16 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { ErrorResponse } from '@core/cache/response.models'; +import { RequestService } from '@core/data/request.service'; +import { RequestError } from '@core/data/request-error.model'; +import { HttpOptions } from '@core/dspace-rest/dspace-rest.service'; +import { RouteService } from '@core/services/route.service'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; +import { SubmissionRestService } from '@core/submission/submission-rest.service'; +import { SubmissionScopeType } from '@core/submission/submission-scope-type'; import { StoreModule } from '@ngrx/store'; import { TranslateLoader, @@ -29,16 +39,6 @@ import { TestScheduler } from 'rxjs/testing'; import { environment } from '../../environments/environment'; import { storeModuleConfig } from '../app.reducer'; -import { ErrorResponse } from '../core/cache/response.models'; -import { RequestService } from '../core/data/request.service'; -import { RequestError } from '../core/data/request-error.model'; -import { HttpOptions } from '../core/dspace-rest/dspace-rest.service'; -import { RouteService } from '../core/services/route.service'; -import { Item } from '../core/shared/item.model'; -import { SearchService } from '../core/shared/search/search.service'; -import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service'; -import { SubmissionRestService } from '../core/submission/submission-rest.service'; -import { SubmissionScopeType } from '../core/submission/submission-scope-type'; import { MockActivatedRoute } from '../shared/mocks/active-router.mock'; import { getMockRequestService } from '../shared/mocks/request.service.mock'; import { RouterMock } from '../shared/mocks/router.mock'; diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts index e5b0a622339..3d157d43a33 100644 --- a/src/app/submission/submission.service.ts +++ b/src/app/submission/submission.service.ts @@ -1,6 +1,19 @@ import { HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; +import { ErrorResponse } from '@core/cache/response.models'; +import { SubmissionDefinitionsModel } from '@core/config/models/config-submission-definitions.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { HttpOptions } from '@core/dspace-rest/dspace-rest.service'; +import { RouteService } from '@core/services/route.service'; +import { Item } from '@core/shared/item.model'; +import { SearchService } from '@core/shared/search/search.service'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { WorkspaceitemSectionsObject } from '@core/submission/models/workspaceitem-sections.model'; +import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; +import { SubmissionRestService } from '@core/submission/submission-rest.service'; +import { SubmissionScopeType } from '@core/submission/submission-scope-type'; import { createSelector, MemoizedSelector, @@ -27,19 +40,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../environments/environment'; -import { ErrorResponse } from '../core/cache/response.models'; -import { SubmissionDefinitionsModel } from '../core/config/models/config-submission-definitions.model'; -import { RemoteData } from '../core/data/remote-data'; -import { RequestService } from '../core/data/request.service'; -import { HttpOptions } from '../core/dspace-rest/dspace-rest.service'; -import { RouteService } from '../core/services/route.service'; -import { Item } from '../core/shared/item.model'; -import { SearchService } from '../core/shared/search/search.service'; -import { SubmissionObject } from '../core/submission/models/submission-object.model'; -import { WorkspaceitemSectionsObject } from '../core/submission/models/workspaceitem-sections.model'; -import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service'; -import { SubmissionRestService } from '../core/submission/submission-rest.service'; -import { SubmissionScopeType } from '../core/submission/submission-scope-type'; import { hasValue, isEmpty, diff --git a/src/app/submission/submit/submission-submit.component.spec.ts b/src/app/submission/submit/submission-submit.component.spec.ts index 82b9819fb6f..0f71b8ddb28 100644 --- a/src/app/submission/submit/submission-submit.component.spec.ts +++ b/src/app/submission/submit/submission-submit.component.spec.ts @@ -12,13 +12,13 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { ItemDataService } from '@core/data/item-data.service'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ItemDataService } from '../../core/data/item-data.service'; import { mockSubmissionObject } from '../../shared/mocks/submission.mock'; import { getMockTranslateService } from '../../shared/mocks/translate.service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/submission/submit/submission-submit.component.ts b/src/app/submission/submit/submission-submit.component.ts index c9e087f7d81..d37579e2d24 100644 --- a/src/app/submission/submit/submission-submit.component.ts +++ b/src/app/submission/submit/submission-submit.component.ts @@ -9,6 +9,13 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { SubmissionDefinitionsModel } from '@core/config/models/config-submission-definitions.model'; +import { ItemDataService } from '@core/data/item-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { getAllSucceededRemoteData } from '@core/shared/operators'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { WorkspaceitemSectionsObject } from '@core/submission/models/workspaceitem-sections.model'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, @@ -19,13 +26,6 @@ import { switchMap, } from 'rxjs/operators'; -import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model'; -import { ItemDataService } from '../../core/data/item-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { Item } from '../../core/shared/item.model'; -import { getAllSucceededRemoteData } from '../../core/shared/operators'; -import { SubmissionObject } from '../../core/submission/models/submission-object.model'; -import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model'; import { hasValue, isEmpty, diff --git a/src/app/submission/utils/parseSectionErrors.ts b/src/app/submission/utils/parseSectionErrors.ts index e2e405915d9..d8d0bbff64c 100644 --- a/src/app/submission/utils/parseSectionErrors.ts +++ b/src/app/submission/utils/parseSectionErrors.ts @@ -1,4 +1,5 @@ -import { SubmissionObjectError } from '../../core/submission/models/submission-object.model'; +import { SubmissionObjectError } from '@core/submission/models/submission-object.model'; + import { default as parseSectionErrorPaths, SectionErrorPath, diff --git a/src/app/submit-page/submit-page-routes.ts b/src/app/submit-page/submit-page-routes.ts index 338a81af3ed..c2df4b21298 100644 --- a/src/app/submit-page/submit-page-routes.ts +++ b/src/app/submit-page/submit-page-routes.ts @@ -1,7 +1,7 @@ import { Route } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedSubmissionSubmitComponent } from '../submission/submit/themed-submission-submit.component'; export const ROUTES: Route[] = [ diff --git a/src/app/subscriptions-page/subscriptions-page.component.spec.ts b/src/app/subscriptions-page/subscriptions-page.component.spec.ts index 932698f4f9d..143012b7565 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.spec.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.spec.ts @@ -15,16 +15,16 @@ import { import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from '@core/auth/auth.service'; +import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../core/auth/auth.service'; -import { buildPaginatedList } from '../core/data/paginated-list.model'; -import { PaginationService } from '../core/pagination/pagination.service'; -import { PageInfo } from '../core/shared/page-info.model'; import { AlertComponent } from '../shared/alert/alert.component'; import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component'; import { MockActivatedRoute } from '../shared/mocks/active-router.mock'; diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts index 0840c3a1539..7a54c074e6c 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.ts @@ -4,6 +4,16 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { getAllCompletedRemoteData } from '@core/shared/operators'; +import { PageInfo } from '@core/shared/page-info.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -19,16 +29,6 @@ import { tap, } from 'rxjs/operators'; -import { AuthService } from '../core/auth/auth.service'; -import { - buildPaginatedList, - PaginatedList, -} from '../core/data/paginated-list.model'; -import { RemoteData } from '../core/data/remote-data'; -import { EPerson } from '../core/eperson/models/eperson.model'; -import { PaginationService } from '../core/pagination/pagination.service'; -import { getAllCompletedRemoteData } from '../core/shared/operators'; -import { PageInfo } from '../core/shared/page-info.model'; import { AlertComponent } from '../shared/alert/alert.component'; import { AlertType } from '../shared/alert/alert-type'; import { hasValue } from '../shared/empty.util'; diff --git a/src/app/suggestions-page/suggestions-page-routes.ts b/src/app/suggestions-page/suggestions-page-routes.ts index f270a1ef663..860e4b0a28f 100644 --- a/src/app/suggestions-page/suggestions-page-routes.ts +++ b/src/app/suggestions-page/suggestions-page-routes.ts @@ -1,7 +1,7 @@ import { Route } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { publicationClaimBreadcrumbResolver } from '@core/breadcrumbs/publication-claim-breadcrumb.resolver'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; -import { publicationClaimBreadcrumbResolver } from '../core/breadcrumbs/publication-claim-breadcrumb.resolver'; import { SuggestionsPageComponent } from './suggestions-page.component'; import { suggestionsPageResolver } from './suggestions-page.resolver'; diff --git a/src/app/suggestions-page/suggestions-page-routing-paths.ts b/src/app/suggestions-page/suggestions-page-routing-paths.ts index 0f3aa782d21..ddb27a4dfc1 100644 --- a/src/app/suggestions-page/suggestions-page-routing-paths.ts +++ b/src/app/suggestions-page/suggestions-page-routing-paths.ts @@ -1,4 +1,4 @@ -import { URLCombiner } from '../core/url-combiner/url-combiner'; +import { URLCombiner } from '@core/url-combiner/url-combiner'; export const SUGGESTION_MODULE_PATH = 'suggestions'; diff --git a/src/app/suggestions-page/suggestions-page.component.spec.ts b/src/app/suggestions-page/suggestions-page.component.spec.ts index e39f17c35ce..ab97d9bafbc 100644 --- a/src/app/suggestions-page/suggestions-page.component.spec.ts +++ b/src/app/suggestions-page/suggestions-page.component.spec.ts @@ -11,6 +11,9 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { TranslateModule, TranslateService, @@ -19,9 +22,6 @@ import { getTestScheduler } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { AuthService } from '../core/auth/auth.service'; -import { PaginationService } from '../core/pagination/pagination.service'; -import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; import { SuggestionApproveAndImport } from '../notifications/suggestions/list-element/suggestion-approve-and-import'; import { SuggestionEvidencesComponent } from '../notifications/suggestions/list-element/suggestion-evidences/suggestion-evidences.component'; import { SuggestionListElementComponent } from '../notifications/suggestions/list-element/suggestion-list-element.component'; diff --git a/src/app/suggestions-page/suggestions-page.component.ts b/src/app/suggestions-page/suggestions-page.component.ts index bf2a901a3be..945caa4b884 100644 --- a/src/app/suggestions-page/suggestions-page.component.ts +++ b/src/app/suggestions-page/suggestions-page.component.ts @@ -9,6 +9,24 @@ import { Router, RouterLink, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { + SortDirection, + SortOptions, +} from '@core/cache/models/sort-options.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { Suggestion } from '@core/notifications/suggestions/models/suggestion.model'; +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { redirectOn4xx } from '@core/shared/authorized.operators'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, +} from '@core/shared/operators'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { TranslateModule, TranslateService, @@ -25,24 +43,6 @@ import { tap, } from 'rxjs/operators'; -import { AuthService } from '../core/auth/auth.service'; -import { - SortDirection, - SortOptions, -} from '../core/cache/models/sort-options.model'; -import { FindListOptions } from '../core/data/find-list-options.model'; -import { PaginatedList } from '../core/data/paginated-list.model'; -import { RemoteData } from '../core/data/remote-data'; -import { Suggestion } from '../core/notifications/suggestions/models/suggestion.model'; -import { SuggestionTarget } from '../core/notifications/suggestions/models/suggestion-target.model'; -import { PaginationService } from '../core/pagination/pagination.service'; -import { redirectOn4xx } from '../core/shared/authorized.operators'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, -} from '../core/shared/operators'; -import { WorkspaceItem } from '../core/submission/models/workspaceitem.model'; -import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; import { SuggestionActionsComponent } from '../notifications/suggestions/actions/suggestion-actions.component'; import { SuggestionApproveAndImport } from '../notifications/suggestions/list-element/suggestion-approve-and-import'; import { SuggestionListElementComponent } from '../notifications/suggestions/list-element/suggestion-list-element.component'; diff --git a/src/app/suggestions-page/suggestions-page.resolver.ts b/src/app/suggestions-page/suggestions-page.resolver.ts index 1314846b6e6..1dd0dd408bf 100644 --- a/src/app/suggestions-page/suggestions-page.resolver.ts +++ b/src/app/suggestions-page/suggestions-page.resolver.ts @@ -4,13 +4,12 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; +import { SuggestionTargetDataService } from '@core/notifications/suggestions/target/suggestion-target-data.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Observable } from 'rxjs'; -import { RemoteData } from '../core/data/remote-data'; -import { SuggestionTarget } from '../core/notifications/suggestions/models/suggestion-target.model'; -import { SuggestionTargetDataService } from '../core/notifications/suggestions/target/suggestion-target-data.service'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; - /** * Method for resolving a suggestion target based on the parameters in the current route * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts index a1d6e3b27ee..6471b04104c 100644 --- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts +++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts @@ -7,12 +7,12 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { SystemWideAlertDataService } from '@core/data/system-wide-alert-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { utcToZonedTime } from 'date-fns-tz'; import { getTestScheduler } from 'jasmine-marbles'; import { TestScheduler } from 'rxjs/testing'; -import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts index 85448aed2d4..db2273fcb08 100644 --- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts +++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts @@ -9,6 +9,9 @@ import { OnInit, PLATFORM_ID, } from '@angular/core'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { SystemWideAlertDataService } from '@core/data/system-wide-alert-data.service'; +import { getAllSucceededRemoteDataPayload } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { zonedTimeToUtc } from 'date-fns-tz'; import { @@ -23,9 +26,6 @@ import { switchMap, } from 'rxjs/operators'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service'; -import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators'; import { hasValue, isNotEmpty, diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts index 5abf93d0aae..83b0437e9e2 100644 --- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts +++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts @@ -5,6 +5,8 @@ import { } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { Router } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { SystemWideAlertDataService } from '@core/data/system-wide-alert-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { utcToZonedTime, @@ -12,8 +14,6 @@ import { } from 'date-fns-tz'; import { UiSwitchModule } from 'ngx-ui-switch'; -import { RequestService } from '../../core/data/request.service'; -import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { createFailedRemoteDataObject$, diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts index 265a583e420..15dfa80017a 100644 --- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts +++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts @@ -12,6 +12,11 @@ import { Validators, } from '@angular/forms'; import { Router } from '@angular/router'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { SystemWideAlertDataService } from '@core/data/system-wide-alert-data.service'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbDatepickerModule, NgbDateStruct, @@ -35,11 +40,6 @@ import { map, } from 'rxjs/operators'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { RequestService } from '../../core/data/request.service'; -import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; import { hasValue, diff --git a/src/app/system-wide-alert/system-wide-alert-routes.ts b/src/app/system-wide-alert/system-wide-alert-routes.ts index a71007b6b3c..c6578a39958 100644 --- a/src/app/system-wide-alert/system-wide-alert-routes.ts +++ b/src/app/system-wide-alert/system-wide-alert-routes.ts @@ -1,6 +1,6 @@ import { Route } from '@angular/router'; +import { siteAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; -import { siteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component'; export const ROUTES: Route[] = [ diff --git a/src/app/system-wide-alert/system-wide-alert.model.ts b/src/app/system-wide-alert/system-wide-alert.model.ts index 73bd7610a9d..3312943ad7c 100644 --- a/src/app/system-wide-alert/system-wide-alert.model.ts +++ b/src/app/system-wide-alert/system-wide-alert.model.ts @@ -1,13 +1,13 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, } from 'cerialize'; -import { typedObject } from '../core/cache/builders/build-decorators'; -import { CacheableObject } from '../core/cache/cacheable-object.model'; -import { HALLink } from '../core/shared/hal-link.model'; -import { ResourceType } from '../core/shared/resource-type'; -import { excludeFromEquals } from '../core/utilities/equals.decorators'; import { SYSTEMWIDEALERT } from './system-wide-alert.resource-type'; /** diff --git a/src/app/system-wide-alert/system-wide-alert.resource-type.ts b/src/app/system-wide-alert/system-wide-alert.resource-type.ts index f67f00719bd..59f00d15867 100644 --- a/src/app/system-wide-alert/system-wide-alert.resource-type.ts +++ b/src/app/system-wide-alert/system-wide-alert.resource-type.ts @@ -5,6 +5,6 @@ * dependencies in webpack. */ -import { ResourceType } from '../core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; export const SYSTEMWIDEALERT = new ResourceType('systemwidealert'); diff --git a/src/app/thumbnail/themed-thumbnail.component.ts b/src/app/thumbnail/themed-thumbnail.component.ts index 54d73071bf0..6c1507ef210 100644 --- a/src/app/thumbnail/themed-thumbnail.component.ts +++ b/src/app/thumbnail/themed-thumbnail.component.ts @@ -2,9 +2,9 @@ import { Component, Input, } from '@angular/core'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; -import { RemoteData } from '../core/data/remote-data'; -import { Bitstream } from '../core/shared/bitstream.model'; import { ThemedComponent } from '../shared/theme-support/themed.component'; import { ThumbnailComponent } from './thumbnail.component'; diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts index 51d3793b6d4..7072ba8584e 100644 --- a/src/app/thumbnail/thumbnail.component.spec.ts +++ b/src/app/thumbnail/thumbnail.component.spec.ts @@ -10,14 +10,14 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { FileService } from '@core/shared/file.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { AuthService } from '../core/auth/auth.service'; -import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; -import { RemoteData } from '../core/data/remote-data'; -import { Bitstream } from '../core/shared/bitstream.model'; -import { FileService } from '../core/shared/file.service'; import { getMockThemeService } from '../shared/mocks/theme-service.mock'; import { createFailedRemoteDataObject, diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts index 295902231fb..240c8194d1a 100644 --- a/src/app/thumbnail/thumbnail.component.ts +++ b/src/app/thumbnail/thumbnail.component.ts @@ -9,16 +9,16 @@ import { SimpleChanges, WritableSignal, } from '@angular/core'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; +import { RemoteData } from '@core/data/remote-data'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { FileService } from '@core/shared/file.service'; import { TranslatePipe } from '@ngx-translate/core'; import { of } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { AuthService } from '../core/auth/auth.service'; -import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../core/data/feature-authorization/feature-id'; -import { RemoteData } from '../core/data/remote-data'; -import { Bitstream } from '../core/shared/bitstream.model'; -import { FileService } from '../core/shared/file.service'; import { hasNoValue, hasValue, diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts index 1b470b458c0..59f927ac2d4 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts @@ -12,19 +12,19 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { WorkflowActionDataService } from '@core/data/workflow-action-data.service'; +import { RouteService } from '@core/services/route.service'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; +import { RatingAdvancedWorkflowInfo } from '@core/tasks/models/rating-advanced-workflow-info.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../../core/data/request.service'; -import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; -import { RouteService } from '../../../core/services/route.service'; -import { Item } from '../../../core/shared/item.model'; -import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; -import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; -import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; -import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response'; -import { RatingAdvancedWorkflowInfo } from '../../../core/tasks/models/rating-advanced-workflow-info.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject, diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts index 1b95ffcd612..cdb9960cd74 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts @@ -12,11 +12,11 @@ import { UntypedFormGroup, Validators, } from '@angular/forms'; +import { RatingAdvancedWorkflowInfo } from '@core/tasks/models/rating-advanced-workflow-info.model'; +import { WorkflowAction } from '@core/tasks/models/workflow-action-object.model'; import { NgbRatingModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { RatingAdvancedWorkflowInfo } from '../../../core/tasks/models/rating-advanced-workflow-info.model'; -import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model'; import { ModifyItemOverviewComponent } from '../../../item-page/edit-item-page/modify-item-overview/modify-item-overview.component'; import { VarDirective } from '../../../shared/utils/var.directive'; import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component'; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts index 0916f27f168..1adf7da3c9b 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts @@ -8,17 +8,17 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { WorkflowActionDataService } from '@core/data/workflow-action-data.service'; +import { RouteService } from '@core/services/route.service'; +import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../../core/data/request.service'; -import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; -import { RouteService } from '../../../core/services/route.service'; -import { Item } from '../../../core/shared/item.model'; -import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; -import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; -import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; -import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject, diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts index f5134d19f05..f05ab2f8418 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts @@ -13,6 +13,14 @@ import { Params, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { WorkflowActionDataService } from '@core/data/workflow-action-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { RouteService } from '@core/services/route.service'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { SelectReviewerAdvancedWorkflowInfo } from '@core/tasks/models/select-reviewer-advanced-workflow-info.model'; +import { WorkflowAction } from '@core/tasks/models/workflow-action-object.model'; import { TranslateModule, TranslateService, @@ -20,14 +28,6 @@ import { import { Subscription } from 'rxjs'; import { EPersonListActionConfig } from '../../../access-control/group-registry/group-form/members-list/members-list.component'; -import { RequestService } from '../../../core/data/request.service'; -import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { RouteService } from '../../../core/services/route.service'; -import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; -import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; -import { SelectReviewerAdvancedWorkflowInfo } from '../../../core/tasks/models/select-reviewer-advanced-workflow-info.model'; -import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model'; import { ModifyItemOverviewComponent } from '../../../item-page/edit-item-page/modify-item-overview/modify-item-overview.component'; import { hasValue } from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts index 9e66703d6c9..8e27d38b213 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts @@ -23,6 +23,18 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RestResponse } from '@core/cache/response.models'; +import { + buildPaginatedList, + PaginatedList, +} from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { Group } from '@core/eperson/models/group.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { PageInfo } from '@core/shared/page-info.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -34,18 +46,6 @@ import { of, } from 'rxjs'; -import { RestResponse } from '../../../../core/cache/response.models'; -import { - buildPaginatedList, - PaginatedList, -} from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { PageInfo } from '../../../../core/shared/page-info.model'; import { ContextHelpDirective } from '../../../../shared/context-help.directive'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts index 20945e8061d..7871029c88a 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts @@ -20,6 +20,15 @@ import { Router, RouterLink, } from '@angular/router'; +import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { EPersonDataService } from '@core/eperson/eperson-data.service'; +import { GroupDataService } from '@core/eperson/group-data.service'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { EpersonDtoModel } from '@core/eperson/models/eperson-dto.model'; +import { Group } from '@core/eperson/models/group.model'; +import { PaginationService } from '@core/pagination/pagination.service'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; import { TranslateModule, TranslateService, @@ -33,15 +42,6 @@ import { EPersonListActionConfig, MembersListComponent, } from '../../../../access-control/group-registry/group-form/members-list/members-list.component'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; -import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive'; import { ContextHelpDirective } from '../../../../shared/context-help.directive'; import { hasValue } from '../../../../shared/empty.util'; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts index 0f277651e1a..45b3142daf8 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts @@ -6,16 +6,16 @@ import { } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { RequestService } from '@core/data/request.service'; +import { WorkflowActionDataService } from '@core/data/workflow-action-data.service'; +import { RouteService } from '@core/services/route.service'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; import { TranslateModule } from '@ngx-translate/core'; import { MockComponent } from 'ng-mocks'; import { of } from 'rxjs'; -import { RequestService } from '../../../core/data/request.service'; -import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; -import { RouteService } from '../../../core/services/route.service'; -import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; -import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; -import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response'; import { DSOSelectorComponent } from '../../../shared/dso-selector/dso-selector/dso-selector.component'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task-data-service.stub'; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts index d9948462ce0..c791ceff96e 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts @@ -7,18 +7,18 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { WorkflowActionDataService } from '@core/data/workflow-action-data.service'; +import { RouteService } from '@core/services/route.service'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; +import { ClaimedTaskDataService } from '@core/tasks/claimed-task-data.service'; +import { ProcessTaskResponse } from '@core/tasks/models/process-task-response'; +import { WorkflowAction } from '@core/tasks/models/workflow-action-object.model'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RequestService } from '../../../core/data/request.service'; -import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; -import { RouteService } from '../../../core/services/route.service'; -import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; -import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; -import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; -import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response'; -import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { WorkflowItemActionPageDirective } from '../../workflow-item-action-page.component'; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts index 799e06d8637..2ac5b730d2e 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts @@ -4,10 +4,10 @@ import { OnInit, } from '@angular/core'; import { Router } from '@angular/router'; +import { GenericConstructor } from '@core/shared/generic-constructor'; import { AbstractComponentLoaderComponent } from 'src/app/shared/abstract-component-loader/abstract-component-loader.component'; import { PAGE_NOT_FOUND_PATH } from '../../../app-routing-paths'; -import { GenericConstructor } from '../../../core/shared/generic-constructor'; import { hasValue } from '../../../shared/empty.util'; import { getAdvancedComponentByWorkflowTaskOption } from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator'; import { ThemeService } from '../../../shared/theme-support/theme.service'; diff --git a/src/app/workflowitems-edit-page/item-from-workflow-breadcrumb.resolver.ts b/src/app/workflowitems-edit-page/item-from-workflow-breadcrumb.resolver.ts index 1c29d6b8612..0af0a180a4f 100644 --- a/src/app/workflowitems-edit-page/item-from-workflow-breadcrumb.resolver.ts +++ b/src/app/workflowitems-edit-page/item-from-workflow-breadcrumb.resolver.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { Resolve } from '@angular/router'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { SubmissionParentBreadcrumbResolver } from '@core/submission/resolver/submission-parent-breadcrumb.resolver'; +import { SubmissionParentBreadcrumbsService } from '@core/submission/submission-parent-breadcrumb.service'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model'; -import { SubmissionObject } from '../core/submission/models/submission-object.model'; -import { SubmissionParentBreadcrumbResolver } from '../core/submission/resolver/submission-parent-breadcrumb.resolver'; -import { SubmissionParentBreadcrumbsService } from '../core/submission/submission-parent-breadcrumb.service'; -import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; /** * This class represents a resolver that retrieves the breadcrumbs of the workflow item diff --git a/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts index 9ee8eaed061..d7e18e682cb 100644 --- a/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts +++ b/src/app/workflowitems-edit-page/item-from-workflow.resolver.spec.ts @@ -1,6 +1,6 @@ +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { first } from 'rxjs/operators'; -import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { itemFromWorkflowResolver } from './item-from-workflow.resolver'; diff --git a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts index e76a147f525..ec0b5e6c2f2 100644 --- a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts +++ b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts @@ -4,13 +4,12 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { SubmissionObjectResolver } from '@core/submission/resolver/submission-object.resolver'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { Observable } from 'rxjs'; -import { RemoteData } from '../core/data/remote-data'; -import { Item } from '../core/shared/item.model'; -import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver'; -import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; - export const itemFromWorkflowResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts index 13d23224300..bb724d81333 100644 --- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts +++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts @@ -16,6 +16,10 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { TranslateLoader, TranslateModule, @@ -26,10 +30,6 @@ import { of, } from 'rxjs'; -import { RequestService } from '../core/data/request.service'; -import { RouteService } from '../core/services/route.service'; -import { WorkflowItem } from '../core/submission/models/workflowitem.model'; -import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; import { ModifyItemOverviewComponent } from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component'; import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; import { NotificationsService } from '../shared/notifications/notifications.service'; diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts b/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts index f187d26b99a..9fbd68b7ef6 100644 --- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts +++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts @@ -10,6 +10,16 @@ import { Params, Router, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; +import { Item } from '@core/shared/item.model'; +import { + getAllSucceededRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { TranslateService } from '@ngx-translate/core'; import { combineLatest, @@ -21,16 +31,6 @@ import { take, } from 'rxjs/operators'; -import { RemoteData } from '../core/data/remote-data'; -import { RequestService } from '../core/data/request.service'; -import { RouteService } from '../core/services/route.service'; -import { Item } from '../core/shared/item.model'; -import { - getAllSucceededRemoteData, - getRemoteDataPayload, -} from '../core/shared/operators'; -import { WorkflowItem } from '../core/submission/models/workflowitem.model'; -import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; import { isEmpty } from '../shared/empty.util'; import { NotificationsService } from '../shared/notifications/notifications.service'; diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts index 978ae267fdf..90ab8eaa106 100644 --- a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts +++ b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts @@ -9,16 +9,16 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../core/data/request.service'; -import { RouteService } from '../../core/services/route.service'; -import { WorkflowItem } from '../../core/submission/models/workflowitem.model'; -import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service'; import { getMockRequestService } from '../../shared/mocks/request.service.mock'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts index 67908b4fb1b..060620e2579 100644 --- a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts +++ b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts @@ -7,6 +7,12 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; +import { NoContent } from '@core/shared/NoContent.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { TranslatePipe, TranslateService, @@ -14,12 +20,6 @@ import { import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RemoteData } from '../../core/data/remote-data'; -import { RequestService } from '../../core/data/request.service'; -import { RouteService } from '../../core/services/route.service'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service'; import { ModifyItemOverviewComponent } from '../../item-page/edit-item-page/modify-item-overview/modify-item-overview.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { VarDirective } from '../../shared/utils/var.directive'; diff --git a/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts index 02754776a93..069b26ec6b3 100644 --- a/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts +++ b/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts @@ -1,6 +1,6 @@ +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { first } from 'rxjs/operators'; -import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { workflowItemPageResolver } from './workflow-item-page.resolver'; diff --git a/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts index 09aa91124b4..48a87645947 100644 --- a/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts +++ b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts @@ -4,14 +4,13 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { SUBMISSION_LINKS_TO_FOLLOW } from '@core/submission/resolver/submission-links-to-follow'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { Observable } from 'rxjs'; -import { RemoteData } from '../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; -import { WorkflowItem } from '../core/submission/models/workflowitem.model'; -import { SUBMISSION_LINKS_TO_FOLLOW } from '../core/submission/resolver/submission-links-to-follow'; -import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; - export const workflowItemPageResolver: ResolveFn> = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, diff --git a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts index af74f39f5d3..c862b369ed8 100644 --- a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts +++ b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts @@ -9,16 +9,16 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RequestService } from '../../core/data/request.service'; -import { RouteService } from '../../core/services/route.service'; -import { WorkflowItem } from '../../core/submission/models/workflowitem.model'; -import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service'; import { getMockRequestService } from '../../shared/mocks/request.service.mock'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts index 52cf7c86786..6a10e705075 100644 --- a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts +++ b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts @@ -7,15 +7,15 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RequestService } from '@core/data/request.service'; +import { RouteService } from '@core/services/route.service'; +import { WorkflowItemDataService } from '@core/submission/workflowitem-data.service'; import { TranslateModule, TranslateService, } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { RequestService } from '../../core/data/request.service'; -import { RouteService } from '../../core/services/route.service'; -import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service'; import { ModifyItemOverviewComponent } from '../../item-page/edit-item-page/modify-item-overview/modify-item-overview.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { VarDirective } from '../../shared/utils/var.directive'; diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts index 4bc074c4256..1c7fd6442d1 100644 --- a/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts +++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routes.ts @@ -1,7 +1,7 @@ import { Routes } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component'; import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component'; import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component'; diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts index 1b21174c604..8bc0049d70a 100644 --- a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts +++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts @@ -1,8 +1,9 @@ +import { URLCombiner } from '@core/url-combiner/url-combiner'; + import { getWorkflowItemModuleRoute, getWorkspaceItemModuleRoute, } from '../app-routing-paths'; -import { URLCombiner } from '../core/url-combiner/url-combiner'; export function getWorkflowItemPageRoute(wfiId: string) { return new URLCombiner(getWorkflowItemModuleRoute(), wfiId).toString(); diff --git a/src/app/workspaceitems-edit-page/item-from-workspace-breadcrumb.resolver.ts b/src/app/workspaceitems-edit-page/item-from-workspace-breadcrumb.resolver.ts index 912d578b454..6b0a14d9038 100644 --- a/src/app/workspaceitems-edit-page/item-from-workspace-breadcrumb.resolver.ts +++ b/src/app/workspaceitems-edit-page/item-from-workspace-breadcrumb.resolver.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { Resolve } from '@angular/router'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { SubmissionParentBreadcrumbResolver } from '@core/submission/resolver/submission-parent-breadcrumb.resolver'; +import { SubmissionParentBreadcrumbsService } from '@core/submission/submission-parent-breadcrumb.service'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model'; -import { SubmissionObject } from '../core/submission/models/submission-object.model'; -import { SubmissionParentBreadcrumbResolver } from '../core/submission/resolver/submission-parent-breadcrumb.resolver'; -import { SubmissionParentBreadcrumbsService } from '../core/submission/submission-parent-breadcrumb.service'; -import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; /** * This class represents a resolver that retrieves the breadcrumbs of the workspace item diff --git a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts index 0dc9ad343df..20147b7d48d 100644 --- a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts +++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.spec.ts @@ -1,6 +1,6 @@ +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { first } from 'rxjs/operators'; -import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { itemFromWorkspaceResolver } from './item-from-workspace.resolver'; diff --git a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts index 6e43fc7bea2..d616aa7bfed 100644 --- a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts +++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts @@ -4,13 +4,12 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; +import { SubmissionObjectResolver } from '@core/submission/resolver/submission-object.resolver'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { Observable } from 'rxjs'; -import { RemoteData } from '../core/data/remote-data'; -import { Item } from '../core/shared/item.model'; -import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver'; -import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; - /** * This method represents a resolver that requests a specific item before the route is activated */ diff --git a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts index 4bf44de9265..c47b3446cc5 100644 --- a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts +++ b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts @@ -1,6 +1,6 @@ +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { first } from 'rxjs/operators'; -import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { workspaceItemPageResolver } from './workspace-item-page.resolver'; diff --git a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts index e8d781b9485..63a5a3fae0b 100644 --- a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts +++ b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts @@ -4,14 +4,13 @@ import { ResolveFn, RouterStateSnapshot, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { SUBMISSION_LINKS_TO_FOLLOW } from '@core/submission/resolver/submission-links-to-follow'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { Observable } from 'rxjs'; -import { RemoteData } from '../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; -import { WorkspaceItem } from '../core/submission/models/workspaceitem.model'; -import { SUBMISSION_LINKS_TO_FOLLOW } from '../core/submission/resolver/submission-links-to-follow'; -import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; - /** * Method for resolving a workflow item based on the parameters in the current route * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts index 5baef9c8004..5fb35b7f989 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts @@ -12,6 +12,10 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RouteService } from '@core/services/route.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -19,10 +23,6 @@ import { } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { RouteService } from '../../core/services/route.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; -import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; import { RouterMock } from '../../shared/mocks/router.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts index 79d002dbecb..e8c8458a930 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts @@ -12,6 +12,16 @@ import { Params, Router, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; +import { RouteService } from '@core/services/route.service'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; +import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; +import { WorkspaceitemDataService } from '@core/submission/workspaceitem-data.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -24,16 +34,6 @@ import { take, } from 'rxjs'; -import { RemoteData } from '../../core/data/remote-data'; -import { RouteService } from '../../core/services/route.service'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from '../../core/shared/operators'; -import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; -import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; import { ModifyItemOverviewComponent } from '../../item-page/edit-item-page/modify-item-overview/modify-item-overview.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts index 35cf2521c70..53267ce3000 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts @@ -1,7 +1,7 @@ import { Route } from '@angular/router'; +import { authenticatedGuard } from '@core/auth/authenticated.guard'; +import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver'; -import { authenticatedGuard } from '../core/auth/authenticated.guard'; -import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component'; import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component'; import { itemFromWorkspaceResolver } from './item-from-workspace.resolver'; diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing-paths.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing-paths.ts index 74917b43927..cb8a4faf804 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing-paths.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing-paths.ts @@ -1,5 +1,6 @@ +import { URLCombiner } from '@core/url-combiner/url-combiner'; + import { getWorkspaceItemModuleRoute } from '../app-routing-paths'; -import { URLCombiner } from '../core/url-combiner/url-combiner'; export function getWorkspaceItemViewRoute(wfiId: string) { return new URLCombiner(getWorkspaceItemModuleRoute(), wfiId, WORKSPACE_ITEM_VIEW_PATH).toString(); diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts index 3ae59185581..a2f0792eae9 100644 --- a/src/config/app-config.interface.ts +++ b/src/config/app-config.interface.ts @@ -3,10 +3,10 @@ import { makeStateKey, Type, } from '@angular/core'; +import { HALDataService } from '@core/data/base/hal-data-service.interface'; import { AccessibilitySettingsConfig } from '../app/accessibility/accessibility-settings.config'; import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model'; -import { HALDataService } from '../app/core/data/base/hal-data-service.interface'; import { LiveRegionConfig } from '../app/shared/live-region/live-region.config'; import { ActuatorsConfig } from './actuators.config'; import { AuthConfig } from './auth-config.interfaces'; diff --git a/src/config/auto-sync-config.interface.ts b/src/config/auto-sync-config.interface.ts index b737314f56c..f6688ed12a1 100644 --- a/src/config/auto-sync-config.interface.ts +++ b/src/config/auto-sync-config.interface.ts @@ -1,4 +1,4 @@ -import { RestRequestMethod } from '../app/core/data/rest-request-method'; +import { RestRequestMethod } from '@core/data/rest-request-method'; /** * The number of seconds between automatic syncs to the diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index f6421d85a2e..9bdde142a3e 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -1,6 +1,7 @@ +import { RestRequestMethod } from '@core/data/rest-request-method'; + import { AccessibilitySettingsConfig } from '../app/accessibility/accessibility-settings.config'; import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model'; -import { RestRequestMethod } from '../app/core/data/rest-request-method'; import { LiveRegionConfig } from '../app/shared/live-region/live-region.config'; import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type'; import { ActuatorsConfig } from './actuators.config'; diff --git a/src/config/theme.model.spec.ts b/src/config/theme.model.spec.ts index 4c053bebb1b..109e87aedd6 100644 --- a/src/config/theme.model.spec.ts +++ b/src/config/theme.model.spec.ts @@ -1,14 +1,14 @@ import { TestBed } from '@angular/core/testing'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { Collection } from '@core/shared/collection.model'; +import { COLLECTION } from '@core/shared/collection.resource-type'; +import { Community } from '@core/shared/community.model'; +import { COMMUNITY } from '@core/shared/community.resource-type'; +import { Item } from '@core/shared/item.model'; +import { ITEM } from '@core/shared/item.resource-type'; import { getCollectionModuleRoute } from '../app/collection-page/collection-page-routing-paths'; import { getCommunityModuleRoute } from '../app/community-page/community-page-routing-paths'; -import { ConfigurationDataService } from '../app/core/data/configuration-data.service'; -import { Collection } from '../app/core/shared/collection.model'; -import { COLLECTION } from '../app/core/shared/collection.resource-type'; -import { Community } from '../app/core/shared/community.model'; -import { COMMUNITY } from '../app/core/shared/community.resource-type'; -import { Item } from '../app/core/shared/item.model'; -import { ITEM } from '../app/core/shared/item.resource-type'; import { getItemModuleRoute } from '../app/item-page/item-page-routing-paths'; import { HandleService } from '../app/shared/handle.service'; import { ConfigurationDataServiceStub } from '../app/shared/testing/configuration-data.service.stub'; diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index 500ec0f6d4f..eeb6cfadd15 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -1,7 +1,7 @@ // This configuration is only used for unit tests, end-to-end tests use environment.production.ts +import { RestRequestMethod } from '@core/data/rest-request-method'; import { BuildConfig } from 'src/config/build-config.interface'; -import { RestRequestMethod } from '../app/core/data/rest-request-method'; import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type'; export const environment: BuildConfig = { diff --git a/src/modules/app/browser-app.config.ts b/src/modules/app/browser-app.config.ts index 7fee5f2aa0d..b02997e8325 100644 --- a/src/modules/app/browser-app.config.ts +++ b/src/modules/app/browser-app.config.ts @@ -16,6 +16,27 @@ import { } from '@angular/core'; import { provideClientHydration } from '@angular/platform-browser'; import { provideAnimations } from '@angular/platform-browser/animations'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthRequestService } from '@core/auth/auth-request.service'; +import { BrowserAuthRequestService } from '@core/auth/browser-auth-request.service'; +import { coreEffects } from '@core/core.effects'; +import { coreReducers } from '@core/core.reducers'; +import { CoreState } from '@core/core-state.model'; +import { LocaleService } from '@core/locale/locale.service'; +import { BrowserReferrerService } from '@core/services/browser.referrer.service'; +import { + BrowserHardRedirectService, + locationProvider, + LocationToken, +} from '@core/services/browser-hard-redirect.service'; +import { ClientCookieService } from '@core/services/client-cookie.service'; +import { CookieService } from '@core/services/cookie.service'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { ReferrerService } from '@core/services/referrer.service'; +import { ClientMathService } from '@core/shared/client-math.service'; +import { MathService } from '@core/shared/math.service'; +import { BrowserXSRFService } from '@core/xsrf/browser-xsrf.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { EffectsModule } from '@ngrx/effects'; import { Action, @@ -39,27 +60,6 @@ import { import { commonAppConfig } from '../../app/app.config'; import { storeModuleConfig } from '../../app/app.reducer'; -import { AuthService } from '../../app/core/auth/auth.service'; -import { AuthRequestService } from '../../app/core/auth/auth-request.service'; -import { BrowserAuthRequestService } from '../../app/core/auth/browser-auth-request.service'; -import { coreEffects } from '../../app/core/core.effects'; -import { coreReducers } from '../../app/core/core.reducers'; -import { CoreState } from '../../app/core/core-state.model'; -import { LocaleService } from '../../app/core/locale/locale.service'; -import { BrowserReferrerService } from '../../app/core/services/browser.referrer.service'; -import { - BrowserHardRedirectService, - locationProvider, - LocationToken, -} from '../../app/core/services/browser-hard-redirect.service'; -import { ClientCookieService } from '../../app/core/services/client-cookie.service'; -import { CookieService } from '../../app/core/services/cookie.service'; -import { HardRedirectService } from '../../app/core/services/hard-redirect.service'; -import { ReferrerService } from '../../app/core/services/referrer.service'; -import { ClientMathService } from '../../app/core/shared/client-math.service'; -import { MathService } from '../../app/core/shared/math.service'; -import { BrowserXSRFService } from '../../app/core/xsrf/browser-xsrf.service'; -import { XSRFService } from '../../app/core/xsrf/xsrf.service'; import { BrowserOrejimeService } from '../../app/shared/cookies/browser-orejime.service'; import { OrejimeService } from '../../app/shared/cookies/orejime.service'; import { MissingTranslationHelper } from '../../app/shared/translate/missing-translation.helper'; diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts index 88fbc1531bf..76da9246045 100644 --- a/src/modules/app/browser-init.service.ts +++ b/src/modules/app/browser-init.service.ts @@ -14,6 +14,13 @@ import { NavigationStart, Router, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { coreSelector } from '@core/core.selectors'; +import { RequestService } from '@core/data/request.service'; +import { RootDataService } from '@core/data/root-data.service'; +import { LocaleService } from '@core/locale/locale.service'; +import { HeadTagService } from '@core/metadata/head-tag.service'; +import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; import { @@ -30,13 +37,6 @@ import { import { logStartupMessage } from '../../../startup-message'; import { AppState } from '../../app/app.reducer'; import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service'; -import { AuthService } from '../../app/core/auth/auth.service'; -import { coreSelector } from '../../app/core/core.selectors'; -import { RequestService } from '../../app/core/data/request.service'; -import { RootDataService } from '../../app/core/data/root-data.service'; -import { LocaleService } from '../../app/core/locale/locale.service'; -import { HeadTagService } from '../../app/core/metadata/head-tag.service'; -import { HALEndpointService } from '../../app/core/shared/hal-endpoint.service'; import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service'; import { InitService } from '../../app/init.service'; import { OrejimeService } from '../../app/shared/cookies/orejime.service'; diff --git a/src/modules/app/server-app.config.ts b/src/modules/app/server-app.config.ts index fc23b1816a0..c30d1ef9d7a 100644 --- a/src/modules/app/server-app.config.ts +++ b/src/modules/app/server-app.config.ts @@ -13,6 +13,27 @@ import { } from '@angular/core'; import { provideAnimations } from '@angular/platform-browser/animations'; import { provideServerRendering } from '@angular/platform-server'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthRequestService } from '@core/auth/auth-request.service'; +import { ServerAuthService } from '@core/auth/server-auth.service'; +import { ServerAuthRequestService } from '@core/auth/server-auth-request.service'; +import { coreEffects } from '@core/core.effects'; +import { coreReducers } from '@core/core.reducers'; +import { CoreState } from '@core/core-state.model'; +import { ForwardClientIpInterceptor } from '@core/forward-client-ip/forward-client-ip.interceptor'; +import { LocaleService } from '@core/locale/locale.service'; +import { ServerLocaleService } from '@core/locale/server-locale.service'; +import { CookieService } from '@core/services/cookie.service'; +import { HardRedirectService } from '@core/services/hard-redirect.service'; +import { ReferrerService } from '@core/services/referrer.service'; +import { ServerReferrerService } from '@core/services/server.referrer.service'; +import { ServerCookieService } from '@core/services/server-cookie.service'; +import { ServerHardRedirectService } from '@core/services/server-hard-redirect.service'; +import { ServerXhrService } from '@core/services/server-xhr.service'; +import { MathService } from '@core/shared/math.service'; +import { ServerMathService } from '@core/shared/server-math.service'; +import { ServerXSRFService } from '@core/xsrf/server-xsrf.service'; +import { XSRFService } from '@core/xsrf/xsrf.service'; import { EffectsModule } from '@ngrx/effects'; import { Action, @@ -32,27 +53,6 @@ import { MatomoTracker } from 'ngx-matomo-client'; import { commonAppConfig } from '../../app/app.config'; import { storeModuleConfig } from '../../app/app.reducer'; -import { AuthService } from '../../app/core/auth/auth.service'; -import { AuthRequestService } from '../../app/core/auth/auth-request.service'; -import { ServerAuthService } from '../../app/core/auth/server-auth.service'; -import { ServerAuthRequestService } from '../../app/core/auth/server-auth-request.service'; -import { coreEffects } from '../../app/core/core.effects'; -import { coreReducers } from '../../app/core/core.reducers'; -import { CoreState } from '../../app/core/core-state.model'; -import { ForwardClientIpInterceptor } from '../../app/core/forward-client-ip/forward-client-ip.interceptor'; -import { LocaleService } from '../../app/core/locale/locale.service'; -import { ServerLocaleService } from '../../app/core/locale/server-locale.service'; -import { CookieService } from '../../app/core/services/cookie.service'; -import { HardRedirectService } from '../../app/core/services/hard-redirect.service'; -import { ReferrerService } from '../../app/core/services/referrer.service'; -import { ServerReferrerService } from '../../app/core/services/server.referrer.service'; -import { ServerCookieService } from '../../app/core/services/server-cookie.service'; -import { ServerHardRedirectService } from '../../app/core/services/server-hard-redirect.service'; -import { ServerXhrService } from '../../app/core/services/server-xhr.service'; -import { MathService } from '../../app/core/shared/math.service'; -import { ServerMathService } from '../../app/core/shared/server-math.service'; -import { ServerXSRFService } from '../../app/core/xsrf/server-xsrf.service'; -import { XSRFService } from '../../app/core/xsrf/xsrf.service'; import { OrejimeService } from '../../app/shared/cookies/orejime.service'; import { ServerOrejimeService } from '../../app/shared/cookies/server-orejime.service'; import { AngularticsProviderMock } from '../../app/shared/mocks/angulartics-provider.service.mock'; diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts index 27cc0fcf46e..0bc8aa46f91 100644 --- a/src/modules/app/server-init.service.ts +++ b/src/modules/app/server-init.service.ts @@ -10,6 +10,8 @@ import { Injectable, TransferState, } from '@angular/core'; +import { LocaleService } from '@core/locale/locale.service'; +import { HeadTagService } from '@core/metadata/head-tag.service'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; import { lastValueFrom } from 'rxjs'; @@ -17,8 +19,6 @@ import { take } from 'rxjs/operators'; import { AppState } from '../../app/app.reducer'; import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service'; -import { LocaleService } from '../../app/core/locale/locale.service'; -import { HeadTagService } from '../../app/core/metadata/head-tag.service'; import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service'; import { InitService } from '../../app/init.service'; import { diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts index 4438a2c1d22..a5baab9a9f1 100644 --- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts +++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts @@ -1,10 +1,10 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../../../app/core/shared/context.model'; -import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model'; import { JournalIssueComponent as BaseComponent } from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component'; import { GenericItemPageFieldComponent } from '../../../../../../../app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ThemedItemPageTitleFieldComponent } from '../../../../../../../app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts index 130bd7b9ee6..b7c35f76092 100644 --- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts +++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts @@ -1,10 +1,10 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../../../app/core/shared/context.model'; -import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model'; import { JournalVolumeComponent as BaseComponent } from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component'; import { GenericItemPageFieldComponent } from '../../../../../../../app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ThemedItemPageTitleFieldComponent } from '../../../../../../../app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts index 0094ef55dd5..bef829ed0b3 100644 --- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts +++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts @@ -1,10 +1,10 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../../../app/core/shared/context.model'; -import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model'; import { JournalComponent as BaseComponent } from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component'; import { GenericItemPageFieldComponent } from '../../../../../../../app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ThemedItemPageTitleFieldComponent } from '../../../../../../../app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; diff --git a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts index ea1ecbc64f4..0c5d9385836 100644 --- a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts +++ b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts @@ -1,6 +1,8 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { GenericItemPageFieldComponent } from 'src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { ThemedItemPageTitleFieldComponent } from 'src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component'; @@ -11,8 +13,6 @@ import { MetadataFieldWrapperComponent } from 'src/app/shared/metadata-field-wra import { ThemedResultsBackButtonComponent } from 'src/app/shared/results-back-button/themed-results-back-button.component'; import { ThemedThumbnailComponent } from 'src/app/thumbnail/themed-thumbnail.component'; -import { Context } from '../../../../../../../app/core/shared/context.model'; -import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model'; import { PersonComponent as BaseComponent } from '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component'; import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts index 02d00262618..e7bdfa34d79 100644 --- a/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts +++ b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts @@ -4,10 +4,10 @@ import { Component, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../../../app/core/shared/context.model'; -import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model'; import { CollectionsComponent } from '../../../../../../../app/item-page/field-components/collections/collections.component'; import { ThemedMediaViewerComponent } from '../../../../../../../app/item-page/media-viewer/themed-media-viewer.component'; import { MiradorViewerComponent } from '../../../../../../../app/item-page/mirador-viewer/mirador-viewer.component'; diff --git a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts index 381cdf7b2f1..a4118c3aaae 100644 --- a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts +++ b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts @@ -4,11 +4,11 @@ import { Component, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Context } from '@core/shared/context.model'; +import { Item } from '@core/shared/item.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../../../app/core/shared/context.model'; -import { Item } from '../../../../../../../app/core/shared/item.model'; -import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model'; import { CollectionsComponent } from '../../../../../../../app/item-page/field-components/collections/collections.component'; import { ThemedMediaViewerComponent } from '../../../../../../../app/item-page/media-viewer/themed-media-viewer.component'; import { MiradorViewerComponent } from '../../../../../../../app/item-page/mirador-viewer/mirador-viewer.component'; diff --git a/src/themes/custom/app/search-page/configuration-search-page.component.ts b/src/themes/custom/app/search-page/configuration-search-page.component.ts index 5470c56c0cf..7e3ea46d90b 100644 --- a/src/themes/custom/app/search-page/configuration-search-page.component.ts +++ b/src/themes/custom/app/search-page/configuration-search-page.component.ts @@ -6,9 +6,9 @@ import { ChangeDetectionStrategy, Component, } from '@angular/core'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; -import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-configuration.service'; import { ConfigurationSearchPageComponent as BaseComponent } from '../../../../app/search-page/configuration-search-page.component'; import { pushInOut } from '../../../../app/shared/animations/push'; diff --git a/src/themes/custom/app/search-page/search-page.component.ts b/src/themes/custom/app/search-page/search-page.component.ts index 016b92910ab..6401617d7bb 100644 --- a/src/themes/custom/app/search-page/search-page.component.ts +++ b/src/themes/custom/app/search-page/search-page.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from 'src/app/my-dspace-page/my-dspace-configuration.service'; -import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service'; import { SearchPageComponent as BaseComponent } from '../../../../app/search-page/search-page.component'; import { ThemedSearchComponent } from '../../../../app/shared/search/themed-search.component'; diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts index e97490d7030..06a4b551351 100644 --- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts +++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts @@ -1,8 +1,8 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; -import { SearchConfigurationService } from '../../../../../../../../../app/core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-configuration.service'; import { fadeIn, diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts index ad8d65430e2..7bc603c5c7a 100644 --- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts +++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts @@ -1,9 +1,9 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { SearchConfigurationService } from '../../../../../../../../../app/core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-configuration.service'; import { DsDynamicLookupRelationSearchTabComponent as BaseComponent } from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component'; import { ThemedSearchComponent } from '../../../../../../../../../app/shared/search/themed-search.component'; diff --git a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts index 544987eb599..e5473c23f7c 100644 --- a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts +++ b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts @@ -1,10 +1,10 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { BrowseEntry } from '@core/shared/browse-entry.model'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { BrowseEntry } from '../../../../../../app/core/shared/browse-entry.model'; -import { Context } from '../../../../../../app/core/shared/context.model'; -import { ViewMode } from '../../../../../../app/core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator'; import { BrowseEntryListElementComponent as BaseComponent } from '../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component'; diff --git a/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts index 9801bece65a..8f85bd5a5fe 100644 --- a/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts +++ b/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts @@ -1,9 +1,9 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Collection } from '@core/shared/collection.model'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Collection } from '../../../../../../app/core/shared/collection.model'; -import { Context } from '../../../../../../app/core/shared/context.model'; -import { ViewMode } from '../../../../../../app/core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator'; import { CollectionListElementComponent as BaseComponent } from '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component'; diff --git a/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts index 7e32907cb12..06fcfb5e328 100644 --- a/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts +++ b/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts @@ -1,9 +1,9 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Community } from '@core/shared/community.model'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Community } from '../../../../../../app/core/shared/community.model'; -import { Context } from '../../../../../../app/core/shared/context.model'; -import { ViewMode } from '../../../../../../app/core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator'; import { CommunityListElementComponent as BaseComponent } from '../../../../../../app/shared/object-list/community-list-element/community-list-element.component'; diff --git a/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts index db6f4ae5c08..bd38a36e281 100644 --- a/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts +++ b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts @@ -4,9 +4,9 @@ import { } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; -import { Context } from '../../../../../../../../../app/core/shared/context.model'; -import { ViewMode } from '../../../../../../../../../app/core/shared/view-mode.model'; import { ThemedBadgesComponent } from '../../../../../../../../../app/shared/object-collection/shared/badges/themed-badges.component'; import { ItemSearchResult } from '../../../../../../../../../app/shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts index d88fb9f9b73..70001d69a6d 100644 --- a/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts +++ b/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts @@ -3,10 +3,10 @@ import { NgClass, } from '@angular/common'; import { Component } from '@angular/core'; +import { Context } from '@core/shared/context.model'; +import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from '../../../../../../../../app/core/shared/context.model'; -import { ViewMode } from '../../../../../../../../app/core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../../../../../app/shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator'; import { PublicationSidebarSearchListElementComponent as BaseComponent } from '../../../../../../../../app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component'; diff --git a/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts index a91183d02ee..d3dabda39fe 100644 --- a/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts +++ b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts @@ -1,10 +1,10 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service'; import { SearchFilterComponent } from '../../../../../../app/shared/search/search-filters/search-filter/search-filter.component'; import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/shared/search/search-filters/search-filters.component'; diff --git a/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts b/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts index 12522f21a18..86de74b1961 100644 --- a/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts +++ b/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; -import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service'; import { PageSizeSelectorComponent } from '../../../../../../app/shared/page-size-selector/page-size-selector.component'; import { SearchSettingsComponent as BaseComponent } from '../../../../../../app/shared/search/search-settings/search-settings.component'; diff --git a/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts index d1f8b33a90e..299e0a1af7e 100644 --- a/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts +++ b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts @@ -1,8 +1,8 @@ import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; +import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { TranslateModule } from '@ngx-translate/core'; -import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service'; import { AdvancedSearchComponent } from '../../../../../../app/shared/search/advanced-search/advanced-search.component'; import { ThemedSearchFiltersComponent } from '../../../../../../app/shared/search/search-filters/themed-search-filters.component'; diff --git a/tsconfig.json b/tsconfig.json index 2603ba05efc..a9ca92d7462 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -40,7 +40,10 @@ "jasmine" ], "useDefineForClassFields": false, - "useUnknownInCatchVariables": true + "useUnknownInCatchVariables": true, + "paths": { + "@core/*": ["src/app/core/*"] + } }, "angularCompilerOptions": { "fullTemplateTypeCheck": true, @@ -55,5 +58,5 @@ }, "exclude": [ "cypress.config.ts" - ] + ], } From b82aa790f87cdddd3bc52b2618f2fda1a8eca80f Mon Sep 17 00:00:00 2001 From: FrancescoMolinaro Date: Wed, 23 Jul 2025 14:55:14 +0200 Subject: [PATCH 02/52] [DURACOM-327] move remaining data services, resource types and models inside core, fix paths with /src/app/core --- cypress/support/commands.ts | 4 +-- cypress/support/e2e.ts | 2 +- .../admin-notify-dashboard.component.spec.ts | 4 +-- .../admin-notify-detail-modal.component.ts | 2 +- ...min-notify-search-result.component.spec.ts | 8 +++--- .../admin-notify-search-result.component.ts | 8 +++--- .../filtered-collections.component.spec.ts | 4 +-- .../filtered-collections.component.ts | 6 ++-- ...iltered-items-export-csv.component.spec.ts | 2 +- .../filtered-items/filtered-items-model.ts | 2 +- .../filtered-items.component.ts | 28 +++++++++---------- ...ervision-order-group-selector.component.ts | 2 +- ...itstream-page-authorizations.guard.spec.ts | 6 ++-- .../browse-by-metadata.component.spec.ts | 2 +- src/app/core/cache/builders/link.service.ts | 6 ++-- src/app/core/data-services-map.ts | 28 +++++++++++-------- .../core/data/access-status-data.service.ts | 2 +- .../ldn-service-form.component.ts | 2 +- .../ldn-services-directory.component.ts | 4 +-- ...dmin-notify-message-search-result.model.ts | 2 +- .../data}/admin-notify-message.model.ts | 4 +-- ...dmin-notify-messages-data.service.spec.ts} | 16 +++++------ .../admin-notify-messages-data.service.ts} | 8 +++--- src/app/core/data/identifier-data.service.ts | 2 +- .../data/processes/script-data.service.ts | 2 +- .../data}/subscriptions-data.service.spec.ts | 16 +++++------ .../data}/subscriptions-data.service.ts | 10 +++---- .../data/system-wide-alert-data.service.ts | 2 +- src/app/core/lazy-data-service.ts | 2 +- src/app/core/provide-core.ts | 10 +++---- .../shared}/access-status.model.ts | 10 +++---- .../shared}/access-status.resource-type.ts | 2 +- .../admin-notify-message.resource-type.ts | 0 src/app/core/shared/bitstream.model.ts | 4 +-- .../shared}/duplicate-data/duplicate.model.ts | 0 .../duplicate-data/duplicate.resource-type.ts | 2 +- .../identifier-data.model.ts | 10 +++---- .../identifier-data.resource-type.ts | 2 +- .../identifiers-data}/identifier.model.ts | 0 src/app/core/shared/item.model.ts | 8 +++--- .../notify-requests-status.resource-type.ts | 0 .../shared}/process.resource-type.ts | 0 .../scripts/script-parameter-type.model.ts | 0 .../shared}/scripts/script-parameter.model.ts | 0 .../shared}/scripts/script.model.ts | 0 .../shared}/scripts/script.resource-type.ts | 0 .../shared}/subscription.model.ts | 0 .../shared}/subscription.resource-type.ts | 0 .../shared}/system-wide-alert.model.ts | 0 .../system-wide-alert.resource-type.ts | 0 .../workspaceitem-section-duplicates.model.ts | 2 +- ...workspaceitem-section-identifiers.model.ts | 2 +- .../submission-duplicate-data.service.ts | 2 +- .../dso-edit-metadata.component.ts | 6 ++-- .../external-log-in.methods-decorator.ts | 2 +- .../orcid-confirmation.component.spec.ts | 2 +- .../services/external-login.service.ts | 6 ++-- .../item-page/alerts/item-alerts.component.ts | 2 +- .../item-edit-bitstream-bundle.component.ts | 6 ++-- .../item-page-delete.guard.spec.ts | 6 ++-- ...tem-page-edit-authorizations.guard.spec.ts | 6 ++-- .../item-page-move.guard.spec.ts | 6 ++-- .../item-page-private.guard.spec.ts | 6 ++-- .../item-register-doi.component.ts | 2 +- .../item-status/item-status.component.ts | 4 +-- .../media-viewer-video.component.ts | 2 +- ...em-page-cc-license-field.component.spec.ts | 14 +++++----- .../item-page-cc-license-field.component.ts | 14 +++++----- .../item-page/simple/item-page.component.ts | 2 +- .../untyped-item.component.spec.ts | 2 +- .../notify-requests-status.component.spec.ts | 2 +- .../notify-requests-status.model.ts | 2 +- .../objectnotfound.component.spec.ts | 2 +- .../objectnotfound.component.ts | 2 +- ...-qa-events-notifications.component.spec.ts | 2 +- ...space-qa-events-notifications.component.ts | 2 +- .../ePerson-data.component.spec.ts | 2 +- ...quality-assurance-events.component.spec.ts | 4 +-- ...quality-assurance-topics.component.spec.ts | 2 +- .../suggestion-list-element.component.ts | 2 +- .../targets/suggestion-targets.effects.ts | 8 +++--- .../form/process-form.component.spec.ts | 4 +-- .../form/process-form.component.ts | 4 +-- .../parameter-select.component.spec.ts | 4 +-- .../parameter-select.component.ts | 2 +- .../parameter-value-input.component.spec.ts | 4 +-- .../parameter-value-input.component.ts | 4 +-- .../process-parameters.component.spec.ts | 4 +-- .../process-parameters.component.ts | 4 +-- .../script-help/script-help.component.spec.ts | 6 ++-- .../form/script-help/script-help.component.ts | 5 ++-- .../scripts-select.component.spec.ts | 2 +- .../scripts-select.component.ts | 2 +- .../new/new-process.component.spec.ts | 4 +-- .../process-page/new/new-process.component.ts | 2 +- .../table/process-overview-table.component.ts | 2 +- .../process-page/processes/process.model.ts | 6 ++-- ...ntrol-select-bitstreams-modal.component.ts | 8 +++--- .../dso-edit-menu/dso-edit-menu.component.ts | 2 +- .../eperson-group-list.component.spec.ts | 2 +- .../eperson-group-list.component.ts | 7 ++--- .../dynamic-scrollable-dropdown.component.ts | 7 ++--- .../vocabulary-treeview.component.ts | 2 +- .../google-recaptcha.component.ts | 6 ++-- .../shared/menu/providers/dso-option.menu.ts | 2 +- ...med-task-actions-decline-task.component.ts | 2 +- .../workspaceitem-actions.component.ts | 2 +- .../notification-box.component.ts | 2 +- .../access-status-badge.component.spec.ts | 4 +-- .../access-status-badge.component.ts | 8 +++--- .../shared/badges/badges.component.ts | 2 +- .../my-dspace-status-badge.component.ts | 2 +- ...themed-my-dspace-status-badge.component.ts | 2 +- .../shared/badges/themed-badges.component.ts | 2 +- .../tabulatable-objects.decorator.spec.ts | 2 +- .../tabulatable-objects.decorator.ts | 2 +- ...-search-result-detail-element.component.ts | 2 +- ...ch-result-detail-element.component.spec.ts | 2 +- ...-search-result-detail-element.component.ts | 2 +- ...-search-result-detail-element.component.ts | 2 +- ...ch-result-detail-element.component.spec.ts | 2 +- .../object-geospatial-map.component.ts | 2 +- .../browse-entry-list-element.component.ts | 2 +- .../identifier-data.component.ts | 4 +-- ...ed-search-result-list-element.component.ts | 2 +- ...ed-search-result-list-element.component.ts | 2 +- .../item-list-preview.component.ts | 4 +-- .../themed-item-list-preview.component.ts | 4 +-- ...ol-search-result-list-element.component.ts | 2 +- .../resource-policy-target.resolver.ts | 7 ++--- .../search-filter.component.spec.ts | 2 +- .../search-label-loader.component.ts | 2 +- .../search/search-result-element-decorator.ts | 4 +-- .../subscription-modal.component.spec.ts | 2 +- .../subscription-modal.component.ts | 4 +-- .../subscription-view.component.spec.ts | 4 +-- .../subscription-view.component.ts | 4 +-- .../section-duplicates.component.spec.ts | 4 +-- .../section-upload-file-edit.component.ts | 4 +-- .../themed-section-upload-file.component.ts | 2 +- .../upload/section-upload.component.ts | 2 +- .../upload/section-upload.service.spec.ts | 4 +-- .../sections/upload/section-upload.service.ts | 6 ++-- .../subscriptions-page.component.spec.ts | 2 +- .../subscriptions-page.component.ts | 4 +-- ...system-wide-alert-banner.component.spec.ts | 2 +- .../system-wide-alert-banner.component.ts | 2 +- .../system-wide-alert-form.component.spec.ts | 2 +- .../system-wide-alert-form.component.ts | 2 +- src/config/app-config.interface.ts | 5 +--- src/config/default-app-config.ts | 3 +- 151 files changed, 290 insertions(+), 298 deletions(-) rename src/app/{admin/admin-notify-dashboard/models => core/data}/admin-notify-message-search-result.model.ts (64%) rename src/app/{admin/admin-notify-dashboard/models => core/data}/admin-notify-message.model.ts (94%) rename src/app/{admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts => core/data/admin-notify-messages-data.service.spec.ts} (86%) rename src/app/{admin/admin-notify-dashboard/services/admin-notify-messages.service.ts => core/data/admin-notify-messages-data.service.ts} (93%) rename src/app/{shared/subscriptions => core/data}/subscriptions-data.service.spec.ts (86%) rename src/app/{shared/subscriptions => core/data}/subscriptions-data.service.ts (95%) rename src/app/{shared/object-collection/shared/badges/access-status-badge => core/shared}/access-status.model.ts (63%) rename src/app/{shared/object-collection/shared/badges/access-status-badge => core/shared}/access-status.resource-type.ts (74%) rename src/app/{admin/admin-notify-dashboard/models => core/shared}/admin-notify-message.resource-type.ts (100%) rename src/app/{shared/object-list => core/shared}/duplicate-data/duplicate.model.ts (100%) rename src/app/{shared/object-list => core/shared}/duplicate-data/duplicate.resource-type.ts (75%) rename src/app/{shared/object-list/identifier-data => core/shared/identifiers-data}/identifier-data.model.ts (61%) rename src/app/{shared/object-list/identifier-data => core/shared/identifiers-data}/identifier-data.resource-type.ts (74%) rename src/app/{shared/object-list/identifier-data => core/shared/identifiers-data}/identifier.model.ts (100%) rename src/app/{item-page/simple/notify-requests-status => core/shared}/notify-requests-status.resource-type.ts (100%) rename src/app/{process-page/processes => core/shared}/process.resource-type.ts (100%) rename src/app/{process-page => core/shared}/scripts/script-parameter-type.model.ts (100%) rename src/app/{process-page => core/shared}/scripts/script-parameter.model.ts (100%) rename src/app/{process-page => core/shared}/scripts/script.model.ts (100%) rename src/app/{process-page => core/shared}/scripts/script.resource-type.ts (100%) rename src/app/{shared/subscriptions/models => core/shared}/subscription.model.ts (100%) rename src/app/{shared/subscriptions/models => core/shared}/subscription.resource-type.ts (100%) rename src/app/{system-wide-alert => core/shared}/system-wide-alert.model.ts (100%) rename src/app/{system-wide-alert => core/shared}/system-wide-alert.resource-type.ts (100%) diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index 8cc2c5c721b..6f6553bb46a 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -6,11 +6,11 @@ import { AuthTokenInfo, TOKENITEM, -} from 'src/app/core/auth/models/auth-token-info.model'; +} from '@core/auth/models/auth-token-info.model'; import { DSPACE_XSRF_COOKIE, XSRF_REQUEST_HEADER, -} from 'src/app/core/xsrf/xsrf.constants'; +} from '@core/xsrf/xsrf.constants'; import { v4 as uuidv4 } from 'uuid'; // Declare Cypress namespace to help with Intellisense & code completion in IDEs diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts index 64aa1f7b7ce..146d732fad3 100644 --- a/cypress/support/e2e.ts +++ b/cypress/support/e2e.ts @@ -19,7 +19,7 @@ import './commands'; // https://github.com/component-driven/cypress-axe import 'cypress-axe'; -import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants'; +import { DSPACE_XSRF_COOKIE } from '@core/xsrf/xsrf.constants'; // Runs once before all tests before(() => { diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts index 4283f6f6d0d..e8d9844e3d0 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts @@ -4,6 +4,8 @@ import { TestBed, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { AdminNotifyMessage } from '@core/data/admin-notify-message.model'; +import { AdminNotifySearchResult } from '@core/data/admin-notify-message-search-result.model'; import { buildPaginatedList } from '@core/data/paginated-list.model'; import { SearchService } from '@core/shared/search/search.service'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; @@ -15,8 +17,6 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.util import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component'; import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component'; -import { AdminNotifyMessage } from './models/admin-notify-message.model'; -import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model'; describe('AdminNotifyDashboardComponent', () => { let component: AdminNotifyDashboardComponent; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts index 1bd5eb9ec77..737f8a7cafd 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts @@ -5,6 +5,7 @@ import { Input, Output, } from '@angular/core'; +import { AdminNotifyMessage } from '@core/data/admin-notify-message.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -13,7 +14,6 @@ import { import { fadeIn } from '../../../shared/animations/fade'; import { MissingTranslationHelper } from '../../../shared/translate/missing-translation.helper'; -import { AdminNotifyMessage } from '../models/admin-notify-message.model'; @Component({ selector: 'ds-admin-notify-detail-modal', diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts index 18a837b4737..f0719083aa1 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts @@ -5,6 +5,8 @@ import { TestBed, } from '@angular/core/testing'; import { RouterModule } from '@angular/router'; +import { AdminNotifyMessage } from '@core/data/admin-notify-message.model'; +import { AdminNotifyMessagesDataService } from '@core/data/admin-notify-messages-data.service'; import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; @@ -14,8 +16,6 @@ import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configu import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component'; import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component'; import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component'; -import { AdminNotifyMessage } from '../models/admin-notify-message.model'; -import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service'; import { AdminNotifySearchResultComponent } from './admin-notify-search-result.component'; export const mockAdminNotifyMessages = [ @@ -78,7 +78,7 @@ describe('AdminNotifySearchResultComponent', () => { let component: AdminNotifySearchResultComponent; let fixture: ComponentFixture; - let adminNotifyMessageService: AdminNotifyMessagesService; + let adminNotifyMessageService: AdminNotifyMessagesDataService; let searchConfigService: SearchConfigurationService; let modalService: NgbModal; @@ -99,7 +99,7 @@ describe('AdminNotifySearchResultComponent', () => { TranslateModule.forRoot(), ], providers: [ - { provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService }, + { provide: AdminNotifyMessagesDataService, useValue: adminNotifyMessageService }, DatePipe, ], schemas: [CUSTOM_ELEMENTS_SCHEMA], diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts index e4314e16165..8c341a17ec9 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts @@ -9,6 +9,9 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { AdminNotifyMessage } from '@core/data/admin-notify-message.model'; +import { AdminNotifySearchResult } from '@core/data/admin-notify-message-search-result.model'; +import { AdminNotifyMessagesDataService } from '@core/data/admin-notify-messages-data.service'; import { PaginatedList } from '@core/data/paginated-list.model'; import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @@ -23,9 +26,6 @@ import { TabulatableResultListElementsComponent } from '../../../shared/object-l import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component'; import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component'; import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component'; -import { AdminNotifyMessage } from '../models/admin-notify-message.model'; -import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model'; -import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service'; @Component({ selector: 'ds-admin-notify-search-result', @@ -103,7 +103,7 @@ export class AdminNotifySearchResultComponent extends TabulatableResultListEleme private dateFormat = 'YYYY/MM/d hh:mm:ss'; constructor(private modalService: NgbModal, - private adminNotifyMessagesService: AdminNotifyMessagesService, + private adminNotifyMessagesService: AdminNotifyMessagesDataService, private datePipe: DatePipe, @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) { super(); diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts index 4c0025a0dc4..081ec8932da 100644 --- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts +++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts @@ -10,6 +10,8 @@ import { waitForAsync, } from '@angular/core/testing'; import { FormBuilder } from '@angular/forms'; +import { DspaceRestService } from '@core/dspace-rest/dspace-rest.service'; +import { RawRestResponse } from '@core/dspace-rest/raw-rest-response.model'; import { NgbAccordion, NgbAccordionModule, @@ -19,8 +21,6 @@ import { TranslateModule, } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service'; -import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model'; import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock'; import { FilteredCollectionsComponent } from './filtered-collections.component'; diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts index a4b14e930a8..175bb34bec6 100644 --- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts +++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts @@ -8,15 +8,15 @@ import { FormBuilder, FormGroup, } from '@angular/forms'; +import { RestRequestMethod } from '@core/data/rest-request-method'; +import { DspaceRestService } from '@core/dspace-rest/dspace-rest.service'; +import { RawRestResponse } from '@core/dspace-rest/raw-rest-response.model'; import { NgbAccordion, NgbAccordionModule, } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { RestRequestMethod } from 'src/app/core/data/rest-request-method'; -import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service'; -import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model'; import { environment } from 'src/environments/environment'; import { FiltersComponent } from '../filters-section/filters-section.component'; diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts index c5eb1583e5b..bb0d550a46e 100644 --- a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts +++ b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts @@ -11,13 +11,13 @@ import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { Script } from '@core/shared/scripts/script.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths'; import { Process } from '../../../../process-page/processes/process.model'; -import { Script } from '../../../../process-page/scripts/script.model'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { createFailedRemoteDataObject$, diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts index 4587d91badd..21671fd958d 100644 --- a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts +++ b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts @@ -1,5 +1,5 @@ import { Collection } from '@core/shared/collection.model'; -import { Item } from 'src/app/core/shared/item.model'; +import { Item } from '@core/shared/item.model'; export class FilteredItems { diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts index b5d2297321a..73c131bbf97 100644 --- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts +++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts @@ -11,6 +11,20 @@ import { FormGroup, ReactiveFormsModule, } from '@angular/forms'; +import { CollectionDataService } from '@core/data/collection-data.service'; +import { CommunityDataService } from '@core/data/community-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { MetadataFieldDataService } from '@core/data/metadata-field-data.service'; +import { MetadataSchemaDataService } from '@core/data/metadata-schema-data.service'; +import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { RestRequestMethod } from '@core/data/rest-request-method'; +import { DspaceRestService } from '@core/dspace-rest/dspace-rest.service'; +import { RawRestResponse } from '@core/dspace-rest/raw-rest-response.model'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { Collection } from '@core/shared/collection.model'; +import { Community } from '@core/shared/community.model'; +import { getFirstSucceededRemoteListPayload } from '@core/shared/operators'; import { NgbAccordion, NgbAccordionModule, @@ -24,20 +38,6 @@ import { map, Observable, } from 'rxjs'; -import { CollectionDataService } from 'src/app/core/data/collection-data.service'; -import { CommunityDataService } from 'src/app/core/data/community-data.service'; -import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; -import { MetadataFieldDataService } from 'src/app/core/data/metadata-field-data.service'; -import { MetadataSchemaDataService } from 'src/app/core/data/metadata-schema-data.service'; -import { ScriptDataService } from 'src/app/core/data/processes/script-data.service'; -import { RestRequestMethod } from 'src/app/core/data/rest-request-method'; -import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service'; -import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model'; -import { MetadataField } from 'src/app/core/metadata/metadata-field.model'; -import { MetadataSchema } from 'src/app/core/metadata/metadata-schema.model'; -import { Collection } from 'src/app/core/shared/collection.model'; -import { Community } from 'src/app/core/shared/community.model'; -import { getFirstSucceededRemoteListPayload } from 'src/app/core/shared/operators'; import { isEmpty } from 'src/app/shared/empty.util'; import { ThemedLoadingComponent } from 'src/app/shared/loading/themed-loading.component'; import { environment } from 'src/environments/environment'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts index 7cecdcc04e7..a29206df94f 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts @@ -9,6 +9,7 @@ import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { RemoteData } from '@core/data/remote-data'; import { RequestEntryState } from '@core/data/request-entry-state.model'; import { Group } from '@core/eperson/models/group.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { SupervisionOrder } from '@core/supervision-order/models/supervision-order.model'; import { SupervisionOrderDataService } from '@core/supervision-order/supervision-order-data.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @@ -16,7 +17,6 @@ import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; import { NotificationsService } from 'src/app/shared/notifications/notifications.service'; import { EpersonGroupListComponent } from '../../../../../../shared/eperson-group-list/eperson-group-list.component'; diff --git a/src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts b/src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts index 2fcd9587923..98321161f35 100644 --- a/src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts +++ b/src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts @@ -3,15 +3,15 @@ import { Router, UrlTree, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { Bitstream } from '@core/shared/bitstream.model'; import { Observable, of, } from 'rxjs'; -import { AuthService } from 'src/app/core/auth/auth.service'; -import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard'; diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts index 24d1a54d760..0edefd9192f 100644 --- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts +++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts @@ -26,6 +26,7 @@ import { } from '@core/data/paginated-list.model'; import { RemoteData } from '@core/data/remote-data'; import { PaginationService } from '@core/pagination/pagination.service'; +import { RouteService } from '@core/services/route.service'; import { BrowseEntry } from '@core/shared/browse-entry.model'; import { Community } from '@core/shared/community.model'; import { Item } from '@core/shared/item.model'; @@ -37,7 +38,6 @@ import { Observable, of, } from 'rxjs'; -import { RouteService } from 'src/app/core/services/route.service'; import { DsoEditMenuComponent } from 'src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { HostWindowService } from 'src/app/shared/host-window.service'; import { ThemedLoadingComponent } from 'src/app/shared/loading/themed-loading.component'; diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts index df3ccf1c87e..03117413091 100644 --- a/src/app/core/cache/builders/link.service.ts +++ b/src/app/core/cache/builders/link.service.ts @@ -3,6 +3,7 @@ import { Injectable, Injector, } from '@angular/core'; +import { LazyDataServicesMap } from '@core/data-services-map'; import { EMPTY, Observable, @@ -12,10 +13,7 @@ import { switchMap, } from 'rxjs/operators'; -import { - APP_DATA_SERVICES_MAP, - LazyDataServicesMap, -} from '../../../../config/app-config.interface'; +import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; import { hasValue, isNotEmpty, diff --git a/src/app/core/data-services-map.ts b/src/app/core/data-services-map.ts index 0d6f56a5233..dc7a2c54ac9 100644 --- a/src/app/core/data-services-map.ts +++ b/src/app/core/data-services-map.ts @@ -1,13 +1,5 @@ -import { LazyDataServicesMap } from '../../config/app-config.interface'; -import { ADMIN_NOTIFY_MESSAGE } from '../admin/admin-notify-dashboard/models/admin-notify-message.resource-type'; -import { NOTIFYREQUEST } from '../item-page/simple/notify-requests-status/notify-requests-status.resource-type'; -import { PROCESS } from '../process-page/processes/process.resource-type'; -import { SCRIPT } from '../process-page/scripts/script.resource-type'; -import { ACCESS_STATUS } from '../shared/object-collection/shared/badges/access-status-badge/access-status.resource-type'; -import { DUPLICATE } from '../shared/object-list/duplicate-data/duplicate.resource-type'; -import { IDENTIFIERS } from '../shared/object-list/identifier-data/identifier-data.resource-type'; -import { SUBSCRIPTION } from '../shared/subscriptions/models/subscription.resource-type'; -import { SYSTEMWIDEALERT } from '../system-wide-alert/system-wide-alert.resource-type'; +import { Type } from '@angular/core'; + import { BULK_ACCESS_CONDITION_OPTIONS, SUBMISSION_ACCESSES_TYPE, @@ -18,6 +10,7 @@ import { LDN_SERVICE, LDN_SERVICE_CONSTRAINT_FILTERS, } from './data/admin-ldn-services/ldn-services-model/ldn-service.resource-type'; +import { HALDataService } from './data/base/hal-data-service.interface'; import { ROOT } from './data/root.resource-type'; import { EPERSON } from './eperson/models/eperson.resource-type'; import { GROUP } from './eperson/models/group.resource-type'; @@ -36,6 +29,8 @@ import { ORCID_HISTORY } from './orcid/model/orcid-history.resource-type'; import { ORCID_QUEUE } from './orcid/model/orcid-queue.resource-type'; import { RESEARCHER_PROFILE } from './profile/model/researcher-profile.resource-type'; import { RESOURCE_POLICY } from './resource-policy/models/resource-policy.resource-type'; +import { ACCESS_STATUS } from './shared/access-status.resource-type'; +import { ADMIN_NOTIFY_MESSAGE } from './shared/admin-notify-message.resource-type'; import { AUTHORIZATION } from './shared/authorization.resource-type'; import { BITSTREAM } from './shared/bitstream.resource-type'; import { BITSTREAM_FORMAT } from './shared/bitstream-format.resource-type'; @@ -45,14 +40,21 @@ import { COLLECTION } from './shared/collection.resource-type'; import { COMMUNITY } from './shared/community.resource-type'; import { CONFIG_PROPERTY } from './shared/config-property.resource-type'; import { DSPACE_OBJECT } from './shared/dspace-object.resource-type'; +import { DUPLICATE } from './shared/duplicate-data/duplicate.resource-type'; import { FEATURE } from './shared/feature.resource-type'; +import { IDENTIFIERS } from './shared/identifiers-data/identifier-data.resource-type'; import { ITEM } from './shared/item.resource-type'; import { ITEM_TYPE } from './shared/item-relationships/item-type.resource-type'; import { RELATIONSHIP } from './shared/item-relationships/relationship.resource-type'; import { RELATIONSHIP_TYPE } from './shared/item-relationships/relationship-type.resource-type'; import { LICENSE } from './shared/license.resource-type'; +import { NOTIFYREQUEST } from './shared/notify-requests-status.resource-type'; +import { PROCESS } from './shared/process.resource-type'; +import { SCRIPT } from './shared/scripts/script.resource-type'; import { SUBMISSION_COAR_NOTIFY_CONFIG } from './shared/section-coar-notify-service.resource-type'; import { SITE } from './shared/site.resource-type'; +import { SUBSCRIPTION } from './shared/subscription.resource-type'; +import { SYSTEMWIDEALERT } from './shared/system-wide-alert.resource-type'; import { VERSION } from './shared/version.resource-type'; import { VERSION_HISTORY } from './shared/version-history.resource-type'; import { USAGE_REPORT } from './statistics/models/usage-report.resource-type'; @@ -69,6 +71,8 @@ import { CLAIMED_TASK } from './tasks/models/claimed-task-object.resource-type'; import { POOL_TASK } from './tasks/models/pool-task-object.resource-type'; import { WORKFLOW_ACTION } from './tasks/models/workflow-action-object.resource-type'; +export type LazyDataServicesMap = Map Promise> | { default: HALDataService }>>; + export const LAZY_DATA_SERVICES: LazyDataServicesMap = new Map([ [AUTHORIZATION.value, () => import('./data/feature-authorization/authorization-data.service').then(m => m.AuthorizationDataService)], [BROWSE_DEFINITION.value, () => import('./browse/browse-definition-data.service').then(m => m.BrowseDefinitionDataService)], @@ -85,7 +89,7 @@ export const LAZY_DATA_SERVICES: LazyDataServicesMap = new Map([ [VOCABULARY_ENTRY.value, () => import('./data/href-only-data.service').then(m => m.HrefOnlyDataService)], [ITEM_TYPE.value, () => import('./data/href-only-data.service').then(m => m.HrefOnlyDataService)], [LICENSE.value, () => import('./data/href-only-data.service').then(m => m.HrefOnlyDataService)], - [SUBSCRIPTION.value, () => import('../shared/subscriptions/subscriptions-data.service').then(m => m.SubscriptionsDataService)], + [SUBSCRIPTION.value, () => import('./data/subscriptions-data.service').then(m => m.SubscriptionsDataService)], [COMMUNITY.value, () => import('./data/community-data.service').then(m => m.CommunityDataService)], [VOCABULARY.value, () => import('./submission/vocabularies/vocabulary.data.service').then(m => m.VocabularyDataService)], [BUNDLE.value, () => import('./data/bundle-data.service').then(m => m.BundleDataService)], @@ -125,7 +129,7 @@ export const LAZY_DATA_SERVICES: LazyDataServicesMap = new Map([ [SUBMISSION_COAR_NOTIFY_CONFIG.value, () => import('./data/coar-notify-config-data.service').then(m => m.CoarNotifyConfigDataService)], [LDN_SERVICE_CONSTRAINT_FILTERS.value, () => import('./data/ldn-itemfilters-data.service').then(m => m.LdnItemfiltersService)], [LDN_SERVICE.value, () => import('./data/ldn-services-data.service').then(m => m.LdnServicesService)], - [ADMIN_NOTIFY_MESSAGE.value, () => import('../admin/admin-notify-dashboard/services/admin-notify-messages.service').then(m => m.AdminNotifyMessagesService)], + [ADMIN_NOTIFY_MESSAGE.value, () => import('./data/admin-notify-messages-data.service').then(m => m.AdminNotifyMessagesDataService)], [SUBMISSION_FORMS_TYPE.value, () => import('./config/submission-forms-config-data.service').then(m => m.SubmissionFormsConfigDataService)], [NOTIFYREQUEST.value, () => import('./data/notify-services-status-data.service').then(m => m.NotifyRequestsStatusDataService)], [QUALITY_ASSURANCE_EVENT_OBJECT.value, () => import('./notifications/qa/events/quality-assurance-event-data.service').then(m => m.QualityAssuranceEventDataService)], diff --git a/src/app/core/data/access-status-data.service.ts b/src/app/core/data/access-status-data.service.ts index 576b972f56f..80588918740 100644 --- a/src/app/core/data/access-status-data.service.ts +++ b/src/app/core/data/access-status-data.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; +import { AccessStatusObject } from '@core/shared/access-status.model'; import { Observable } from 'rxjs'; -import { AccessStatusObject } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../cache/object-cache.service'; diff --git a/src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts b/src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts index aa975cc2b37..f984a7efe98 100644 --- a/src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts +++ b/src/app/core/data/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts @@ -25,6 +25,7 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; import { PaginationService } from '@core/pagination/pagination.service'; import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { @@ -41,7 +42,6 @@ import { Observable, Subscription, } from 'rxjs'; -import { RemoteData } from 'src/app/core/data/remote-data'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { IpV4Validator } from '../../../../shared/utils/ipV4.validator'; diff --git a/src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts b/src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts index 97d55b33263..de0e82e986e 100644 --- a/src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts +++ b/src/app/core/data/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts @@ -12,6 +12,8 @@ import { ViewChild, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { LdnServicesService } from '@core/data/ldn-services-data.service'; +import { PaginationService } from '@core/pagination/pagination.service'; import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { @@ -27,8 +29,6 @@ import { map, switchMap, } from 'rxjs/operators'; -import { LdnServicesService } from 'src/app/core/data/ldn-services-data.service'; -import { PaginationService } from 'src/app/core/pagination/pagination.service'; import { hasValue } from '../../../../shared/empty.util'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts b/src/app/core/data/admin-notify-message-search-result.model.ts similarity index 64% rename from src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts rename to src/app/core/data/admin-notify-message-search-result.model.ts index c4df75ef3ee..64e11ed0f5f 100644 --- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts +++ b/src/app/core/data/admin-notify-message-search-result.model.ts @@ -1,4 +1,4 @@ -import { SearchResult } from '../../../shared/search/models/search-result.model'; +import { SearchResult } from '../../shared/search/models/search-result.model'; import { AdminNotifyMessage } from './admin-notify-message.model'; export class AdminNotifySearchResult extends SearchResult { diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/core/data/admin-notify-message.model.ts similarity index 94% rename from src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts rename to src/app/core/data/admin-notify-message.model.ts index 47c36b281a4..41d889664f0 100644 --- a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts +++ b/src/app/core/data/admin-notify-message.model.ts @@ -1,4 +1,5 @@ import { typedObject } from '@core/cache/builders/build-decorators'; +import { ADMIN_NOTIFY_MESSAGE } from '@core/shared/admin-notify-message.resource-type'; import { DSpaceObject } from '@core/shared/dspace-object.model'; import { GenericConstructor } from '@core/shared/generic-constructor'; import { excludeFromEquals } from '@core/utilities/equals.decorators'; @@ -9,8 +10,7 @@ import { } from 'cerialize'; import { Observable } from 'rxjs'; -import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model'; -import { ADMIN_NOTIFY_MESSAGE } from './admin-notify-message.resource-type'; +import { ListableObject } from '../../shared/object-collection/shared/listable-object.model'; /** * A message that includes admin notify info diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts b/src/app/core/data/admin-notify-messages-data.service.spec.ts similarity index 86% rename from src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts rename to src/app/core/data/admin-notify-messages-data.service.spec.ts index d895e4a03b3..099ad6c4266 100644 --- a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts +++ b/src/app/core/data/admin-notify-messages-data.service.spec.ts @@ -1,6 +1,7 @@ import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; import { ObjectCacheService } from '@core/cache/object-cache.service'; import { RestResponse } from '@core/cache/response.models'; +import { AdminNotifyMessage } from '@core/data/admin-notify-message.model'; import { ItemDataService } from '@core/data/item-data.service'; import { LdnServicesService } from '@core/data/ldn-services-data.service'; import { RemoteData } from '@core/data/remote-data'; @@ -16,14 +17,13 @@ import { } from 'rxjs'; import { take } from 'rxjs/operators'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; -import { mockAdminNotifyMessages } from '../admin-notify-search-result/admin-notify-search-result.component.spec'; -import { AdminNotifyMessage } from '../models/admin-notify-message.model'; -import { AdminNotifyMessagesService } from './admin-notify-messages.service'; +import { mockAdminNotifyMessages } from '../../admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { AdminNotifyMessagesDataService } from './admin-notify-messages-data.service'; -describe('AdminNotifyMessagesService test', () => { - let service: AdminNotifyMessagesService; +describe('AdminNotifyMessagesDataService test', () => { + let service: AdminNotifyMessagesDataService; let requestService: RequestService; let rdbService: RemoteDataBuildService; let objectCache: ObjectCacheService; @@ -43,7 +43,7 @@ describe('AdminNotifyMessagesService test', () => { const testRelatedItemName = 'testRelatedItem'; function initTestService() { - return new AdminNotifyMessagesService( + return new AdminNotifyMessagesDataService( requestService, rdbService, objectCache, diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts b/src/app/core/data/admin-notify-messages-data.service.ts similarity index 93% rename from src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts rename to src/app/core/data/admin-notify-messages-data.service.ts index 8c0132bc20c..95bf179cedb 100644 --- a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts +++ b/src/app/core/data/admin-notify-messages-data.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { AdminNotifyMessage } from '@core/data/admin-notify-message.model'; import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; import { ItemDataService } from '@core/data/item-data.service'; import { LdnServicesService } from '@core/data/ldn-services-data.service'; @@ -26,18 +27,17 @@ import { tap, } from 'rxjs/operators'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { AdminNotifyMessage } from '../models/admin-notify-message.model'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; /** * Injectable service responsible for fetching/sending data from/to the REST API on the messages' endpoint. * * @export - * @class AdminNotifyMessagesService + * @class AdminNotifyMessagesDataService * @extends {IdentifiableDataService} */ @Injectable({ providedIn: 'root' }) -export class AdminNotifyMessagesService extends IdentifiableDataService { +export class AdminNotifyMessagesDataService extends IdentifiableDataService { protected reprocessEndpoint = 'enqueueretry'; diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts index 502b1fe7107..97d362130a0 100644 --- a/src/app/core/data/identifier-data.service.ts +++ b/src/app/core/data/identifier-data.service.ts @@ -12,13 +12,13 @@ import { } from 'rxjs/operators'; import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../cache/object-cache.service'; import { CoreState } from '../core-state.model'; import { HttpOptions } from '../dspace-rest/dspace-rest.service'; import { ConfigurationProperty } from '../shared/configuration-property.model'; import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { IdentifierData } from '../shared/identifiers-data/identifier-data.model'; import { Item } from '../shared/item.model'; import { getFirstCompletedRemoteData } from '../shared/operators'; import { sendRequest } from '../shared/request.operators'; diff --git a/src/app/core/data/processes/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts index e61da4db636..ba96201dda1 100644 --- a/src/app/core/data/processes/script-data.service.ts +++ b/src/app/core/data/processes/script-data.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { Script } from '@core/shared/scripts/script.model'; import { Observable } from 'rxjs'; import { map, @@ -7,7 +8,6 @@ import { import { Process } from '../../../process-page/processes/process.model'; import { ProcessParameter } from '../../../process-page/processes/process-parameter.model'; -import { Script } from '../../../process-page/scripts/script.model'; import { hasValue } from '../../../shared/empty.util'; import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service'; diff --git a/src/app/shared/subscriptions/subscriptions-data.service.spec.ts b/src/app/core/data/subscriptions-data.service.spec.ts similarity index 86% rename from src/app/shared/subscriptions/subscriptions-data.service.spec.ts rename to src/app/core/data/subscriptions-data.service.spec.ts index cdc88719559..ef9726619f3 100644 --- a/src/app/shared/subscriptions/subscriptions-data.service.spec.ts +++ b/src/app/core/data/subscriptions-data.service.spec.ts @@ -5,19 +5,19 @@ import { ObjectCacheService } from '@core/cache/object-cache.service'; import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; import { RequestService } from '@core/data/request.service'; import { HALEndpointService } from '@core/shared/hal-endpoint.service'; +import { Subscription } from '@core/shared/subscription.model'; import { Store } from '@ngrx/store'; -import { getMockRemoteDataBuildService } from '../mocks/remote-data-build.service.mock'; -import { getMockRequestService } from '../mocks/request.service.mock'; -import { NotificationsService } from '../notifications/notifications.service'; +import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock'; +import { getMockRequestService } from '../../shared/mocks/request.service.mock'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$, -} from '../remote-data.utils'; -import { HALEndpointServiceStub } from '../testing/hal-endpoint-service.stub'; -import { NotificationsServiceStub } from '../testing/notifications-service.stub'; -import { createPaginatedList } from '../testing/utils.test'; -import { Subscription } from './models/subscription.model'; +} from '../../shared/remote-data.utils'; +import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub'; +import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; +import { createPaginatedList } from '../../shared/testing/utils.test'; import { SubscriptionsDataService } from './subscriptions-data.service'; describe('SubscriptionsDataService', () => { diff --git a/src/app/shared/subscriptions/subscriptions-data.service.ts b/src/app/core/data/subscriptions-data.service.ts similarity index 95% rename from src/app/shared/subscriptions/subscriptions-data.service.ts rename to src/app/core/data/subscriptions-data.service.ts index f0c3f579fbb..af588a43d3d 100644 --- a/src/app/shared/subscriptions/subscriptions-data.service.ts +++ b/src/app/core/data/subscriptions-data.service.ts @@ -21,6 +21,8 @@ import { RestRequest } from '@core/data/rest-request.model'; import { HALEndpointService } from '@core/shared/hal-endpoint.service'; import { NoContent } from '@core/shared/NoContent.model'; import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { sendRequest } from '@core/shared/request.operators'; +import { Subscription } from '@core/shared/subscription.model'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { @@ -30,15 +32,13 @@ import { switchMap, take, } from 'rxjs/operators'; -import { sendRequest } from 'src/app/core/shared/request.operators'; import { isNotEmpty, isNotEmptyOperator, -} from '../empty.util'; -import { NotificationsService } from '../notifications/notifications.service'; -import { followLink } from '../utils/follow-link-config.model'; -import { Subscription } from './models/subscription.model'; +} from '../../shared/empty.util'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { followLink } from '../../shared/utils/follow-link-config.model'; /** * Provides methods to retrieve subscription resources from the REST API related CRUD actions. diff --git a/src/app/core/data/system-wide-alert-data.service.ts b/src/app/core/data/system-wide-alert-data.service.ts index afff0ef9ef3..5f2a3842d23 100644 --- a/src/app/core/data/system-wide-alert-data.service.ts +++ b/src/app/core/data/system-wide-alert-data.service.ts @@ -3,11 +3,11 @@ import { Observable } from 'rxjs'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; -import { SystemWideAlert } from '../../system-wide-alert/system-wide-alert.model'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { RequestParam } from '../cache/models/request-param.model'; import { ObjectCacheService } from '../cache/object-cache.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { SystemWideAlert } from '../shared/system-wide-alert.model'; import { CreateData, CreateDataImpl, diff --git a/src/app/core/lazy-data-service.ts b/src/app/core/lazy-data-service.ts index 1ad3dec384a..6936d372002 100644 --- a/src/app/core/lazy-data-service.ts +++ b/src/app/core/lazy-data-service.ts @@ -7,8 +7,8 @@ import { Observable, } from 'rxjs'; -import { LazyDataServicesMap } from '../../config/app-config.interface'; import { HALDataService } from './data/base/hal-data-service.interface'; +import { LazyDataServicesMap } from './data-services-map'; /** * Loads a service lazily. The service is loaded when the observable is subscribed to. diff --git a/src/app/core/provide-core.ts b/src/app/core/provide-core.ts index 619def6b5fc..b5b840d8d0d 100644 --- a/src/app/core/provide-core.ts +++ b/src/app/core/provide-core.ts @@ -1,19 +1,15 @@ import { HttpClient } from '@angular/common/http'; import { makeEnvironmentProviders } from '@angular/core'; +import { Script } from '@core/shared/scripts/script.model'; import { environment } from '../../environments/environment'; import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model'; import { Process } from '../process-page/processes/process.model'; -import { Script } from '../process-page/scripts/script.model'; import { EndpointMockingRestService } from '../shared/mocks/dspace-rest/endpoint-mocking-rest.service'; import { MOCK_RESPONSE_MAP, ResponseMapMock, } from '../shared/mocks/dspace-rest/mocks/response-map.mock'; -import { AccessStatusObject } from '../shared/object-collection/shared/badges/access-status-badge/access-status.model'; -import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model'; -import { Subscription } from '../shared/subscriptions/models/subscription.model'; -import { SystemWideAlert } from '../system-wide-alert/system-wide-alert.model'; import { AuthStatus } from './auth/models/auth-status.model'; import { ShortLivedToken } from './auth/models/short-lived-token.model'; import { SubmissionCoarNotifyModel } from './coar-notify/models/submission-coar-notify.model'; @@ -40,6 +36,7 @@ import { OrcidHistory } from './orcid/model/orcid-history.model'; import { OrcidQueue } from './orcid/model/orcid-queue.model'; import { ResearcherProfile } from './profile/model/researcher-profile.model'; import { ResourcePolicy } from './resource-policy/models/resource-policy.model'; +import { AccessStatusObject } from './shared/access-status.model'; import { Authorization } from './shared/authorization.model'; import { Bitstream } from './shared/bitstream.model'; import { BitstreamFormat } from './shared/bitstream-format.model'; @@ -55,6 +52,7 @@ import { ExternalSourceEntry } from './shared/external-source-entry.model'; import { Feature } from './shared/feature.model'; import { FlatBrowseDefinition } from './shared/flat-browse-definition.model'; import { HierarchicalBrowseDefinition } from './shared/hierarchical-browse-definition.model'; +import { IdentifierData } from './shared/identifiers-data/identifier-data.model'; import { Item } from './shared/item.model'; import { ItemType } from './shared/item-relationships/item-type.model'; import { Relationship } from './shared/item-relationships/relationship.model'; @@ -65,6 +63,8 @@ import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-brows import { Registration } from './shared/registration.model'; import { SearchConfig } from './shared/search/search-filters/search-config.model'; import { Site } from './shared/site.model'; +import { Subscription } from './shared/subscription.model'; +import { SystemWideAlert } from './shared/system-wide-alert.model'; import { TemplateItem } from './shared/template-item.model'; import { ValueListBrowseDefinition } from './shared/value-list-browse-definition.model'; import { Version } from './shared/version.model'; diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model.ts b/src/app/core/shared/access-status.model.ts similarity index 63% rename from src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model.ts rename to src/app/core/shared/access-status.model.ts index 62d59f45ff3..14c152c458b 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model.ts +++ b/src/app/core/shared/access-status.model.ts @@ -1,12 +1,12 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, } from 'cerialize'; -import { typedObject } from 'src/app/core/cache/builders/build-decorators'; -import { CacheableObject } from 'src/app/core/cache/cacheable-object.model'; -import { HALLink } from 'src/app/core/shared/hal-link.model'; -import { ResourceType } from 'src/app/core/shared/resource-type'; -import { excludeFromEquals } from 'src/app/core/utilities/equals.decorators'; import { ACCESS_STATUS } from './access-status.resource-type'; diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type.ts b/src/app/core/shared/access-status.resource-type.ts similarity index 74% rename from src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type.ts rename to src/app/core/shared/access-status.resource-type.ts index ead2afc0b16..94f0964d019 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type.ts +++ b/src/app/core/shared/access-status.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from 'src/app/core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for Access Status diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts b/src/app/core/shared/admin-notify-message.resource-type.ts similarity index 100% rename from src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts rename to src/app/core/shared/admin-notify-message.resource-type.ts diff --git a/src/app/core/shared/bitstream.model.ts b/src/app/core/shared/bitstream.model.ts index 29a80069db9..64484f80fe4 100644 --- a/src/app/core/shared/bitstream.model.ts +++ b/src/app/core/shared/bitstream.model.ts @@ -1,11 +1,11 @@ +import { AccessStatusObject } from '@core/shared/access-status.model'; +import { ACCESS_STATUS } from '@core/shared/access-status.resource-type'; import { autoserialize, deserialize, inheritSerialization, } from 'cerialize'; import { Observable } from 'rxjs'; -import { AccessStatusObject } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model'; -import { ACCESS_STATUS } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type'; import { link, diff --git a/src/app/shared/object-list/duplicate-data/duplicate.model.ts b/src/app/core/shared/duplicate-data/duplicate.model.ts similarity index 100% rename from src/app/shared/object-list/duplicate-data/duplicate.model.ts rename to src/app/core/shared/duplicate-data/duplicate.model.ts diff --git a/src/app/shared/object-list/duplicate-data/duplicate.resource-type.ts b/src/app/core/shared/duplicate-data/duplicate.resource-type.ts similarity index 75% rename from src/app/shared/object-list/duplicate-data/duplicate.resource-type.ts rename to src/app/core/shared/duplicate-data/duplicate.resource-type.ts index 588ca2da55e..d5a1b559fdd 100644 --- a/src/app/shared/object-list/duplicate-data/duplicate.resource-type.ts +++ b/src/app/core/shared/duplicate-data/duplicate.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from 'src/app/core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for Duplicate preview stubs diff --git a/src/app/shared/object-list/identifier-data/identifier-data.model.ts b/src/app/core/shared/identifiers-data/identifier-data.model.ts similarity index 61% rename from src/app/shared/object-list/identifier-data/identifier-data.model.ts rename to src/app/core/shared/identifiers-data/identifier-data.model.ts index 51695416e1b..3416a381f12 100644 --- a/src/app/shared/object-list/identifier-data/identifier-data.model.ts +++ b/src/app/core/shared/identifiers-data/identifier-data.model.ts @@ -1,12 +1,12 @@ +import { typedObject } from '@core/cache/builders/build-decorators'; +import { CacheableObject } from '@core/cache/cacheable-object.model'; +import { HALLink } from '@core/shared/hal-link.model'; +import { ResourceType } from '@core/shared/resource-type'; +import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, deserialize, } from 'cerialize'; -import { typedObject } from 'src/app/core/cache/builders/build-decorators'; -import { CacheableObject } from 'src/app/core/cache/cacheable-object.model'; -import { HALLink } from 'src/app/core/shared/hal-link.model'; -import { ResourceType } from 'src/app/core/shared/resource-type'; -import { excludeFromEquals } from 'src/app/core/utilities/equals.decorators'; import { Identifier } from './identifier.model'; import { IDENTIFIERS } from './identifier-data.resource-type'; diff --git a/src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts b/src/app/core/shared/identifiers-data/identifier-data.resource-type.ts similarity index 74% rename from src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts rename to src/app/core/shared/identifiers-data/identifier-data.resource-type.ts index 823a43eff95..509820d793e 100644 --- a/src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts +++ b/src/app/core/shared/identifiers-data/identifier-data.resource-type.ts @@ -1,4 +1,4 @@ -import { ResourceType } from 'src/app/core/shared/resource-type'; +import { ResourceType } from '@core/shared/resource-type'; /** * The resource type for Identifiers diff --git a/src/app/shared/object-list/identifier-data/identifier.model.ts b/src/app/core/shared/identifiers-data/identifier.model.ts similarity index 100% rename from src/app/shared/object-list/identifier-data/identifier.model.ts rename to src/app/core/shared/identifiers-data/identifier.model.ts diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts index d6066f098c0..52ba9b0b1bc 100644 --- a/src/app/core/shared/item.model.ts +++ b/src/app/core/shared/item.model.ts @@ -1,3 +1,5 @@ +import { AccessStatusObject } from '@core/shared/access-status.model'; +import { ACCESS_STATUS } from '@core/shared/access-status.resource-type'; import { autoserialize, autoserializeAs, @@ -6,13 +8,9 @@ import { inheritSerialization, } from 'cerialize'; import { Observable } from 'rxjs'; -import { AccessStatusObject } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model'; -import { ACCESS_STATUS } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type'; import { isEmpty } from '../../shared/empty.util'; import { ListableObject } from '../../shared/object-collection/shared/listable-object.model'; -import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model'; -import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type'; import { link, typedObject, @@ -30,6 +28,8 @@ import { DSpaceObject } from './dspace-object.model'; import { GenericConstructor } from './generic-constructor'; import { HALLink } from './hal-link.model'; import { HandleObject } from './handle-object.model'; +import { IdentifierData } from './identifiers-data/identifier-data.model'; +import { IDENTIFIERS } from './identifiers-data/identifier-data.resource-type'; import { ITEM } from './item.resource-type'; import { Relationship } from './item-relationships/relationship.model'; import { RELATIONSHIP } from './item-relationships/relationship.resource-type'; diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts b/src/app/core/shared/notify-requests-status.resource-type.ts similarity index 100% rename from src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts rename to src/app/core/shared/notify-requests-status.resource-type.ts diff --git a/src/app/process-page/processes/process.resource-type.ts b/src/app/core/shared/process.resource-type.ts similarity index 100% rename from src/app/process-page/processes/process.resource-type.ts rename to src/app/core/shared/process.resource-type.ts diff --git a/src/app/process-page/scripts/script-parameter-type.model.ts b/src/app/core/shared/scripts/script-parameter-type.model.ts similarity index 100% rename from src/app/process-page/scripts/script-parameter-type.model.ts rename to src/app/core/shared/scripts/script-parameter-type.model.ts diff --git a/src/app/process-page/scripts/script-parameter.model.ts b/src/app/core/shared/scripts/script-parameter.model.ts similarity index 100% rename from src/app/process-page/scripts/script-parameter.model.ts rename to src/app/core/shared/scripts/script-parameter.model.ts diff --git a/src/app/process-page/scripts/script.model.ts b/src/app/core/shared/scripts/script.model.ts similarity index 100% rename from src/app/process-page/scripts/script.model.ts rename to src/app/core/shared/scripts/script.model.ts diff --git a/src/app/process-page/scripts/script.resource-type.ts b/src/app/core/shared/scripts/script.resource-type.ts similarity index 100% rename from src/app/process-page/scripts/script.resource-type.ts rename to src/app/core/shared/scripts/script.resource-type.ts diff --git a/src/app/shared/subscriptions/models/subscription.model.ts b/src/app/core/shared/subscription.model.ts similarity index 100% rename from src/app/shared/subscriptions/models/subscription.model.ts rename to src/app/core/shared/subscription.model.ts diff --git a/src/app/shared/subscriptions/models/subscription.resource-type.ts b/src/app/core/shared/subscription.resource-type.ts similarity index 100% rename from src/app/shared/subscriptions/models/subscription.resource-type.ts rename to src/app/core/shared/subscription.resource-type.ts diff --git a/src/app/system-wide-alert/system-wide-alert.model.ts b/src/app/core/shared/system-wide-alert.model.ts similarity index 100% rename from src/app/system-wide-alert/system-wide-alert.model.ts rename to src/app/core/shared/system-wide-alert.model.ts diff --git a/src/app/system-wide-alert/system-wide-alert.resource-type.ts b/src/app/core/shared/system-wide-alert.resource-type.ts similarity index 100% rename from src/app/system-wide-alert/system-wide-alert.resource-type.ts rename to src/app/core/shared/system-wide-alert.resource-type.ts diff --git a/src/app/core/submission/models/workspaceitem-section-duplicates.model.ts b/src/app/core/submission/models/workspaceitem-section-duplicates.model.ts index f9441fa7905..6f30473fcdb 100644 --- a/src/app/core/submission/models/workspaceitem-section-duplicates.model.ts +++ b/src/app/core/submission/models/workspaceitem-section-duplicates.model.ts @@ -1,7 +1,7 @@ /* * Object model for the data returned by the REST API to present potential duplicates in a submission section */ -import { Duplicate } from '../../../shared/object-list/duplicate-data/duplicate.model'; +import { Duplicate } from '@core/shared/duplicate-data/duplicate.model'; export interface WorkspaceitemSectionDuplicatesObject { potentialDuplicates?: Duplicate[] diff --git a/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts index f6bfb1ae04f..cdba824f288 100644 --- a/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts +++ b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts @@ -1,7 +1,7 @@ /* * Object model for the data returned by the REST API to present minted identifiers in a submission section */ -import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model'; +import { Identifier } from '../../shared/identifiers-data/identifier.model'; export interface WorkspaceitemSectionIdentifiersObject { identifiers?: Identifier[] diff --git a/src/app/core/submission/submission-duplicate-data.service.ts b/src/app/core/submission/submission-duplicate-data.service.ts index b3273424690..0b1a7906e32 100644 --- a/src/app/core/submission/submission-duplicate-data.service.ts +++ b/src/app/core/submission/submission-duplicate-data.service.ts @@ -3,9 +3,9 @@ import { Injectable, OnDestroy, } from '@angular/core'; +import { Duplicate } from '@core/shared/duplicate-data/duplicate.model'; import { Observable } from 'rxjs'; -import { Duplicate } from '../../shared/object-list/duplicate-data/duplicate.model'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { RequestParam } from '../cache/models/request-param.model'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index 180fbc6df52..6b91e878a52 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -16,6 +16,7 @@ import { import { ArrayMoveChangeAnalyzer } from '@core/data/array-move-change-analyzer.service'; import { RemoteData } from '@core/data/remote-data'; import { UpdateDataService } from '@core/data/update-data.service'; +import { LazyDataServicesMap } from '@core/data-services-map'; import { lazyDataService } from '@core/lazy-data-service'; import { Context } from '@core/shared/context.model'; import { DSpaceObject } from '@core/shared/dspace-object.model'; @@ -38,10 +39,7 @@ import { tap, } from 'rxjs/operators'; -import { - APP_DATA_SERVICES_MAP, - LazyDataServicesMap, -} from '../../../config/app-config.interface'; +import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; import { AlertComponent } from '../../shared/alert/alert.component'; import { AlertType } from '../../shared/alert/alert-type'; import { BtnDisabledDirective } from '../../shared/btn-disabled.directive'; diff --git a/src/app/external-log-in/decorators/external-log-in.methods-decorator.ts b/src/app/external-log-in/decorators/external-log-in.methods-decorator.ts index 593dbb3aea8..09646e2a812 100644 --- a/src/app/external-log-in/decorators/external-log-in.methods-decorator.ts +++ b/src/app/external-log-in/decorators/external-log-in.methods-decorator.ts @@ -1,4 +1,4 @@ -import { AuthRegistrationType } from 'src/app/core/auth/models/auth.registration-type'; +import { AuthRegistrationType } from '@core/auth/models/auth.registration-type'; import { OrcidConfirmationComponent } from '../registration-types/orcid-confirmation/orcid-confirmation.component'; diff --git a/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts index 83285ddefdf..5441e4306fe 100644 --- a/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts +++ b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts @@ -8,11 +8,11 @@ import { FormBuilder, FormGroup, } from '@angular/forms'; +import { Registration } from '@core/shared/registration.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; -import { Registration } from 'src/app/core/shared/registration.model'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe'; diff --git a/src/app/external-log-in/services/external-login.service.ts b/src/app/external-log-in/services/external-login.service.ts index 396112512a0..6cff5886ad1 100644 --- a/src/app/external-log-in/services/external-login.service.ts +++ b/src/app/external-log-in/services/external-login.service.ts @@ -1,5 +1,8 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; +import { AuthMethod } from '@core/auth/models/auth.method'; +import { getAuthenticationMethods } from '@core/auth/selectors'; +import { CoreState } from '@core/core-state.model'; import { EpersonRegistrationService } from '@core/data/eperson-registration.service'; import { RemoteData } from '@core/data/remote-data'; import { NoContent } from '@core/shared/NoContent.model'; @@ -14,9 +17,6 @@ import { map, Observable, } from 'rxjs'; -import { AuthMethod } from 'src/app/core/auth/models/auth.method'; -import { getAuthenticationMethods } from 'src/app/core/auth/selectors'; -import { CoreState } from 'src/app/core/core-state.model'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts index d40c95dd6c6..4aefcc15d01 100644 --- a/src/app/item-page/alerts/item-alerts.component.ts +++ b/src/app/item-page/alerts/item-alerts.component.ts @@ -11,6 +11,7 @@ import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { PaginatedList } from '@core/data/paginated-list.model'; import { RemoteData } from '@core/data/remote-data'; import { Item } from '@core/shared/item.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { CorrectionTypeDataService } from '@core/submission/correctiontype-data.service'; import { CorrectionType } from '@core/submission/models/correctiontype.model'; import { TranslateModule } from '@ngx-translate/core'; @@ -19,7 +20,6 @@ import { map, Observable, } from 'rxjs'; -import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; import { AlertComponent } from '../../shared/alert/alert.component'; import { AlertType } from '../../shared/alert/alert-type'; diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts index 7b83d66d7c4..d5faeb47dce 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts @@ -19,8 +19,11 @@ import { FieldChangeType } from '@core/data/object-updates/field-change-type.mod import { FieldUpdate } from '@core/data/object-updates/field-update.model'; import { FieldUpdates } from '@core/data/object-updates/field-updates.model'; import { ObjectUpdatesService } from '@core/data/object-updates/object-updates.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; import { RequestService } from '@core/data/request.service'; import { PaginationService } from '@core/pagination/pagination.service'; +import { Bitstream } from '@core/shared/bitstream.model'; import { Bundle } from '@core/shared/bundle.model'; import { Item } from '@core/shared/item.model'; import { @@ -45,9 +48,6 @@ import { take, tap, } from 'rxjs/operators'; -import { PaginatedList } from 'src/app/core/data/paginated-list.model'; -import { RemoteData } from 'src/app/core/data/remote-data'; -import { Bitstream } from 'src/app/core/shared/bitstream.model'; import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive'; import { diff --git a/src/app/item-page/edit-item-page/item-page-delete.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-delete.guard.spec.ts index 69e34e55157..0bc626dfee2 100644 --- a/src/app/item-page/edit-item-page/item-page-delete.guard.spec.ts +++ b/src/app/item-page/edit-item-page/item-page-delete.guard.spec.ts @@ -3,6 +3,9 @@ import { Router, UrlTree, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { ItemDataService } from '@core/data/item-data.service'; import { Item } from '@core/shared/item.model'; import { Store } from '@ngrx/store'; @@ -11,9 +14,6 @@ import { Observable, of, } from 'rxjs'; -import { AuthService } from 'src/app/core/auth/auth.service'; -import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; import { getMockTranslateService } from '../../shared/mocks/translate.service.mock'; diff --git a/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.spec.ts index 7a12868103f..f63ff3255d0 100644 --- a/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.spec.ts +++ b/src/app/item-page/edit-item-page/item-page-edit-authorizations.guard.spec.ts @@ -3,6 +3,9 @@ import { Router, UrlTree, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { ItemDataService } from '@core/data/item-data.service'; import { Item } from '@core/shared/item.model'; import { Store } from '@ngrx/store'; @@ -11,9 +14,6 @@ import { Observable, of, } from 'rxjs'; -import { AuthService } from 'src/app/core/auth/auth.service'; -import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; import { getMockTranslateService } from '../../shared/mocks/translate.service.mock'; diff --git a/src/app/item-page/edit-item-page/item-page-move.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-move.guard.spec.ts index 75f90490e89..04a59451f56 100644 --- a/src/app/item-page/edit-item-page/item-page-move.guard.spec.ts +++ b/src/app/item-page/edit-item-page/item-page-move.guard.spec.ts @@ -3,6 +3,9 @@ import { Router, UrlTree, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { ItemDataService } from '@core/data/item-data.service'; import { Item } from '@core/shared/item.model'; import { Store } from '@ngrx/store'; @@ -11,9 +14,6 @@ import { Observable, of, } from 'rxjs'; -import { AuthService } from 'src/app/core/auth/auth.service'; -import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; import { getMockTranslateService } from '../../shared/mocks/translate.service.mock'; diff --git a/src/app/item-page/edit-item-page/item-page-private.guard.spec.ts b/src/app/item-page/edit-item-page/item-page-private.guard.spec.ts index fe0a4e40fe0..0b78bb7be03 100644 --- a/src/app/item-page/edit-item-page/item-page-private.guard.spec.ts +++ b/src/app/item-page/edit-item-page/item-page-private.guard.spec.ts @@ -3,6 +3,9 @@ import { Router, UrlTree, } from '@angular/router'; +import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { ItemDataService } from '@core/data/item-data.service'; import { Item } from '@core/shared/item.model'; import { Store } from '@ngrx/store'; @@ -11,9 +14,6 @@ import { Observable, of, } from 'rxjs'; -import { AuthService } from 'src/app/core/auth/auth.service'; -import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; import { getMockTranslateService } from '../../shared/mocks/translate.service.mock'; diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts index 0d88dc14d84..94057462097 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts @@ -11,6 +11,7 @@ import { import { IdentifierDataService } from '@core/data/identifier-data.service'; import { ItemDataService } from '@core/data/item-data.service'; import { RemoteData } from '@core/data/remote-data'; +import { Identifier } from '@core/shared/identifiers-data/identifier.model'; import { Item } from '@core/shared/item.model'; import { getFirstSucceededRemoteData } from '@core/shared/operators'; import { @@ -25,7 +26,6 @@ import { import { hasValue } from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model'; import { getItemPageRoute } from '../../item-page-routing-paths'; import { ModifyItemOverviewComponent } from '../modify-item-overview/modify-item-overview.component'; import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component'; diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts index a1af02cb284..b6146f30c61 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts @@ -19,6 +19,8 @@ import { IdentifierDataService } from '@core/data/identifier-data.service'; import { RemoteData } from '@core/data/remote-data'; import { OrcidAuthService } from '@core/orcid/orcid-auth.service'; import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Identifier } from '@core/shared/identifiers-data/identifier.model'; +import { IdentifierData } from '@core/shared/identifiers-data/identifier-data.model'; import { Item } from '@core/shared/item.model'; import { getAllSucceededRemoteDataPayload, @@ -47,8 +49,6 @@ import { fadeInOut, } from '../../../shared/animations/fade'; import { hasValue } from '../../../shared/empty.util'; -import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model'; -import { IdentifierData } from '../../../shared/object-list/identifier-data/identifier-data.model'; import { getItemEditRoute, getItemPageRoute, diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts index ef79888da4e..8491459c060 100644 --- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts +++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts @@ -4,10 +4,10 @@ import { Input, } from '@angular/core'; import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Bitstream } from '@core/shared/bitstream.model'; import { MediaViewerItem } from '@core/shared/media-viewer-item.model'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { Bitstream } from 'src/app/core/shared/bitstream.model'; import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive'; import { hasValue } from '../../../shared/empty.util'; diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.spec.ts index 0ec325c1218..c7f6263f78d 100644 --- a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.spec.ts @@ -8,17 +8,17 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Item } from '@core/shared/item.model'; +import { + MetadataMap, + MetadataValue, +} from '@core/shared/metadata.models'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; -import { ConfigurationDataService } from 'src/app/core/data/configuration-data.service'; -import { ConfigurationProperty } from 'src/app/core/shared/configuration-property.model'; -import { Item } from 'src/app/core/shared/item.model'; -import { - MetadataMap, - MetadataValue, -} from 'src/app/core/shared/metadata.models'; import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils'; import { ConfigurationDataServiceStub } from 'src/app/shared/testing/configuration-data.service.stub'; import { createPaginatedList } from 'src/app/shared/testing/utils.test'; diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts index 262c4a6b09c..a29b0ac40a2 100644 --- a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts @@ -8,19 +8,19 @@ import { Input, OnInit, } from '@angular/core'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { Item } from '@core/shared/item.model'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { map, Observable, of, } from 'rxjs'; -import { ConfigurationDataService } from 'src/app/core/data/configuration-data.service'; -import { ConfigurationProperty } from 'src/app/core/shared/configuration-property.model'; -import { Item } from 'src/app/core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getRemoteDataPayload, -} from 'src/app/core/shared/operators'; import { hasValue } from 'src/app/shared/empty.util'; import { MetadataFieldWrapperComponent } from 'src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { parseCcCode } from 'src/app/shared/utils/license.utils'; diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts index 763dda9c038..dfecb16af9f 100644 --- a/src/app/item-page/simple/item-page.component.ts +++ b/src/app/item-page/simple/item-page.component.ts @@ -14,6 +14,7 @@ import { ActivatedRoute, Router, } from '@angular/router'; +import { NotifyInfoService } from '@core/coar-notify/notify-info/notify-info.service'; import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { ItemDataService } from '@core/data/item-data.service'; @@ -40,7 +41,6 @@ import { switchMap, take, } from 'rxjs/operators'; -import { NotifyInfoService } from 'src/app/core/coar-notify/notify-info/notify-info.service'; import { fadeInOut } from '../../shared/animations/fade'; import { diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts index 59b970e24a7..49557ccc5a6 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts @@ -17,6 +17,7 @@ import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.s import { ObjectCacheService } from '@core/cache/object-cache.service'; import { BitstreamDataService } from '@core/data/bitstream-data.service'; import { CommunityDataService } from '@core/data/community-data.service'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.service'; import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; import { ItemDataService } from '@core/data/item-data.service'; @@ -41,7 +42,6 @@ import { Observable, of, } from 'rxjs'; -import { ConfigurationDataService } from 'src/app/core/data/configuration-data.service'; import { ConfigurationDataServiceStub } from 'src/app/shared/testing/configuration-data.service.stub'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.spec.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.spec.ts index 6c0f6139116..d4789ce9c7f 100644 --- a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.spec.ts +++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.spec.ts @@ -5,8 +5,8 @@ import { tick, waitForAsync, } from '@angular/core/testing'; +import { NotifyRequestsStatusDataService } from '@core/data/notify-services-status-data.service'; import { TranslateModule } from '@ngx-translate/core'; -import { NotifyRequestsStatusDataService } from 'src/app/core/data/notify-services-status-data.service'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { NotifyRequestsStatus } from '../notify-requests-status.model'; diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts index 8651fa8f6a9..436bf063ae1 100644 --- a/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts +++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts @@ -2,6 +2,7 @@ import { typedObject } from '@core/cache/builders/build-decorators'; import { CacheableObject } from '@core/cache/cacheable-object.model'; import { HALLink } from '@core/shared/hal-link.model'; +import { NOTIFYREQUEST } from '@core/shared/notify-requests-status.resource-type'; import { ResourceType } from '@core/shared/resource-type'; import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { @@ -10,7 +11,6 @@ import { inheritSerialization, } from 'cerialize'; -import { NOTIFYREQUEST } from './notify-requests-status.resource-type'; import { RequestStatusEnum } from './notify-status.enum'; /** diff --git a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts index 9a01c5747d4..39891fe168a 100644 --- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts +++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts @@ -5,9 +5,9 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { ServerResponseService } from '@core/services/server-response.service'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { ServerResponseService } from 'src/app/core/services/server-response.service'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { ObjectNotFoundComponent } from './objectnotfound.component'; diff --git a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts index 6f450ce358c..1030606af2f 100644 --- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts +++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts @@ -8,8 +8,8 @@ import { ActivatedRoute, RouterLink, } from '@angular/router'; +import { ServerResponseService } from '@core/services/server-response.service'; import { TranslateModule } from '@ngx-translate/core'; -import { ServerResponseService } from 'src/app/core/services/server-response.service'; /** * This component representing the `PageNotFound` DSpace page. diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts index e8a72619b8f..a68dd4a034d 100644 --- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts +++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; import { QualityAssuranceSourceDataService } from '@core/notifications/qa/source/quality-assurance-source-data.service'; -import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model'; import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils'; import { createPaginatedList } from 'src/app/shared/testing/utils.test'; diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts index 02f06622581..037f17aff86 100644 --- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts +++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts @@ -5,6 +5,7 @@ import { OnInit, } from '@angular/core'; import { RouterLink } from '@angular/router'; +import { QualityAssuranceSourceObject } from '@core/notifications/qa/models/quality-assurance-source.model'; import { QualityAssuranceSourceDataService } from '@core/notifications/qa/source/quality-assurance-source-data.service'; import { getFirstCompletedRemoteData, @@ -17,7 +18,6 @@ import { of, tap, } from 'rxjs'; -import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model'; import { getNotificatioQualityAssuranceRoute } from '../../admin/admin-routing-paths'; diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts index b1ac6a31e31..1a9c725a760 100644 --- a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts +++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts @@ -5,7 +5,7 @@ import { waitForAsync, } from '@angular/core/testing'; import { EPersonDataService } from '@core/eperson/eperson-data.service'; -import { EPerson } from 'src/app/core/eperson/models/eperson.model'; +import { EPerson } from '@core/eperson/models/eperson.model'; import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils'; import { EPersonDataComponent } from './ePerson-data.component'; diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts index d3a1e2b0f5b..7375255902a 100644 --- a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts +++ b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts @@ -14,7 +14,9 @@ import { SortDirection, SortOptions, } from '@core/cache/models/sort-options.model'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { FindListOptions } from '@core/data/find-list-options.model'; +import { ItemDataService } from '@core/data/item-data.service'; import { buildPaginatedList } from '@core/data/paginated-list.model'; import { QualityAssuranceEventDataService } from '@core/notifications/qa/events/quality-assurance-event-data.service'; import { QualityAssuranceEventObject } from '@core/notifications/qa/models/quality-assurance-event.model'; @@ -31,8 +33,6 @@ import { } from 'jasmine-marbles'; import { of } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; -import { ItemDataService } from 'src/app/core/data/item-data.service'; import { getMockQualityAssuranceEventRestService, diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts index 366752d3cb8..8aa313cf92f 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts @@ -11,11 +11,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; +import { ItemDataService } from '@core/data/item-data.service'; import { PaginationService } from '@core/pagination/pagination.service'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { ItemDataService } from 'src/app/core/data/item-data.service'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; diff --git a/src/app/notifications/suggestions/list-element/suggestion-list-element.component.ts b/src/app/notifications/suggestions/list-element/suggestion-list-element.component.ts index 4e9e2fcb3b5..dea60dba57e 100644 --- a/src/app/notifications/suggestions/list-element/suggestion-list-element.component.ts +++ b/src/app/notifications/suggestions/list-element/suggestion-list-element.component.ts @@ -6,9 +6,9 @@ import { OnInit, Output, } from '@angular/core'; +import { Suggestion } from '@core/notifications/suggestions/models/suggestion.model'; import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Suggestion } from 'src/app/core/notifications/suggestions/models/suggestion.model'; import { fadeIn } from '../../../shared/animations/fade'; import { isNotEmpty } from '../../../shared/empty.util'; diff --git a/src/app/notifications/suggestions/targets/suggestion-targets.effects.ts b/src/app/notifications/suggestions/targets/suggestion-targets.effects.ts index 59ca86d7173..2f0e7d2d920 100644 --- a/src/app/notifications/suggestions/targets/suggestion-targets.effects.ts +++ b/src/app/notifications/suggestions/targets/suggestion-targets.effects.ts @@ -3,8 +3,12 @@ import { AuthActionTypes, RetrieveAuthenticatedEpersonSuccessAction, } from '@core/auth/auth.actions'; +import { ConfigurationDataService } from '@core/data/configuration-data.service'; import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; import { SuggestionTarget } from '@core/notifications/suggestions/models/suggestion-target.model'; +import { ConfigurationProperty } from '@core/shared/configuration-property.model'; +import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { Actions, createEffect, @@ -19,10 +23,6 @@ import { switchMap, tap, } from 'rxjs/operators'; -import { ConfigurationDataService } from 'src/app/core/data/configuration-data.service'; -import { RemoteData } from 'src/app/core/data/remote-data'; -import { ConfigurationProperty } from 'src/app/core/shared/configuration-property.model'; -import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { SuggestionsService } from '../suggestions.service'; diff --git a/src/app/process-page/form/process-form.component.spec.ts b/src/app/process-page/form/process-form.component.spec.ts index 8889a3dadcf..1d5bb98a89c 100644 --- a/src/app/process-page/form/process-form.component.spec.ts +++ b/src/app/process-page/form/process-form.component.spec.ts @@ -11,6 +11,8 @@ import { } from '@angular/router'; import { ScriptDataService } from '@core/data/processes/script-data.service'; import { RequestService } from '@core/data/request.service'; +import { Script } from '@core/shared/scripts/script.model'; +import { ScriptParameter } from '@core/shared/scripts/script-parameter.model'; import { TranslateLoader, TranslateModule, @@ -23,8 +25,6 @@ import { NotificationsService } from '../../shared/notifications/notifications.s import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; import { ProcessParameter } from '../processes/process-parameter.model'; -import { Script } from '../scripts/script.model'; -import { ScriptParameter } from '../scripts/script-parameter.model'; import { ProcessFormComponent } from './process-form.component'; import { ScriptsSelectComponent } from './scripts-select/scripts-select.component'; diff --git a/src/app/process-page/form/process-form.component.ts b/src/app/process-page/form/process-form.component.ts index 223cef4eb62..507cb1fe13d 100644 --- a/src/app/process-page/form/process-form.component.ts +++ b/src/app/process-page/form/process-form.component.ts @@ -16,6 +16,8 @@ import { import { ScriptDataService } from '@core/data/processes/script-data.service'; import { RemoteData } from '@core/data/remote-data'; import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { Script } from '@core/shared/scripts/script.model'; +import { ScriptParameter } from '@core/shared/scripts/script-parameter.model'; import { TranslateModule, TranslateService, @@ -26,8 +28,6 @@ import { NotificationsService } from '../../shared/notifications/notifications.s import { getProcessListRoute } from '../process-page-routing.paths'; import { Process } from '../processes/process.model'; import { ProcessParameter } from '../processes/process-parameter.model'; -import { Script } from '../scripts/script.model'; -import { ScriptParameter } from '../scripts/script-parameter.model'; import { ProcessParametersComponent } from './process-parameters/process-parameters.component'; import { ScriptHelpComponent } from './script-help/script-help.component'; import { ScriptsSelectComponent } from './scripts-select/scripts-select.component'; diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts index 841cca45a72..56bb68871ed 100644 --- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts +++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts @@ -10,10 +10,10 @@ import { } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { ScriptParameter } from '@core/shared/scripts/script-parameter.model'; +import { ScriptParameterType } from '@core/shared/scripts/script-parameter-type.model'; import { of } from 'rxjs'; -import { ScriptParameter } from '../../../scripts/script-parameter.model'; -import { ScriptParameterType } from '../../../scripts/script-parameter-type.model'; import { ParameterValueInputComponent } from '../parameter-value-input/parameter-value-input.component'; import { ParameterSelectComponent } from './parameter-select.component'; diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts index 077295037e5..bfd2a095446 100644 --- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts +++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts @@ -11,10 +11,10 @@ import { FormsModule, NgForm, } from '@angular/forms'; +import { ScriptParameter } from '@core/shared/scripts/script-parameter.model'; import { TranslateModule } from '@ngx-translate/core'; import { ProcessParameter } from '../../../processes/process-parameter.model'; -import { ScriptParameter } from '../../../scripts/script-parameter.model'; import { controlContainerFactory } from '../../process-form-factory'; import { ParameterValueInputComponent } from '../parameter-value-input/parameter-value-input.component'; diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts index cb8231a9ed3..86223f0024f 100644 --- a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts +++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts @@ -6,6 +6,8 @@ import { } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { ScriptParameter } from '@core/shared/scripts/script-parameter.model'; +import { ScriptParameterType } from '@core/shared/scripts/script-parameter-type.model'; import { TranslateLoader, TranslateModule, @@ -14,8 +16,6 @@ import { import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; import { FileValueAccessorDirective } from '../../../../shared/utils/file-value-accessor.directive'; import { FileValidator } from '../../../../shared/utils/require-file.validator'; -import { ScriptParameter } from '../../../scripts/script-parameter.model'; -import { ScriptParameterType } from '../../../scripts/script-parameter-type.model'; import { BooleanValueInputComponent } from './boolean-value-input/boolean-value-input.component'; import { DateValueInputComponent } from './date-value-input/date-value-input.component'; import { FileValueInputComponent } from './file-value-input/file-value-input.component'; diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts index defb2c8ee0c..4df393e3314 100644 --- a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts +++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts @@ -10,9 +10,9 @@ import { ControlContainer, NgForm, } from '@angular/forms'; +import { ScriptParameter } from '@core/shared/scripts/script-parameter.model'; +import { ScriptParameterType } from '@core/shared/scripts/script-parameter-type.model'; -import { ScriptParameter } from '../../../scripts/script-parameter.model'; -import { ScriptParameterType } from '../../../scripts/script-parameter-type.model'; import { controlContainerFactory } from '../../process-form-factory'; import { BooleanValueInputComponent } from './boolean-value-input/boolean-value-input.component'; import { DateValueInputComponent } from './date-value-input/date-value-input.component'; diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts b/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts index 42933cc5a98..a8c3e4190a7 100644 --- a/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts +++ b/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts @@ -6,6 +6,8 @@ import { } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { Script } from '@core/shared/scripts/script.model'; +import { ScriptParameter } from '@core/shared/scripts/script-parameter.model'; import { TranslateLoader, TranslateModule, @@ -13,8 +15,6 @@ import { import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; import { ProcessParameter } from '../../processes/process-parameter.model'; -import { Script } from '../../scripts/script.model'; -import { ScriptParameter } from '../../scripts/script-parameter.model'; import { ParameterSelectComponent } from './parameter-select/parameter-select.component'; import { ProcessParametersComponent } from './process-parameters.component'; diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.ts b/src/app/process-page/form/process-parameters/process-parameters.component.ts index 16a54ea31d6..86c7e7d0a8b 100644 --- a/src/app/process-page/form/process-parameters/process-parameters.component.ts +++ b/src/app/process-page/form/process-parameters/process-parameters.component.ts @@ -13,12 +13,12 @@ import { ControlContainer, NgForm, } from '@angular/forms'; +import { Script } from '@core/shared/scripts/script.model'; +import { ScriptParameter } from '@core/shared/scripts/script-parameter.model'; import { TranslateModule } from '@ngx-translate/core'; import { hasValue } from '../../../shared/empty.util'; import { ProcessParameter } from '../../processes/process-parameter.model'; -import { Script } from '../../scripts/script.model'; -import { ScriptParameter } from '../../scripts/script-parameter.model'; import { controlContainerFactory } from '../process-form-factory'; import { ParameterSelectComponent } from './parameter-select/parameter-select.component'; diff --git a/src/app/process-page/form/script-help/script-help.component.spec.ts b/src/app/process-page/form/script-help/script-help.component.spec.ts index d52c96f84da..d5db4667570 100644 --- a/src/app/process-page/form/script-help/script-help.component.spec.ts +++ b/src/app/process-page/form/script-help/script-help.component.spec.ts @@ -6,15 +6,15 @@ import { } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { Script } from '@core/shared/scripts/script.model'; +import { ScriptParameter } from '@core/shared/scripts/script-parameter.model'; +import { ScriptParameterType } from '@core/shared/scripts/script-parameter-type.model'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; -import { Script } from '../../scripts/script.model'; -import { ScriptParameter } from '../../scripts/script-parameter.model'; -import { ScriptParameterType } from '../../scripts/script-parameter-type.model'; import { ScriptHelpComponent } from './script-help.component'; describe('ScriptHelpComponent', () => { diff --git a/src/app/process-page/form/script-help/script-help.component.ts b/src/app/process-page/form/script-help/script-help.component.ts index 69d2c0c8327..43e869fcb94 100644 --- a/src/app/process-page/form/script-help/script-help.component.ts +++ b/src/app/process-page/form/script-help/script-help.component.ts @@ -3,11 +3,10 @@ import { Component, Input, } from '@angular/core'; +import { Script } from '@core/shared/scripts/script.model'; +import { ScriptParameterType } from '@core/shared/scripts/script-parameter-type.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Script } from '../../scripts/script.model'; -import { ScriptParameterType } from '../../scripts/script-parameter-type.model'; - /** * Components that represents a help section for the script use and parameters */ diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts index eb6882af8db..f0b6d8f6a77 100644 --- a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts +++ b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts @@ -14,6 +14,7 @@ import { } from '@angular/router'; import { buildPaginatedList } from '@core/data/paginated-list.model'; import { ScriptDataService } from '@core/data/processes/script-data.service'; +import { Script } from '@core/shared/scripts/script.model'; import { TranslateLoader, TranslateModule, @@ -23,7 +24,6 @@ import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; import { RouterStub } from '../../../shared/testing/router.stub'; -import { Script } from '../../scripts/script.model'; import { ScriptsSelectComponent } from './scripts-select.component'; describe('ScriptsSelectComponent', () => { diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts index 13c9fc59de0..8532dcf44bf 100644 --- a/src/app/process-page/form/scripts-select/scripts-select.component.ts +++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts @@ -24,6 +24,7 @@ import { getFirstCompletedRemoteData, getRemoteDataPayload, } from '@core/shared/operators'; +import { Script } from '@core/shared/scripts/script.model'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; @@ -38,7 +39,6 @@ import { import { hasValue } from '../../../shared/empty.util'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; -import { Script } from '../../scripts/script.model'; import { controlContainerFactory } from '../process-form-factory'; const SCRIPT_QUERY_PARAMETER = 'script'; diff --git a/src/app/process-page/new/new-process.component.spec.ts b/src/app/process-page/new/new-process.component.spec.ts index d09a323567c..3d156ed5265 100644 --- a/src/app/process-page/new/new-process.component.spec.ts +++ b/src/app/process-page/new/new-process.component.spec.ts @@ -10,6 +10,8 @@ import { LinkService } from '@core/cache/builders/link.service'; import { ProcessDataService } from '@core/data/processes/process-data.service'; import { ScriptDataService } from '@core/data/processes/script-data.service'; import { RequestService } from '@core/data/request.service'; +import { Script } from '@core/shared/scripts/script.model'; +import { ScriptParameter } from '@core/shared/scripts/script-parameter.model'; import { TranslateLoader, TranslateModule, @@ -24,8 +26,6 @@ import { HasValuePipe } from '../../shared/utils/has-value.pipe'; import { VarDirective } from '../../shared/utils/var.directive'; import { ProcessFormComponent } from '../form/process-form.component'; import { ProcessParameter } from '../processes/process-parameter.model'; -import { Script } from '../scripts/script.model'; -import { ScriptParameter } from '../scripts/script-parameter.model'; import { NewProcessComponent } from './new-process.component'; describe('NewProcessComponent', () => { diff --git a/src/app/process-page/new/new-process.component.ts b/src/app/process-page/new/new-process.component.ts index 5f2d72644de..f7836883f7a 100644 --- a/src/app/process-page/new/new-process.component.ts +++ b/src/app/process-page/new/new-process.component.ts @@ -7,6 +7,7 @@ import { ActivatedRoute } from '@angular/router'; import { LinkService } from '@core/cache/builders/link.service'; import { ProcessDataService } from '@core/data/processes/process-data.service'; import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { Script } from '@core/shared/scripts/script.model'; import { Observable } from 'rxjs'; import { map, @@ -18,7 +19,6 @@ import { HasValuePipe } from '../../shared/utils/has-value.pipe'; import { VarDirective } from '../../shared/utils/var.directive'; import { ProcessFormComponent } from '../form/process-form.component'; import { Process } from '../processes/process.model'; -import { Script } from '../scripts/script.model'; /** * Component to create a new script diff --git a/src/app/process-page/overview/table/process-overview-table.component.ts b/src/app/process-page/overview/table/process-overview-table.component.ts index 8e0123df1b3..c3f7fc04a65 100644 --- a/src/app/process-page/overview/table/process-overview-table.component.ts +++ b/src/app/process-page/overview/table/process-overview-table.component.ts @@ -22,6 +22,7 @@ import { PaginatedList } from '@core/data/paginated-list.model'; import { RemoteData } from '@core/data/remote-data'; import { EPersonDataService } from '@core/eperson/eperson-data.service'; import { EPerson } from '@core/eperson/models/eperson.model'; +import { PaginationService } from '@core/pagination/pagination.service'; import { RouteService } from '@core/services/route.service'; import { redirectOn4xx } from '@core/shared/authorized.operators'; import { @@ -47,7 +48,6 @@ import { take, toArray, } from 'rxjs/operators'; -import { PaginationService } from 'src/app/core/pagination/pagination.service'; import { hasValue, diff --git a/src/app/process-page/processes/process.model.ts b/src/app/process-page/processes/process.model.ts index cab91ed001e..f6fe4541d20 100644 --- a/src/app/process-page/processes/process.model.ts +++ b/src/app/process-page/processes/process.model.ts @@ -8,8 +8,11 @@ import { RemoteData } from '@core/data/remote-data'; import { Bitstream } from '@core/shared/bitstream.model'; import { BITSTREAM } from '@core/shared/bitstream.resource-type'; import { HALLink } from '@core/shared/hal-link.model'; +import { PROCESS } from '@core/shared/process.resource-type'; import { PROCESS_OUTPUT_TYPE } from '@core/shared/process-output.resource-type'; import { ResourceType } from '@core/shared/resource-type'; +import { Script } from '@core/shared/scripts/script.model'; +import { SCRIPT } from '@core/shared/scripts/script.resource-type'; import { excludeFromEquals } from '@core/utilities/equals.decorators'; import { autoserialize, @@ -18,11 +21,8 @@ import { } from 'cerialize'; import { Observable } from 'rxjs'; -import { Script } from '../scripts/script.model'; -import { SCRIPT } from '../scripts/script.resource-type'; import { Filetypes } from './filetypes.model'; import { FILETYPES } from './filetypes.resource-type'; -import { PROCESS } from './process.resource-type'; import { ProcessParameter } from './process-parameter.model'; import { ProcessStatus } from './process-status.model'; diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts index 4b9c13dbdd3..5c863e569b8 100644 --- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts +++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts @@ -6,7 +6,11 @@ import { OnInit, } from '@angular/core'; import { BitstreamDataService } from '@core/data/bitstream-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; import { PaginationService } from '@core/pagination/pagination.service'; +import { Bitstream } from '@core/shared/bitstream.model'; +import { Context } from '@core/shared/context.model'; import { Item } from '@core/shared/item.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { @@ -15,10 +19,6 @@ import { } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { PaginatedList } from 'src/app/core/data/paginated-list.model'; -import { RemoteData } from 'src/app/core/data/remote-data'; -import { Bitstream } from 'src/app/core/shared/bitstream.model'; -import { Context } from 'src/app/core/shared/context.model'; import { ObjectCollectionComponent } from '../../object-collection/object-collection.component'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts index 634d94353e6..450f58d1a21 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts @@ -7,7 +7,7 @@ import { Injector, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { MenuComponent } from '../../menu/menu.component'; import { MenuService } from '../../menu/menu.service'; diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts index c6a4af7f21b..abda191529a 100644 --- a/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts +++ b/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts @@ -28,7 +28,6 @@ import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP, - LazyDataServicesMap, } from '../../../config/app-config.interface'; import { DSONameServiceMock } from '../mocks/dso-name.service.mock'; import { getMockRequestService } from '../mocks/request.service.mock'; @@ -43,6 +42,7 @@ import { EpersonGroupListComponent } from './eperson-group-list.component'; import { SearchEvent } from './eperson-group-list-event-type'; import { EpersonSearchBoxComponent } from './eperson-search-box/eperson-search-box.component'; import { GroupSearchBoxComponent } from './group-search-box/group-search-box.component'; +import { LazyDataServicesMap } from '@core/data-services-map'; const mockDataServiceMap: LazyDataServicesMap = new Map([ [EPERSON.value, () => import('../../core/eperson/eperson-data.service').then(m => m.EPersonDataService)], diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.ts index bce822e10cb..3e43a076223 100644 --- a/src/app/shared/eperson-group-list/eperson-group-list.component.ts +++ b/src/app/shared/eperson-group-list/eperson-group-list.component.ts @@ -12,6 +12,7 @@ import { import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { FindListOptions } from '@core/data/find-list-options.model'; import { PaginatedList } from '@core/data/paginated-list.model'; +import { LazyDataServicesMap } from '@core/data-services-map'; import { EPersonDataService } from '@core/eperson/eperson-data.service'; import { GroupDataService } from '@core/eperson/group-data.service'; import { EPerson } from '@core/eperson/models/eperson.model'; @@ -34,10 +35,7 @@ import { } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { - APP_DATA_SERVICES_MAP, - LazyDataServicesMap, -} from '../../../config/app-config.interface'; +import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; import { fadeInOut } from '../animations/fade'; import { PaginationComponent } from '../pagination/pagination.component'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; @@ -45,6 +43,7 @@ import { SearchEvent } from './eperson-group-list-event-type'; import { EpersonSearchBoxComponent } from './eperson-search-box/eperson-search-box.component'; import { GroupSearchBoxComponent } from './group-search-box/group-search-box.component'; + @Component({ selector: 'ds-eperson-group-list', styleUrls: ['./eperson-group-list.component.scss'], diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts index a51e8151a2f..6288c7be29d 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts @@ -19,6 +19,7 @@ import { PaginatedList, } from '@core/data/paginated-list.model'; import { RemoteData } from '@core/data/remote-data'; +import { LazyDataServicesMap } from '@core/data-services-map'; import { lazyDataService } from '@core/lazy-data-service'; import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; import { PageInfo } from '@core/shared/page-info.model'; @@ -44,10 +45,7 @@ import { take, tap, } from 'rxjs/operators'; -import { - APP_DATA_SERVICES_MAP, - LazyDataServicesMap, -} from 'src/config/app-config.interface'; +import { APP_DATA_SERVICES_MAP } from 'src/config/app-config.interface'; import { BtnDisabledDirective } from '../../../../../btn-disabled.directive'; import { @@ -58,6 +56,7 @@ import { FormFieldMetadataValueObject } from '../../../models/form-field-metadat import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component'; import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model'; + /** * Component representing a dropdown input field */ diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts index ef31a1bd9c1..c9b574d9e63 100644 --- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts +++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts @@ -23,6 +23,7 @@ import { Vocabulary } from '@core/submission/vocabularies/models/vocabulary.mode import { VocabularyEntry } from '@core/submission/vocabularies/models/vocabulary-entry.model'; import { VocabularyEntryDetail } from '@core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { VocabularyOptions } from '@core/submission/vocabularies/models/vocabulary-options.model'; +import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -34,7 +35,6 @@ import { switchMap, tap, } from 'rxjs/operators'; -import { VocabularyService } from 'src/app/core/submission/vocabularies/vocabulary.service'; import { AlertComponent } from '../../alert/alert.component'; import { AlertType } from '../../alert/alert-type'; diff --git a/src/app/shared/google-recaptcha/google-recaptcha.component.ts b/src/app/shared/google-recaptcha/google-recaptcha.component.ts index e875113973b..39ff9500ae3 100644 --- a/src/app/shared/google-recaptcha/google-recaptcha.component.ts +++ b/src/app/shared/google-recaptcha/google-recaptcha.component.ts @@ -8,12 +8,12 @@ import { Output, } from '@angular/core'; import { ConfigurationDataService } from '@core/data/configuration-data.service'; -import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; -import { Observable } from 'rxjs'; import { NativeWindowRef, NativeWindowService, -} from 'src/app/core/services/window.service'; +} from '@core/services/window.service'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; +import { Observable } from 'rxjs'; import { isNotEmpty } from '../empty.util'; diff --git a/src/app/shared/menu/providers/dso-option.menu.ts b/src/app/shared/menu/providers/dso-option.menu.ts index 255480eba32..6bec6423b17 100644 --- a/src/app/shared/menu/providers/dso-option.menu.ts +++ b/src/app/shared/menu/providers/dso-option.menu.ts @@ -7,11 +7,11 @@ */ import { Injectable } from '@angular/core'; +import { DSpaceObject } from '@core/shared/dspace-object.model'; import { Observable, of, } from 'rxjs'; -import { DSpaceObject } from 'src/app/core/shared/dspace-object.model'; import { MenuItemType } from '../menu-item-type.model'; import { PartialMenuSection } from '../menu-provider.model'; diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts index 5545ac80ed5..046adae912b 100644 --- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts @@ -4,6 +4,7 @@ import { Injector, } from '@angular/core'; import { Router } from '@angular/router'; +import { RemoteData } from '@core/data/remote-data'; import { RequestService } from '@core/data/request.service'; import { DSpaceObject } from '@core/shared/dspace-object.model'; import { SearchService } from '@core/shared/search/search.service'; @@ -16,7 +17,6 @@ import { Observable, of, } from 'rxjs'; -import { RemoteData } from 'src/app/core/data/remote-data'; import { BtnDisabledDirective } from '../../../btn-disabled.directive'; import { NotificationsService } from '../../../notifications/notifications.service'; diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts index b88a945c424..70856848c83 100644 --- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts +++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts @@ -10,6 +10,7 @@ import { RouterLink, } from '@angular/router'; import { AuthService } from '@core/auth/auth.service'; +import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '@core/data/feature-authorization/feature-id'; import { RemoteData } from '@core/data/remote-data'; import { RequestService } from '@core/data/request.service'; @@ -35,7 +36,6 @@ import { Observable, switchMap, } from 'rxjs'; -import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; import { getWorkspaceItemViewRoute } from '../../../workspaceitems-edit-page/workspaceitems-edit-page-routing-paths'; import { NotificationsService } from '../../notifications/notifications.service'; diff --git a/src/app/shared/notification-box/notification-box.component.ts b/src/app/shared/notification-box/notification-box.component.ts index a13d07694f8..01ef97daf04 100644 --- a/src/app/shared/notification-box/notification-box.component.ts +++ b/src/app/shared/notification-box/notification-box.component.ts @@ -5,11 +5,11 @@ import { Input, Output, } from '@angular/core'; +import { AdminNotifySearchResult } from '@core/data/admin-notify-message-search-result.model'; import { ViewMode } from '@core/shared/view-mode.model'; import { TranslateModule } from '@ngx-translate/core'; import { AdminNotifyMetricsBox } from '../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model'; -import { AdminNotifySearchResult } from '../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model'; import { HoverClassDirective } from '../hover-class.directive'; import { listableObjectComponent } from '../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts index 498c5b6f42b..038098b9389 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts +++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts @@ -5,10 +5,11 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { LinkService } from '@core/cache/builders/link.service'; +import { AccessStatusObject } from '@core/shared/access-status.model'; import { Bitstream } from '@core/shared/bitstream.model'; import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; -import { LinkService } from 'src/app/core/cache/builders/link.service'; import { getMockLinkService } from 'src/app/shared/mocks/link-service.mock'; import { followLink } from 'src/app/shared/utils/follow-link-config.model'; import { APP_DATA_SERVICES_MAP } from 'src/config/app-config.interface'; @@ -16,7 +17,6 @@ import { environment } from 'src/environments/environment'; import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils'; import { TruncatePipe } from '../../../../utils/truncate.pipe'; -import { AccessStatusObject } from './access-status.model'; import { AccessStatusBadgeComponent } from './access-status-badge.component'; describe('AccessStatusBadgeComponent', () => { diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts index d0e7d4d699b..7512b15429a 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts +++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts @@ -5,7 +5,11 @@ import { OnDestroy, OnInit, } from '@angular/core'; +import { LinkService } from '@core/cache/builders/link.service'; +import { AccessStatusObject } from '@core/shared/access-status.model'; +import { Bitstream } from '@core/shared/bitstream.model'; import { Item } from '@core/shared/item.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, @@ -16,14 +20,10 @@ import { catchError, map, } from 'rxjs/operators'; -import { LinkService } from 'src/app/core/cache/builders/link.service'; -import { Bitstream } from 'src/app/core/shared/bitstream.model'; -import { getFirstSucceededRemoteDataPayload } from 'src/app/core/shared/operators'; import { followLink } from 'src/app/shared/utils/follow-link-config.model'; import { environment } from 'src/environments/environment'; import { hasValue } from '../../../../empty.util'; -import { AccessStatusObject } from './access-status.model'; @Component({ selector: 'ds-base-access-status-badge', diff --git a/src/app/shared/object-collection/shared/badges/badges.component.ts b/src/app/shared/object-collection/shared/badges/badges.component.ts index 4752ae70d63..c6285774eed 100644 --- a/src/app/shared/object-collection/shared/badges/badges.component.ts +++ b/src/app/shared/object-collection/shared/badges/badges.component.ts @@ -3,8 +3,8 @@ import { Component, Input, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; import { DSpaceObject } from '@core/shared/dspace-object.model'; -import { Context } from 'src/app/core/shared/context.model'; import { ThemedAccessStatusBadgeComponent } from './access-status-badge/themed-access-status-badge.component'; import { ThemedMyDSpaceStatusBadgeComponent } from './my-dspace-status-badge/themed-my-dspace-status-badge.component'; diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts index 2b2483c0389..369416b1595 100644 --- a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts +++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts @@ -3,8 +3,8 @@ import { Input, OnInit, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from 'src/app/core/shared/context.model'; /** * This component represents a badge with mydspace item status diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts index 10fca3a9da9..796c9183c58 100644 --- a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts +++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts @@ -2,7 +2,7 @@ import { Component, Input, } from '@angular/core'; -import { Context } from 'src/app/core/shared/context.model'; +import { Context } from '@core/shared/context.model'; import { ThemedComponent } from '../../../../theme-support/themed.component'; import { MyDSpaceStatusBadgeComponent } from './my-dspace-status-badge.component'; diff --git a/src/app/shared/object-collection/shared/badges/themed-badges.component.ts b/src/app/shared/object-collection/shared/badges/themed-badges.component.ts index 01f10b4ae9a..eef2558fa54 100644 --- a/src/app/shared/object-collection/shared/badges/themed-badges.component.ts +++ b/src/app/shared/object-collection/shared/badges/themed-badges.component.ts @@ -2,8 +2,8 @@ import { Component, Input, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; import { DSpaceObject } from '@core/shared/dspace-object.model'; -import { Context } from 'src/app/core/shared/context.model'; import { ThemedComponent } from '../../../theme-support/themed.component'; import { BadgesComponent } from './badges.component'; diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts index 4368d2fb660..2851173ae63 100644 --- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts +++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts @@ -1,8 +1,8 @@ +import { AdminNotifySearchResult } from '@core/data/admin-notify-message-search-result.model'; import { Context } from '@core/shared/context.model'; import { ViewMode } from '@core/shared/view-mode.model'; import { AdminNotifySearchResultComponent } from '../../../../admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component'; -import { AdminNotifySearchResult } from '../../../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model'; import { getTabulatableObjectsComponent } from './tabulatable-objects.decorator'; describe('TabulatableObject decorator function', () => { diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts index 8e0ce5cea18..0b93b444dd4 100644 --- a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts +++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts @@ -1,9 +1,9 @@ +import { AdminNotifySearchResult } from '@core/data/admin-notify-message-search-result.model'; import { Context } from '@core/shared/context.model'; import { GenericConstructor } from '@core/shared/generic-constructor'; import { ViewMode } from '@core/shared/view-mode.model'; import { AdminNotifySearchResultComponent } from '../../../../admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component'; -import { AdminNotifySearchResult } from '../../../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model'; import { hasNoValue, hasValue, diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts index 2a2f3904d40..980a3ac4423 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts @@ -8,6 +8,7 @@ import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { LinkService } from '@core/cache/builders/link.service'; import { ObjectCacheService } from '@core/cache/object-cache.service'; import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; import { Item } from '@core/shared/item.model'; import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { ViewMode } from '@core/shared/view-mode.model'; @@ -22,7 +23,6 @@ import { mergeMap, tap, } from 'rxjs/operators'; -import { Context } from 'src/app/core/shared/context.model'; import { hasValue, diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts index 06ee5277a8c..fcc0f2eea82 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts @@ -15,11 +15,11 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { LinkService } from '@core/cache/builders/link.service'; import { ObjectCacheService } from '@core/cache/object-cache.service'; +import { Context } from '@core/shared/context.model'; import { Item } from '@core/shared/item.model'; import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { PoolTask } from '@core/tasks/models/pool-task-object.model'; import { of } from 'rxjs'; -import { Context } from 'src/app/core/shared/context.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts index 9cb16bfc945..32b68708439 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts @@ -8,6 +8,7 @@ import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { LinkService } from '@core/cache/builders/link.service'; import { ObjectCacheService } from '@core/cache/object-cache.service'; import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; import { Item } from '@core/shared/item.model'; import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { ViewMode } from '@core/shared/view-mode.model'; @@ -22,7 +23,6 @@ import { mergeMap, tap, } from 'rxjs/operators'; -import { Context } from 'src/app/core/shared/context.model'; import { hasValue, diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts index f18f78db86b..29e18016010 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts @@ -5,12 +5,12 @@ import { import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { LinkService } from '@core/cache/builders/link.service'; import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; import { Item } from '@core/shared/item.model'; import { ViewMode } from '@core/shared/view-mode.model'; import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { Observable } from 'rxjs'; import { find } from 'rxjs/operators'; -import { Context } from 'src/app/core/shared/context.model'; import { isNotUndefined } from '../../../empty.util'; import { WorkflowitemActionsComponent } from '../../../mydspace-actions/workflowitem/workflowitem-actions.component'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts index 7a82e45abf5..74c1737bb99 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts @@ -10,10 +10,10 @@ import { import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { LinkService } from '@core/cache/builders/link.service'; +import { Context } from '@core/shared/context.model'; import { Item } from '@core/shared/item.model'; import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; import { of } from 'rxjs'; -import { Context } from 'src/app/core/shared/context.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; diff --git a/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts b/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts index ed91b84e90e..897edd831e2 100644 --- a/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts +++ b/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts @@ -9,8 +9,8 @@ import { } from '@angular/core'; import { PaginatedList } from '@core/data/paginated-list.model'; import { RemoteData } from '@core/data/remote-data'; +import { Item } from '@core/shared/item.model'; import { ViewMode } from '@core/shared/view-mode.model'; -import { Item } from 'src/app/core/shared/item.model'; import { getItemPageRoute } from 'src/app/item-page/item-page-routing-paths'; import { environment } from '../../../environments/environment'; diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts index c09966833fe..b8aeee20b26 100644 --- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts +++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts @@ -9,11 +9,11 @@ import { } from '@angular/router'; import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { PaginationService } from '@core/pagination/pagination.service'; +import { RouteService } from '@core/services/route.service'; import { BrowseEntry } from '@core/shared/browse-entry.model'; import { ViewMode } from '@core/shared/view-mode.model'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { RouteService } from 'src/app/core/services/route.service'; import { BBM_PAGINATION_ID } from '../../../browse-by/browse-by-metadata/browse-by-metadata.component'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts index 6550fc33064..24f6cf3ea2d 100644 --- a/src/app/shared/object-list/identifier-data/identifier-data.component.ts +++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts @@ -5,13 +5,13 @@ import { OnInit, } from '@angular/core'; import { IdentifierDataService } from '@core/data/identifier-data.service'; +import { IdentifierData } from '@core/shared/identifiers-data/identifier-data.model'; +import { Item } from '@core/shared/item.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { Item } from 'src/app/core/shared/item.model'; import { hasValue } from '../../empty.util'; -import { IdentifierData } from './identifier-data.model'; @Component({ selector: 'ds-identifier-data', diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts index 12e4e656f12..902dc3acb91 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts @@ -7,12 +7,12 @@ import { import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { LinkService } from '@core/cache/builders/link.service'; import { RemoteData } from '@core/data/remote-data'; +import { Context } from '@core/shared/context.model'; import { ViewMode } from '@core/shared/view-mode.model'; import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { Context } from 'src/app/core/shared/context.model'; import { APP_CONFIG, diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts index e5aa95d5079..c47a11e5e0e 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts @@ -16,6 +16,7 @@ import { PaginatedList } from '@core/data/paginated-list.model'; import { RemoteData } from '@core/data/remote-data'; import { ConfigurationProperty } from '@core/shared/configuration-property.model'; import { Context } from '@core/shared/context.model'; +import { Duplicate } from '@core/shared/duplicate-data/duplicate.model'; import { Item } from '@core/shared/item.model'; import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { ViewMode } from '@core/shared/view-mode.model'; @@ -49,7 +50,6 @@ import { listableObjectComponent } from '../../../object-collection/shared/lista import { TruncatableService } from '../../../truncatable/truncatable.service'; import { followLink } from '../../../utils/follow-link-config.model'; import { VarDirective } from '../../../utils/var.directive'; -import { Duplicate } from '../../duplicate-data/duplicate.model'; import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component'; import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item-list-preview.component'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts index edd47d6a27d..ede7976d3a7 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts @@ -9,10 +9,10 @@ import { OnInit, } from '@angular/core'; import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { Context } from '@core/shared/context.model'; import { Item } from '@core/shared/item.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { TranslateModule } from '@ngx-translate/core'; -import { Context } from 'src/app/core/shared/context.model'; -import { WorkflowItem } from 'src/app/core/submission/models/workflowitem.model'; import { APP_CONFIG, diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts index 5da03820c20..f7d6e72b14a 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts @@ -2,9 +2,9 @@ import { Component, Input, } from '@angular/core'; +import { Context } from '@core/shared/context.model'; import { Item } from '@core/shared/item.model'; -import { Context } from 'src/app/core/shared/context.model'; -import { WorkflowItem } from 'src/app/core/submission/models/workflowitem.model'; +import { WorkflowItem } from '@core/submission/models/workflowitem.model'; import { SearchResult } from '../../../search/models/search-result.model'; import { ThemedComponent } from '../../../theme-support/themed.component'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts index 1976623251c..3a488e43dfe 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts @@ -16,6 +16,7 @@ import { PaginatedList } from '@core/data/paginated-list.model'; import { RemoteData } from '@core/data/remote-data'; import { ConfigurationProperty } from '@core/shared/configuration-property.model'; import { Context } from '@core/shared/context.model'; +import { Duplicate } from '@core/shared/duplicate-data/duplicate.model'; import { Item } from '@core/shared/item.model'; import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { ViewMode } from '@core/shared/view-mode.model'; @@ -49,7 +50,6 @@ import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-tas import { TruncatableService } from '../../../truncatable/truncatable.service'; import { followLink } from '../../../utils/follow-link-config.model'; import { VarDirective } from '../../../utils/var.directive'; -import { Duplicate } from '../../duplicate-data/duplicate.model'; import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component'; import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item-list-preview.component'; diff --git a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts index 85865fdbc2b..2cd4a64a745 100644 --- a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts +++ b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts @@ -10,6 +10,7 @@ import { } from '@angular/router'; import { IdentifiableDataService } from '@core/data/base/identifiable-data.service'; import { RemoteData } from '@core/data/remote-data'; +import { LazyDataServicesMap } from '@core/data-services-map'; import { lazyDataService } from '@core/lazy-data-service'; import { DSpaceObject } from '@core/shared/dspace-object.model'; import { getFirstCompletedRemoteData } from '@core/shared/operators'; @@ -17,12 +18,10 @@ import { ResourceType } from '@core/shared/resource-type'; import { Observable } from 'rxjs'; import { switchMap } from 'rxjs/operators'; -import { - APP_DATA_SERVICES_MAP, - LazyDataServicesMap, -} from '../../../../config/app-config.interface'; +import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; import { isEmpty } from '../../empty.util'; + /** * Method for resolving an item based on the parameters in the current route * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts index dc68ffb322c..246107ed951 100644 --- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts @@ -10,6 +10,7 @@ import { import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterModule } from '@angular/router'; import { SearchService } from '@core/shared/search/search.service'; +import { SearchFilterService } from '@core/shared/search/search-filter.service'; import { SequenceService } from '@core/shared/sequence.service'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; @@ -17,7 +18,6 @@ import { Observable, of, } from 'rxjs'; -import { SearchFilterService } from 'src/app/core/shared/search/search-filter.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service'; import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils'; diff --git a/src/app/shared/search/search-labels/search-label-loader/search-label-loader.component.ts b/src/app/shared/search/search-labels/search-label-loader/search-label-loader.component.ts index ccb675137f6..bc965150c69 100644 --- a/src/app/shared/search/search-labels/search-label-loader/search-label-loader.component.ts +++ b/src/app/shared/search/search-labels/search-label-loader/search-label-loader.component.ts @@ -4,7 +4,7 @@ import { OnChanges, OnInit, } from '@angular/core'; -import { GenericConstructor } from 'src/app/core/shared/generic-constructor'; +import { GenericConstructor } from '@core/shared/generic-constructor'; import { AbstractComponentLoaderComponent } from '../../../abstract-component-loader/abstract-component-loader.component'; import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive'; diff --git a/src/app/shared/search/search-result-element-decorator.ts b/src/app/shared/search/search-result-element-decorator.ts index 2a0c831425b..101d6a08c80 100644 --- a/src/app/shared/search/search-result-element-decorator.ts +++ b/src/app/shared/search/search-result-element-decorator.ts @@ -1,3 +1,5 @@ +import { AdminNotifyMessage } from '@core/data/admin-notify-message.model'; +import { AdminNotifySearchResult } from '@core/data/admin-notify-message-search-result.model'; import { Collection } from '@core/shared/collection.model'; import { Community } from '@core/shared/community.model'; import { GenericConstructor } from '@core/shared/generic-constructor'; @@ -7,8 +9,6 @@ import { WorkspaceItem } from '@core/submission/models/workspaceitem.model'; import { ClaimedTask } from '@core/tasks/models/claimed-task-object.model'; import { PoolTask } from '@core/tasks/models/pool-task-object.model'; -import { AdminNotifyMessage } from '../../admin/admin-notify-dashboard/models/admin-notify-message.model'; -import { AdminNotifySearchResult } from '../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model'; import { ClaimedTaskSearchResult } from '../object-collection/shared/claimed-task-search-result.model'; import { CollectionSearchResult } from '../object-collection/shared/collection-search-result.model'; import { CommunitySearchResult } from '../object-collection/shared/community-search-result.model'; diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts index fe74bbd6e08..d07eb80e5db 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts @@ -16,6 +16,7 @@ import { import { By } from '@angular/platform-browser'; import { AuthService } from '@core/auth/auth.service'; import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { SubscriptionsDataService } from '@core/data/subscriptions-data.service'; import { EPerson } from '@core/eperson/models/eperson.model'; import { Item } from '@core/shared/item.model'; import { PageInfo } from '@core/shared/page-info.model'; @@ -37,7 +38,6 @@ import { subscriptionMock2, } from '../../testing/subscriptions-data.mock'; import { ThemeService } from '../../theme-support/theme.service'; -import { SubscriptionsDataService } from '../subscriptions-data.service'; import { SubscriptionModalComponent } from './subscription-modal.component'; describe('SubscriptionModalComponent', () => { diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts index 3352079f34f..001b22632cf 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts @@ -20,11 +20,13 @@ import { AuthService } from '@core/auth/auth.service'; import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { PaginatedList } from '@core/data/paginated-list.model'; import { RemoteData } from '@core/data/remote-data'; +import { SubscriptionsDataService } from '@core/data/subscriptions-data.service'; import { DSpaceObject } from '@core/shared/dspace-object.model'; import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, } from '@core/shared/operators'; +import { Subscription } from '@core/shared/subscription.model'; import { NgbActiveModal, NgbModal, @@ -52,8 +54,6 @@ import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { isNotEmpty } from '../../empty.util'; import { NotificationsService } from '../../notifications/notifications.service'; import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component'; -import { Subscription } from '../models/subscription.model'; -import { SubscriptionsDataService } from '../subscriptions-data.service'; @Component({ selector: 'ds-subscription-modal', diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts index 2ca85c3b144..a908ed88821 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts @@ -15,8 +15,10 @@ import { By, } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { SubscriptionsDataService } from '@core/data/subscriptions-data.service'; import { Item } from '@core/shared/item.model'; import { ITEM } from '@core/shared/item.resource-type'; +import { Subscription } from '@core/shared/subscription.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -36,8 +38,6 @@ import { subscriptionMock, } from '../../testing/subscriptions-data.mock'; import { ThemeService } from '../../theme-support/theme.service'; -import { Subscription } from '../models/subscription.model'; -import { SubscriptionsDataService } from '../subscriptions-data.service'; import { SubscriptionViewComponent } from './subscription-view.component'; describe('SubscriptionViewComponent', () => { diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts index 1ed241fe91a..0de4b00bf46 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts @@ -7,7 +7,9 @@ import { } from '@angular/core'; import { RouterLink } from '@angular/router'; import { DSONameService } from '@core/breadcrumbs/dso-name.service'; +import { SubscriptionsDataService } from '@core/data/subscriptions-data.service'; import { DSpaceObject } from '@core/shared/dspace-object.model'; +import { Subscription } from '@core/shared/subscription.model'; import { NgbModal, NgbModalRef, @@ -20,9 +22,7 @@ import { BtnDisabledDirective } from '../../btn-disabled.directive'; import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component'; import { hasValue } from '../../empty.util'; import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component'; -import { Subscription } from '../models/subscription.model'; import { SubscriptionModalComponent } from '../subscription-modal/subscription-modal.component'; -import { SubscriptionsDataService } from '../subscriptions-data.service'; @Component({ // eslint-disable-next-line @angular-eslint/component-selector diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts index 598f7039695..35ee71a1dc6 100644 --- a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts +++ b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts @@ -23,6 +23,8 @@ import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-pa import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; import { PaginationService } from '@core/pagination/pagination.service'; import { Collection } from '@core/shared/collection.model'; +import { Duplicate } from '@core/shared/duplicate-data/duplicate.model'; +import { DUPLICATE } from '@core/shared/duplicate-data/duplicate.resource-type'; import { License } from '@core/shared/license.model'; import { MetadataValue } from '@core/shared/metadata.models'; import { SubmissionScopeType } from '@core/submission/submission-scope-type'; @@ -42,8 +44,6 @@ import { } from '../../../shared/mocks/submission.mock'; import { defaultUUID } from '../../../shared/mocks/uuid.service.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { Duplicate } from '../../../shared/object-list/duplicate-data/duplicate.model'; -import { DUPLICATE } from '../../../shared/object-list/duplicate-data/duplicate.resource-type'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts index 3db69c3a753..5cdf896bfd7 100644 --- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts +++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts @@ -11,6 +11,8 @@ import { AccessConditionOption } from '@core/config/models/config-access-conditi import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { SubmissionObject } from '@core/submission/models/submission-object.model'; +import { WorkspaceitemSectionUploadObject } from '@core/submission/models/workspaceitem-section-upload.model'; import { WorkspaceitemSectionUploadFileObject } from '@core/submission/models/workspaceitem-section-upload-file.model'; import { SubmissionJsonPatchOperationsService } from '@core/submission/submission-json-patch-operations.service'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @@ -34,8 +36,6 @@ import { mergeMap, take, } from 'rxjs/operators'; -import { SubmissionObject } from 'src/app/core/submission/models/submission-object.model'; -import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model'; import { DynamicCustomSwitchModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model'; import { BtnDisabledDirective } from '../../../../../shared/btn-disabled.directive'; diff --git a/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts b/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts index f2cf0112abd..3bf5b74ab87 100644 --- a/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts +++ b/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts @@ -2,7 +2,7 @@ import { Component, Input, } from '@angular/core'; -import { SubmissionFormsModel } from 'src/app/core/config/models/config-submission-forms.model'; +import { SubmissionFormsModel } from '@core/config/models/config-submission-forms.model'; import { ThemedComponent } from 'src/app/shared/theme-support/themed.component'; import { SubmissionSectionUploadFileComponent } from './section-upload-file.component'; diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts index 55257578d36..c1f8fcd5b8b 100644 --- a/src/app/submission/sections/upload/section-upload.component.ts +++ b/src/app/submission/sections/upload/section-upload.component.ts @@ -16,6 +16,7 @@ import { Group } from '@core/eperson/models/group.model'; import { ResourcePolicyDataService } from '@core/resource-policy/resource-policy-data.service'; import { Collection } from '@core/shared/collection.model'; import { getFirstSucceededRemoteData } from '@core/shared/operators'; +import { WorkspaceitemSectionUploadObject } from '@core/submission/models/workspaceitem-section-upload.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -32,7 +33,6 @@ import { switchMap, tap, } from 'rxjs/operators'; -import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { AlertType } from '../../../shared/alert/alert-type'; diff --git a/src/app/submission/sections/upload/section-upload.service.spec.ts b/src/app/submission/sections/upload/section-upload.service.spec.ts index c57aac0ac93..4d8697c14da 100644 --- a/src/app/submission/sections/upload/section-upload.service.spec.ts +++ b/src/app/submission/sections/upload/section-upload.service.spec.ts @@ -3,12 +3,12 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; +import { JsonPatchOperationPathCombiner } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; import { Store, StoreModule, } from '@ngrx/store'; -import { JsonPatchOperationPathCombiner } from 'src/app/core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from 'src/app/core/json-patch/builder/json-patch-operations-builder'; import { SectionUploadService } from './section-upload.service'; diff --git a/src/app/submission/sections/upload/section-upload.service.ts b/src/app/submission/sections/upload/section-upload.service.ts index 11c0c90945b..eb5899b3e60 100644 --- a/src/app/submission/sections/upload/section-upload.service.ts +++ b/src/app/submission/sections/upload/section-upload.service.ts @@ -1,4 +1,7 @@ import { Injectable } from '@angular/core'; +import { JsonPatchOperationPathObject } from '@core/json-patch/builder/json-patch-operation-path-combiner'; +import { JsonPatchOperationsBuilder } from '@core/json-patch/builder/json-patch-operations-builder'; +import { WorkspaceitemSectionUploadObject } from '@core/submission/models/workspaceitem-section-upload.model'; import { WorkspaceitemSectionUploadFileObject } from '@core/submission/models/workspaceitem-section-upload-file.model'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; @@ -7,9 +10,6 @@ import { filter, map, } from 'rxjs/operators'; -import { JsonPatchOperationPathObject } from 'src/app/core/json-patch/builder/json-patch-operation-path-combiner'; -import { JsonPatchOperationsBuilder } from 'src/app/core/json-patch/builder/json-patch-operations-builder'; -import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model'; import { isUndefined } from '../../../shared/empty.util'; import { diff --git a/src/app/subscriptions-page/subscriptions-page.component.spec.ts b/src/app/subscriptions-page/subscriptions-page.component.spec.ts index 143012b7565..238b0aeff3c 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.spec.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.spec.ts @@ -17,6 +17,7 @@ import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { AuthService } from '@core/auth/auth.service'; import { buildPaginatedList } from '@core/data/paginated-list.model'; +import { SubscriptionsDataService } from '@core/data/subscriptions-data.service'; import { PaginationService } from '@core/pagination/pagination.service'; import { PageInfo } from '@core/shared/page-info.model'; import { @@ -32,7 +33,6 @@ import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; import { PaginationComponent } from '../shared/pagination/pagination.component'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { SubscriptionViewComponent } from '../shared/subscriptions/subscription-view/subscription-view.component'; -import { SubscriptionsDataService } from '../shared/subscriptions/subscriptions-data.service'; import { PaginationServiceStub } from '../shared/testing/pagination-service.stub'; import { mockSubscriptionEperson, diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts index 7a54c074e6c..e41af6ff3f5 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.ts @@ -10,10 +10,12 @@ import { PaginatedList, } from '@core/data/paginated-list.model'; import { RemoteData } from '@core/data/remote-data'; +import { SubscriptionsDataService } from '@core/data/subscriptions-data.service'; import { EPerson } from '@core/eperson/models/eperson.model'; import { PaginationService } from '@core/pagination/pagination.service'; import { getAllCompletedRemoteData } from '@core/shared/operators'; import { PageInfo } from '@core/shared/page-info.model'; +import { Subscription } from '@core/shared/subscription.model'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, @@ -35,9 +37,7 @@ import { hasValue } from '../shared/empty.util'; import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component'; import { PaginationComponent } from '../shared/pagination/pagination.component'; import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model'; -import { Subscription } from '../shared/subscriptions/models/subscription.model'; import { SubscriptionViewComponent } from '../shared/subscriptions/subscription-view/subscription-view.component'; -import { SubscriptionsDataService } from '../shared/subscriptions/subscriptions-data.service'; import { VarDirective } from '../shared/utils/var.directive'; @Component({ diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts index 6471b04104c..6625befb697 100644 --- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts +++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts @@ -8,6 +8,7 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { SystemWideAlertDataService } from '@core/data/system-wide-alert-data.service'; +import { SystemWideAlert } from '@core/shared/system-wide-alert.model'; import { TranslateModule } from '@ngx-translate/core'; import { utcToZonedTime } from 'date-fns-tz'; import { getTestScheduler } from 'jasmine-marbles'; @@ -17,7 +18,6 @@ import { NotificationsService } from '../../shared/notifications/notifications.s import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; import { createPaginatedList } from '../../shared/testing/utils.test'; -import { SystemWideAlert } from '../system-wide-alert.model'; import { SystemWideAlertBannerComponent } from './system-wide-alert-banner.component'; diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts index db2273fcb08..b54d1f4c7e0 100644 --- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts +++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts @@ -12,6 +12,7 @@ import { import { PaginatedList } from '@core/data/paginated-list.model'; import { SystemWideAlertDataService } from '@core/data/system-wide-alert-data.service'; import { getAllSucceededRemoteDataPayload } from '@core/shared/operators'; +import { SystemWideAlert } from '@core/shared/system-wide-alert.model'; import { TranslateModule } from '@ngx-translate/core'; import { zonedTimeToUtc } from 'date-fns-tz'; import { @@ -31,7 +32,6 @@ import { isNotEmpty, } from '../../shared/empty.util'; import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { SystemWideAlert } from '../system-wide-alert.model'; /** * Component responsible for rendering a banner and the countdown for an active system-wide alert diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts index 83b0437e9e2..3504659d009 100644 --- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts +++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts @@ -7,6 +7,7 @@ import { FormsModule } from '@angular/forms'; import { Router } from '@angular/router'; import { RequestService } from '@core/data/request.service'; import { SystemWideAlertDataService } from '@core/data/system-wide-alert-data.service'; +import { SystemWideAlert } from '@core/shared/system-wide-alert.model'; import { TranslateModule } from '@ngx-translate/core'; import { utcToZonedTime, @@ -22,7 +23,6 @@ import { import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; import { RouterStub } from '../../shared/testing/router.stub'; import { createPaginatedList } from '../../shared/testing/utils.test'; -import { SystemWideAlert } from '../system-wide-alert.model'; import { SystemWideAlertFormComponent } from './system-wide-alert-form.component'; describe('SystemWideAlertFormComponent', () => { diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts index 15dfa80017a..b6139dc1628 100644 --- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts +++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts @@ -17,6 +17,7 @@ import { RemoteData } from '@core/data/remote-data'; import { RequestService } from '@core/data/request.service'; import { SystemWideAlertDataService } from '@core/data/system-wide-alert-data.service'; import { getFirstCompletedRemoteData } from '@core/shared/operators'; +import { SystemWideAlert } from '@core/shared/system-wide-alert.model'; import { NgbDatepickerModule, NgbDateStruct, @@ -46,7 +47,6 @@ import { isNotEmpty, } from '../../shared/empty.util'; import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { SystemWideAlert } from '../system-wide-alert.model'; /** diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts index a2f0792eae9..a51a71defec 100644 --- a/src/config/app-config.interface.ts +++ b/src/config/app-config.interface.ts @@ -1,9 +1,8 @@ import { InjectionToken, makeStateKey, - Type, } from '@angular/core'; -import { HALDataService } from '@core/data/base/hal-data-service.interface'; +import { LazyDataServicesMap } from '@core/data-services-map'; import { AccessibilitySettingsConfig } from '../app/accessibility/accessibility-settings.config'; import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model'; @@ -81,8 +80,6 @@ const APP_CONFIG = new InjectionToken('APP_CONFIG'); const APP_CONFIG_STATE = makeStateKey('APP_CONFIG_STATE'); -export type LazyDataServicesMap = Map Promise> | { default: HALDataService }>>; - export const APP_DATA_SERVICES_MAP: InjectionToken = new InjectionToken('APP_DATA_SERVICES_MAP'); export { diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index 9bdde142a3e..f6421d85a2e 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -1,7 +1,6 @@ -import { RestRequestMethod } from '@core/data/rest-request-method'; - import { AccessibilitySettingsConfig } from '../app/accessibility/accessibility-settings.config'; import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model'; +import { RestRequestMethod } from '../app/core/data/rest-request-method'; import { LiveRegionConfig } from '../app/shared/live-region/live-region.config'; import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type'; import { ActuatorsConfig } from './actuators.config'; From df8f91516f95e608c871ee056c2e5ca489a25a99 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 23 Jul 2025 18:51:41 +0200 Subject: [PATCH 03/52] [DURACOM-327] move out unnecessary state from core to app state --- src/app/app.effects.ts | 2 ++ src/app/app.reducer.ts | 6 ++++++ src/app/core/core-state.model.ts | 2 -- src/app/core/core.effects.ts | 2 -- src/app/core/core.reducers.ts | 2 -- .../core/data/bitstream-format-data.service.spec.ts | 4 ++-- src/app/core/data/bitstream-format-data.service.ts | 10 +++------- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/app/app.effects.ts b/src/app/app.effects.ts index 92b5d880d0f..fedd7b7369b 100644 --- a/src/app/app.effects.ts +++ b/src/app/app.effects.ts @@ -1,5 +1,6 @@ import { NavbarEffects } from './navbar/navbar.effects'; import { RelationshipEffects } from './shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects'; +import { MenuEffects } from './shared/menu/menu.effects'; import { NotificationsEffects } from './shared/notifications/notifications.effects'; import { SidebarEffects } from './shared/sidebar/sidebar-effects.service'; import { ThemeEffects } from './shared/theme-support/theme.effects'; @@ -12,4 +13,5 @@ export const appEffects = [ SidebarEffects, ThemeEffects, RelationshipEffects, + MenuEffects, ]; diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts index d79a3c1aaa7..9c0b05a0f60 100644 --- a/src/app/app.reducer.ts +++ b/src/app/app.reducer.ts @@ -16,6 +16,10 @@ import { groupRegistryReducer, GroupRegistryState, } from './access-control/group-registry/group-registry.reducers'; +import { + bitstreamFormatReducer, + BitstreamFormatRegistryState, +} from './admin/admin-registries/bitstream-formats/bitstream-format.reducers'; import { metadataRegistryReducer, MetadataRegistryState, @@ -97,6 +101,7 @@ export interface AppState { groupRegistry: GroupRegistryState; correlationId: string; contextHelp: ContextHelpState; + bitstreamFormats: BitstreamFormatRegistryState; } export const appReducers: ActionReducerMap = { @@ -119,6 +124,7 @@ export const appReducers: ActionReducerMap = { groupRegistry: groupRegistryReducer, correlationId: correlationIdReducer, contextHelp: contextHelpReducer, + bitstreamFormats: bitstreamFormatReducer, }; export const routerStateSelector = (state: AppState) => state.router; diff --git a/src/app/core/core-state.model.ts b/src/app/core/core-state.model.ts index 2128901754b..ecad71f7d1d 100644 --- a/src/app/core/core-state.model.ts +++ b/src/app/core/core-state.model.ts @@ -1,4 +1,3 @@ -import { BitstreamFormatRegistryState } from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers'; import { AuthState } from './auth/auth.reducer'; import { ObjectCacheState } from './cache/object-cache.reducer'; import { ServerSyncBufferState } from './cache/server-sync-buffer.reducer'; @@ -14,7 +13,6 @@ import { RouteState } from './services/route.reducer'; * The core sub-state in the NgRx store */ export interface CoreState { - 'bitstreamFormats': BitstreamFormatRegistryState; 'cache/object': ObjectCacheState; 'cache/syncbuffer': ServerSyncBufferState; 'cache/object-updates': ObjectUpdatesState; diff --git a/src/app/core/core.effects.ts b/src/app/core/core.effects.ts index 5af2fe580a1..03db24343f7 100644 --- a/src/app/core/core.effects.ts +++ b/src/app/core/core.effects.ts @@ -1,4 +1,3 @@ -import { MenuEffects } from '../shared/menu/menu.effects'; import { AuthEffects } from './auth/auth.effects'; import { ObjectCacheEffects } from './cache/object-cache.effects'; import { ServerSyncBufferEffects } from './cache/server-sync-buffer.effects'; @@ -19,5 +18,4 @@ export const coreEffects = [ ObjectUpdatesEffects, RouteEffects, RouterEffects, - MenuEffects, ]; diff --git a/src/app/core/core.reducers.ts b/src/app/core/core.reducers.ts index fda1e05df05..9392e4672ae 100644 --- a/src/app/core/core.reducers.ts +++ b/src/app/core/core.reducers.ts @@ -1,6 +1,5 @@ import { ActionReducerMap } from '@ngrx/store'; -import { bitstreamFormatReducer } from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers'; import { authReducer } from './auth/auth.reducer'; import { objectCacheReducer } from './cache/object-cache.reducer'; import { serverSyncBufferReducer } from './cache/server-sync-buffer.reducer'; @@ -14,7 +13,6 @@ import { metaTagReducer } from './metadata/meta-tag.reducer'; import { routeReducer } from './services/route.reducer'; export const coreReducers: ActionReducerMap = { - 'bitstreamFormats': bitstreamFormatReducer, 'cache/object': objectCacheReducer, 'cache/syncbuffer': serverSyncBufferReducer, 'cache/object-updates': objectUpdatesReducer, diff --git a/src/app/core/data/bitstream-format-data.service.spec.ts b/src/app/core/data/bitstream-format-data.service.spec.ts index e305e5ae210..794ec100a54 100644 --- a/src/app/core/data/bitstream-format-data.service.spec.ts +++ b/src/app/core/data/bitstream-format-data.service.spec.ts @@ -19,12 +19,12 @@ import { BitstreamFormatsRegistryDeselectAllAction, BitstreamFormatsRegistrySelectAction, } from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions'; +import { AppState } from '../../app.reducer'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../cache/object-cache.service'; import { RestResponse } from '../cache/response.models'; -import { CoreState } from '../core-state.model'; import { BitstreamFormat } from '../shared/bitstream-format.model'; import { HALEndpointService } from '../shared/hal-endpoint.service'; import { testDeleteDataImplementation } from './base/delete-data.spec'; @@ -47,7 +47,7 @@ describe('BitstreamFormatDataService', () => { dispatch(action: Action) { // Do Nothing }, - } as Store; + } as Store; const requestUUIDs = ['some', 'uuid']; diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts index 97b0fa961a9..472ce416c1a 100644 --- a/src/app/core/data/bitstream-format-data.service.ts +++ b/src/app/core/data/bitstream-format-data.service.ts @@ -18,11 +18,10 @@ import { BitstreamFormatsRegistrySelectAction, } from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions'; import { BitstreamFormatRegistryState } from '../../admin/admin-registries/bitstream-formats/bitstream-format.reducers'; +import { AppState } from '../../app.reducer'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../cache/object-cache.service'; -import { coreSelector } from '../core.selectors'; -import { CoreState } from '../core-state.model'; import { Bitstream } from '../shared/bitstream.model'; import { BitstreamFormat } from '../shared/bitstream-format.model'; import { HALEndpointService } from '../shared/hal-endpoint.service'; @@ -46,10 +45,7 @@ import { } from './request.models'; import { RequestService } from './request.service'; -const bitstreamFormatsStateSelector = createSelector( - coreSelector, - (state: CoreState) => state.bitstreamFormats, -); +export const bitstreamFormatsStateSelector = (state: AppState) => state.bitstreamFormats; const selectedBitstreamFormatSelector = createSelector( bitstreamFormatsStateSelector, (bitstreamFormatRegistryState: BitstreamFormatRegistryState) => bitstreamFormatRegistryState.selectedBitstreamFormats, @@ -72,7 +68,7 @@ export class BitstreamFormatDataService extends IdentifiableDataService, + protected store: Store, ) { super('bitstreamformats', requestService, rdbService, objectCache, halService); From f3982cb2f509497931171ea6371c217152f1e47c Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 24 Jul 2025 01:05:09 +0200 Subject: [PATCH 04/52] [DURACOM-327] Remove reference to AppState --- src/app/core/auth/auth-blocking.guard.spec.ts | 20 +++++++++++-------- src/app/core/auth/auth-blocking.guard.ts | 4 ++-- src/app/core/auth/auth-methods.service.ts | 4 ++-- src/app/core/auth/auth.effects.spec.ts | 16 +++++++++------ src/app/core/auth/auth.effects.ts | 4 ++-- src/app/core/auth/auth.interceptor.ts | 4 ++-- src/app/core/auth/auth.service.spec.ts | 10 +++++----- src/app/core/auth/auth.service.ts | 4 ++-- src/app/core/auth/authenticated.guard.ts | 4 ++-- src/app/core/auth/server-auth.service.ts | 4 ++-- 10 files changed, 41 insertions(+), 33 deletions(-) diff --git a/src/app/core/auth/auth-blocking.guard.spec.ts b/src/app/core/auth/auth-blocking.guard.spec.ts index 295e5b1e751..c79efa7e7f5 100644 --- a/src/app/core/auth/auth-blocking.guard.spec.ts +++ b/src/app/core/auth/auth-blocking.guard.spec.ts @@ -12,18 +12,15 @@ import { } from '@ngrx/store/testing'; import { cold } from 'jasmine-marbles'; -import { - AppState, - storeModuleConfig, -} from '../../app.reducer'; +import { CoreState } from '../core-state.model'; import { authReducer } from './auth.reducer'; import { authBlockingGuard } from './auth-blocking.guard'; describe('authBlockingGuard', () => { let guard: any; let initialState; - let store: Store; - let mockStore: MockStore; + let store: Store; + let mockStore: MockStore; initialState = { core: { @@ -37,10 +34,17 @@ describe('authBlockingGuard', () => { }, }; + const mockStoreModuleConfig = { + runtimeChecks: { + strictStateImmutability: true, + strictActionImmutability: true, + }, + }; + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - StoreModule.forRoot(authReducer, storeModuleConfig), + StoreModule.forRoot(authReducer, mockStoreModuleConfig), ], providers: [ provideMockStore({ initialState }), @@ -51,7 +55,7 @@ describe('authBlockingGuard', () => { beforeEach(() => { store = TestBed.inject(Store); - mockStore = store as MockStore; + mockStore = store as MockStore; guard = authBlockingGuard; }); diff --git a/src/app/core/auth/auth-blocking.guard.ts b/src/app/core/auth/auth-blocking.guard.ts index c76480ec0d2..b9d1495d75f 100644 --- a/src/app/core/auth/auth-blocking.guard.ts +++ b/src/app/core/auth/auth-blocking.guard.ts @@ -16,7 +16,7 @@ import { take, } from 'rxjs/operators'; -import { AppState } from '../../app.reducer'; +import { CoreState } from '../core-state.model'; import { isAuthenticationBlocking } from './selectors'; /** @@ -27,7 +27,7 @@ import { isAuthenticationBlocking } from './selectors'; export const authBlockingGuard: CanActivateFn = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, - store: Store = inject(Store), + store: Store = inject(Store), ): Observable => { return store.pipe(select(isAuthenticationBlocking)).pipe( map((isBlocking: boolean) => isBlocking === false), diff --git a/src/app/core/auth/auth-methods.service.ts b/src/app/core/auth/auth-methods.service.ts index ad1f2358e09..91b2b1f49d2 100644 --- a/src/app/core/auth/auth-methods.service.ts +++ b/src/app/core/auth/auth-methods.service.ts @@ -7,9 +7,9 @@ import uniqBy from 'lodash/uniqBy'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AppState } from '../../app.reducer'; import { AuthMethodTypeComponent } from '../../shared/log-in/methods/auth-methods.type'; import { rendersAuthMethodType } from '../../shared/log-in/methods/log-in.methods-decorator.utils'; +import { CoreState } from '../core-state.model'; import { AuthMethod } from './models/auth.method'; import { AuthMethodType } from './models/auth.method-type'; import { getAuthenticationMethods } from './selectors'; @@ -22,7 +22,7 @@ import { getAuthenticationMethods } from './selectors'; * Provides methods to retrieve and process authentication methods from the application store. */ export class AuthMethodsService { - constructor(protected store: Store) { + constructor(protected store: Store) { } /** diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts index 733efd6a014..059ec24c0c0 100644 --- a/src/app/core/auth/auth.effects.spec.ts +++ b/src/app/core/auth/auth.effects.spec.ts @@ -22,16 +22,13 @@ import { throwError as observableThrow, } from 'rxjs'; -import { - AppState, - storeModuleConfig, -} from '../../app.reducer'; import { authMethodsMock, AuthServiceStub, } from '../../shared/testing/auth-service.stub'; import { EPersonMock } from '../../shared/testing/eperson.mock'; import { StoreActionTypes } from '../../store.actions'; +import { CoreState } from '../core-state.model'; import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service'; import { AuthActionTypes, @@ -68,10 +65,17 @@ describe('AuthEffects', () => { let authServiceStub; let initialState; let token; - let store: MockStore; + let store: MockStore; const authorizationService = jasmine.createSpyObj(['invalidateAuthorizationsRequestCache']); + const mockStoreModuleConfig = { + runtimeChecks: { + strictStateImmutability: true, + strictActionImmutability: true, + }, + }; + function init() { authServiceStub = new AuthServiceStub(); token = authServiceStub.getToken(); @@ -91,7 +95,7 @@ describe('AuthEffects', () => { init(); TestBed.configureTestingModule({ imports: [ - StoreModule.forRoot({ auth: authReducer }, storeModuleConfig), + StoreModule.forRoot({ auth: authReducer }, mockStoreModuleConfig), ], providers: [ AuthEffects, diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index 05f8c597033..86308498251 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -33,10 +33,10 @@ import { } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; -import { AppState } from '../../app.reducer'; import { hasValue } from '../../shared/empty.util'; import { NotificationsActionTypes } from '../../shared/notifications/notifications.actions'; import { StoreActionTypes } from '../../store.actions'; +import { CoreState } from '../core-state.model'; import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service'; import { RequestActionTypes } from '../data/request.actions'; import { EPerson } from '../eperson/models/eperson.model'; @@ -322,6 +322,6 @@ export class AuthEffects { private zone: NgZone, private authorizationsService: AuthorizationDataService, private authService: AuthService, - private store: Store) { + private store: Store) { } } diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts index e61b1180e1f..2750a7ec127 100644 --- a/src/app/core/auth/auth.interceptor.ts +++ b/src/app/core/auth/auth.interceptor.ts @@ -24,12 +24,12 @@ import { map, } from 'rxjs/operators'; -import { AppState } from '../../app.reducer'; import { hasValue, isNotEmpty, isNotNull, } from '../../shared/empty.util'; +import { CoreState } from '../core-state.model'; import { RedirectWhenTokenExpiredAction } from './auth.actions'; import { AuthService } from './auth.service'; import { AuthMethod } from './models/auth.method'; @@ -45,7 +45,7 @@ export class AuthInterceptor implements HttpInterceptor { // we're creating a refresh token request list protected refreshTokenRequestUrls = []; - constructor(private inj: Injector, private router: Router, private store: Store) { + constructor(private inj: Injector, private router: Router, private store: Store) { } /** diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts index 94a8bb2cb1f..ab130b2899c 100644 --- a/src/app/core/auth/auth.service.spec.ts +++ b/src/app/core/auth/auth.service.spec.ts @@ -20,7 +20,6 @@ import { } from 'rxjs'; import { REQUEST } from '../../../express.tokens'; -import { AppState } from '../../app.reducer'; import { getMockTranslateService } from '../../shared/mocks/translate.service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; @@ -36,6 +35,7 @@ import { SpecialGroupDataMock$, } from '../../shared/testing/special-group.mock'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { CoreState } from '../core-state.model'; import { RemoteData } from '../data/remote-data'; import { EPersonDataService } from '../eperson/eperson-data.service'; import { EPerson } from '../eperson/models/eperson.model'; @@ -282,7 +282,7 @@ describe('AuthService test', () => { }).compileComponents(); })); - beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => { + beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => { store .subscribe((state) => { (state as any).core = Object.create({}); @@ -358,7 +358,7 @@ describe('AuthService test', () => { }).compileComponents(); })); - beforeEach(inject([ClientCookieService, AuthRequestService, Store, Router, RouteService], (cookieService: ClientCookieService, authReqService: AuthRequestService, store: Store, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => { + beforeEach(inject([ClientCookieService, AuthRequestService, Store, Router, RouteService], (cookieService: ClientCookieService, authReqService: AuthRequestService, store: Store, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => { const expiredToken: AuthTokenInfo = new AuthTokenInfo('test_token'); expiredToken.expires = Date.now() - (1000 * 60 * 60); authenticatedState = { @@ -587,7 +587,7 @@ describe('AuthService test', () => { }).compileComponents(); })); - beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => { + beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => { store .subscribe((state) => { (state as any).core = Object.create({}); @@ -627,7 +627,7 @@ describe('AuthService test', () => { }).compileComponents(); })); - beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => { + beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => { store .subscribe((state) => { (state as any).core = Object.create({}); diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 5fe17b8631f..899d16dd486 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -23,7 +23,6 @@ import { } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; -import { AppState } from '../../app.reducer'; import { hasNoValue, hasValue, @@ -36,6 +35,7 @@ import { import { NotificationsService } from '../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { followLink } from '../../shared/utils/follow-link-config.model'; +import { CoreState } from '../core-state.model'; import { buildPaginatedList, PaginatedList, @@ -115,7 +115,7 @@ export class AuthService { protected router: Router, protected routeService: RouteService, protected storage: CookieService, - protected store: Store, + protected store: Store, protected hardRedirectService: HardRedirectService, protected notificationService: NotificationsService, protected translateService: TranslateService, diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts index eba6dc89f9e..999d884727f 100644 --- a/src/app/core/auth/authenticated.guard.ts +++ b/src/app/core/auth/authenticated.guard.ts @@ -18,7 +18,7 @@ import { switchMap, } from 'rxjs/operators'; -import { AppState } from '../../app.reducer'; +import { CoreState } from '../core-state.model'; import { AuthService, LOGIN_ROUTE, @@ -39,7 +39,7 @@ export const authenticatedGuard: CanActivateFn = ( state: RouterStateSnapshot, authService: AuthService = inject(AuthService), router: Router = inject(Router), - store: Store = inject(Store), + store: Store = inject(Store), ): Observable => { const url = state.url; // redirect to sign in page if user is not authenticated diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts index d287604c24d..d9dc7152b70 100644 --- a/src/app/core/auth/server-auth.service.ts +++ b/src/app/core/auth/server-auth.service.ts @@ -14,12 +14,12 @@ import { REQUEST, RESPONSE, } from '../../../express.tokens'; -import { AppState } from '../../app.reducer'; import { hasValue, isNotEmpty, } from '../../shared/empty.util'; import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { CoreState } from '../core-state.model'; import { RemoteData } from '../data/remote-data'; import { HttpOptions } from '../dspace-rest/dspace-rest.service'; import { EPersonDataService } from '../eperson/eperson-data.service'; @@ -53,7 +53,7 @@ export class ServerAuthService extends AuthService { protected router: Router, protected routeService: RouteService, protected storage: CookieService, - protected store: Store, + protected store: Store, protected hardRedirectService: HardRedirectService, protected notificationService: NotificationsService, protected translateService: TranslateService, From 8036082e8606587dcbc2df6b958141cb058192ee Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 24 Jul 2025 01:05:26 +0200 Subject: [PATCH 05/52] [DURACOM-327] Decoupling state management from data service WIP --- .../epeople-registry.component.spec.ts | 9 +- .../epeople-registry.component.ts | 6 +- .../epeople-registry.service.spec.ts | 66 ++++++++++++++ .../epeople-registry.service.ts | 66 ++++++++++++++ .../eperson-form/eperson-form.component.ts | 8 +- .../bitstream-format.service.spec.ts | 61 +++++++++++++ .../bitstream-format.service.ts | 65 ++++++++++++++ .../bitstream-formats.component.spec.ts | 58 ++++++++----- .../bitstream-formats.component.ts | 10 ++- .../bitstream-format-data.service.spec.ts | 86 +------------------ .../data/bitstream-format-data.service.ts | 49 ----------- .../data/relationship-data.service.spec.ts | 7 +- .../core/data/relationship-data.service.ts | 63 -------------- .../core/eperson/eperson-data.service.spec.ts | 37 +------- src/app/core/eperson/eperson-data.service.ts | 52 ----------- ...-list-submission-element.component.spec.ts | 8 +- ...esult-list-submission-element.component.ts | 14 +-- ...-list-submission-element.component.spec.ts | 9 +- ...esult-list-submission-element.component.ts | 8 +- .../edit-relationship-list.component.spec.ts | 8 ++ .../edit-relationship-list.component.ts | 6 +- ...ynamic-form-control-container.component.ts | 6 +- ...dynamic-lookup-relation-modal.component.ts | 8 +- .../name-variant.service.ts | 77 +++++++++++++++++ 24 files changed, 430 insertions(+), 357 deletions(-) create mode 100644 src/app/access-control/epeople-registry/epeople-registry.service.spec.ts create mode 100644 src/app/access-control/epeople-registry/epeople-registry.service.ts create mode 100644 src/app/admin/admin-registries/bitstream-formats/bitstream-format.service.spec.ts create mode 100644 src/app/admin/admin-registries/bitstream-formats/bitstream-format.service.ts create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.service.ts diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts index 99e2cde4414..71b9a6ba267 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts @@ -57,6 +57,7 @@ import { import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub'; import { EPeopleRegistryComponent } from './epeople-registry.component'; +import { EpeopleRegistryService } from './epeople-registry.service'; import { EPersonFormComponent } from './eperson-form/eperson-form.component'; describe('EPeopleRegistryComponent', () => { @@ -66,6 +67,7 @@ describe('EPeopleRegistryComponent', () => { let mockEPeople: EPerson[]; let ePersonDataServiceStub: any; + let epeopleRegistryServiceStub: any; let authorizationService: AuthorizationDataService; let modalService: NgbModal; let paginationService: PaginationServiceStub; @@ -73,6 +75,9 @@ describe('EPeopleRegistryComponent', () => { beforeEach(waitForAsync(async () => { jasmine.getEnv().allowRespy(true); mockEPeople = [EPersonMock, EPersonMock2]; + epeopleRegistryServiceStub = jasmine.createSpyObj('', { + getActiveEPerson: of(null), + }); ePersonDataServiceStub = { activeEPerson: null, allEpeople: mockEPeople, @@ -84,9 +89,6 @@ describe('EPeopleRegistryComponent', () => { currentPage: 1, }), this.allEpeople)); }, - getActiveEPerson(): Observable { - return of(this.activeEPerson); - }, searchByScope(scope: string, query: string, options: FindListOptions = {}): Observable>> { if (scope === 'email') { const result = this.allEpeople.find((ePerson: EPerson) => { @@ -155,6 +157,7 @@ describe('EPeopleRegistryComponent', () => { TranslateModule.forRoot(), EPeopleRegistryComponent, BtnDisabledDirective], providers: [ { provide: EPersonDataService, useValue: ePersonDataServiceStub }, + { provide: EpeopleRegistryService, useValue: epeopleRegistryServiceStub }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, { provide: AuthorizationDataService, useValue: authorizationService }, { provide: FormBuilderService, useValue: builderService }, diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts index 3eb7a148c3f..22a3d5b6aa3 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts @@ -61,14 +61,13 @@ import { getEPersonEditRoute, getEPersonsRoute, } from '../access-control-routing-paths'; -import { EPersonFormComponent } from './eperson-form/eperson-form.component'; +import { EpeopleRegistryService } from './epeople-registry.service'; @Component({ selector: 'ds-epeople-registry', templateUrl: './epeople-registry.component.html', imports: [ AsyncPipe, - EPersonFormComponent, NgClass, PaginationComponent, ReactiveFormsModule, @@ -135,6 +134,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy { subs: Subscription[] = []; constructor(private epersonService: EPersonDataService, + private epeopleRegistryService: EpeopleRegistryService, private translateService: TranslateService, private notificationsService: NotificationsService, private authorizationService: AuthorizationDataService, @@ -163,7 +163,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy { initialisePage() { this.searching$.next(true); this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery }); - this.activeEPerson$ = this.epersonService.getActiveEPerson(); + this.activeEPerson$ = this.epeopleRegistryService.getActiveEPerson(); this.subs.push(this.ePeople$.pipe( switchMap((epeople: PaginatedList) => { if (epeople.pageInfo.totalElements > 0) { diff --git a/src/app/access-control/epeople-registry/epeople-registry.service.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.service.spec.ts new file mode 100644 index 00000000000..30bef27dae4 --- /dev/null +++ b/src/app/access-control/epeople-registry/epeople-registry.service.spec.ts @@ -0,0 +1,66 @@ +import { TestBed } from '@angular/core/testing'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { + MockStore, + provideMockStore, +} from '@ngrx/store/testing'; +import { cold } from 'jasmine-marbles'; + +import { AppState } from '../../app.reducer'; +import { + EPeopleRegistryCancelEPersonAction, + EPeopleRegistryEditEPersonAction, +} from './epeople-registry.actions'; +import { + editEPersonSelector, + EpeopleRegistryService, +} from './epeople-registry.service'; + +describe('EpeopleRegistryService', () => { + let service: EpeopleRegistryService; + let store: MockStore; + const initialState = {}; + + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ + EpeopleRegistryService, + provideMockStore({ initialState }), + ], + }); + + service = TestBed.inject(EpeopleRegistryService); + store = TestBed.inject(MockStore); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + describe('#getActiveEPerson', () => { + it('should select the editEPersonSelector from the store', () => { + const mockEPerson: EPerson = { id: '123', name: 'Test User' } as EPerson; + store.overrideSelector(editEPersonSelector, mockEPerson); + + const expected = cold('a', { a: mockEPerson }); + expect(service.getActiveEPerson()).toBeObservable(expected); + }); + }); + + describe('#cancelEditEPerson', () => { + it('should dispatch EPeopleRegistryCancelEPersonAction', () => { + const dispatchSpy = spyOn(store, 'dispatch'); + service.cancelEditEPerson(); + expect(dispatchSpy).toHaveBeenCalledWith(new EPeopleRegistryCancelEPersonAction()); + }); + }); + + describe('#editEPerson', () => { + it('should dispatch EPeopleRegistryEditEPersonAction with the given EPerson', () => { + const dispatchSpy = spyOn(store, 'dispatch'); + const mockEPerson: EPerson = { id: '456', name: 'Another User' } as EPerson; + service.editEPerson(mockEPerson); + expect(dispatchSpy).toHaveBeenCalledWith(new EPeopleRegistryEditEPersonAction(mockEPerson)); + }); + }); +}); diff --git a/src/app/access-control/epeople-registry/epeople-registry.service.ts b/src/app/access-control/epeople-registry/epeople-registry.service.ts new file mode 100644 index 00000000000..13ae97eab50 --- /dev/null +++ b/src/app/access-control/epeople-registry/epeople-registry.service.ts @@ -0,0 +1,66 @@ +import { Injectable } from '@angular/core'; +import { EPerson } from '@core/eperson/models/eperson.model'; +import { + createSelector, + select, + Store, +} from '@ngrx/store'; +import { Observable } from 'rxjs'; +import { take } from 'rxjs/operators'; + +import { AppState } from '../../app.reducer'; +import { getEPersonEditRoute } from '../access-control-routing-paths'; +import { + EPeopleRegistryCancelEPersonAction, + EPeopleRegistryEditEPersonAction, +} from './epeople-registry.actions'; +import { EPeopleRegistryState } from './epeople-registry.reducers'; + +const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry; +export const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson); + +@Injectable({ + providedIn: 'root', +}) +export class EpeopleRegistryService { + + constructor(protected store: Store) { + } + + /** + * Method to retrieve the eperson that is currently being edited + */ + public getActiveEPerson(): Observable { + return this.store.pipe(select(editEPersonSelector)); + } + + /** + * Method to cancel editing an EPerson, dispatches a cancel EPerson action + */ + public cancelEditEPerson() { + this.store.dispatch(new EPeopleRegistryCancelEPersonAction()); + } + + /** + * Method to set the EPerson being edited, dispatches an edit EPerson action + * @param ePerson The EPerson to edit + */ + public editEPerson(ePerson: EPerson) { + this.store.dispatch(new EPeopleRegistryEditEPersonAction(ePerson)); + } + + /** + * Change which ePerson is being edited and return the link for EPeople edit page + * @param ePerson New EPerson to edit + */ + public startEditingNewEPerson(ePerson: EPerson): string { + this.getActiveEPerson().pipe(take(1)).subscribe((activeEPerson: EPerson) => { + if (ePerson === activeEPerson) { + this.cancelEditEPerson(); + } else { + this.editEPerson(ePerson); + } + }); + return getEPersonEditRoute(ePerson.id); + } +} diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts index 1d52cbf9688..b458740c485 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts @@ -72,6 +72,7 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio import { followLink } from '../../../shared/utils/follow-link-config.model'; import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe'; import { getEPersonsRoute } from '../../access-control-routing-paths'; +import { EpeopleRegistryService } from '../epeople-registry.service'; import { ValidateEmailNotTaken } from './validators/email-taken.validator'; @Component({ @@ -239,6 +240,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy { constructor( protected changeDetectorRef: ChangeDetectorRef, public epersonService: EPersonDataService, + public epeopleRegistryService: EpeopleRegistryService, public groupsDataService: GroupDataService, private formBuilderService: FormBuilderService, private translateService: TranslateService, @@ -256,7 +258,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy { } ngOnInit() { - this.activeEPerson$ = this.epersonService.getActiveEPerson(); + this.activeEPerson$ = this.epeopleRegistryService.getActiveEPerson(); this.subs.push(this.activeEPerson$.subscribe((eperson: EPerson) => { this.epersonInitial = eperson; if (hasValue(eperson)) { @@ -274,7 +276,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy { initialisePage() { if (this.route.snapshot.params.id) { this.subs.push(this.epersonService.findById(this.route.snapshot.params.id).subscribe((ePersonRD: RemoteData) => { - this.epersonService.editEPerson(ePersonRD.payload); + this.epeopleRegistryService.editEPerson(ePersonRD.payload); })); } this.firstName = new DynamicInputModel({ @@ -393,7 +395,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy { * Stop editing the currently selected eperson */ onCancel() { - this.epersonService.cancelEditEPerson(); + this.epeopleRegistryService.cancelEditEPerson(); this.cancelForm.emit(); void this.router.navigate([getEPersonsRoute()]); } diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.service.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.service.spec.ts new file mode 100644 index 00000000000..5cfa6187164 --- /dev/null +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.service.spec.ts @@ -0,0 +1,61 @@ +import { waitForAsync } from '@angular/core/testing'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { createMockStore } from '@ngrx/store/testing'; + +import { + BitstreamFormatsRegistryDeselectAction, + BitstreamFormatsRegistryDeselectAllAction, + BitstreamFormatsRegistrySelectAction, +} from './bitstream-format.actions'; +import { BitstreamFormatService } from './bitstream-format.service'; + +describe('BitstreamFormatDataService', () => { + let service: BitstreamFormatService; + + const store: any = createMockStore({}); + + function initTestService() { + return new BitstreamFormatService(store); + } + + describe('selectBitstreamFormat', () => { + beforeEach(waitForAsync(() => { + service = initTestService(); + spyOn(store, 'dispatch'); + })); + it('should add a selected bitstream to the store', () => { + const format = new BitstreamFormat(); + format.uuid = 'uuid'; + + service.selectBitstreamFormat(format); + expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistrySelectAction(format)); + }); + }); + + describe('deselectBitstreamFormat', () => { + beforeEach(waitForAsync(() => { + service = initTestService(); + spyOn(store, 'dispatch'); + })); + it('should remove a bitstream from the store', () => { + const format = new BitstreamFormat(); + format.uuid = 'uuid'; + + service.deselectBitstreamFormat(format); + expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistryDeselectAction(format)); + }); + }); + + describe('deselectAllBitstreamFormats', () => { + beforeEach(waitForAsync(() => { + service = initTestService(); + spyOn(store, 'dispatch'); + + })); + it('should remove all bitstreamFormats from the store', () => { + service.deselectAllBitstreamFormats(); + expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistryDeselectAllAction()); + }); + }); + +}); diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.service.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.service.ts new file mode 100644 index 00000000000..e776800219e --- /dev/null +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.service.ts @@ -0,0 +1,65 @@ +import { Injectable } from '@angular/core'; +import { BitstreamFormat } from '@core/shared/bitstream-format.model'; +import { + createSelector, + select, + Store, +} from '@ngrx/store'; +import { Observable } from 'rxjs'; + +import { AppState } from '../../../app.reducer'; +import { + BitstreamFormatsRegistryDeselectAction, + BitstreamFormatsRegistryDeselectAllAction, + BitstreamFormatsRegistrySelectAction, +} from './bitstream-format.actions'; +import { BitstreamFormatRegistryState } from './bitstream-format.reducers'; + + +export const bitstreamFormatsStateSelector = (state: AppState) => state.bitstreamFormats; +const selectedBitstreamFormatSelector = createSelector( + bitstreamFormatsStateSelector, + (bitstreamFormatRegistryState: BitstreamFormatRegistryState) => bitstreamFormatRegistryState.selectedBitstreamFormats, +); + +/** + * A service responsible for fetching/sending data from/to the REST API on the bitstreamformats endpoint + */ +@Injectable({ providedIn: 'root' }) +export class BitstreamFormatService { + + constructor( + protected store: Store, + ) { + } + + /** + * Gets all the selected BitstreamFormats from the store + */ + public getSelectedBitstreamFormats(): Observable { + return this.store.pipe(select(selectedBitstreamFormatSelector)); + } + + /** + * Adds a BistreamFormat to the selected BitstreamFormats in the store + * @param bitstreamFormat + */ + public selectBitstreamFormat(bitstreamFormat: BitstreamFormat) { + this.store.dispatch(new BitstreamFormatsRegistrySelectAction(bitstreamFormat)); + } + + /** + * Removes a BistreamFormat from the list of selected BitstreamFormats in the store + * @param bitstreamFormat + */ + public deselectBitstreamFormat(bitstreamFormat: BitstreamFormat) { + this.store.dispatch(new BitstreamFormatsRegistryDeselectAction(bitstreamFormat)); + } + + /** + * Removes all BitstreamFormats from the list of selected BitstreamFormats in the store + */ + public deselectAllBitstreamFormats() { + this.store.dispatch(new BitstreamFormatsRegistryDeselectAllAction()); + } +} diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts index 1120a05b4b1..c314c459ce4 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts @@ -27,11 +27,13 @@ import { NotificationsServiceStub } from '../../../shared/testing/notifications- import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; import { createPaginatedList } from '../../../shared/testing/utils.test'; import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe'; +import { BitstreamFormatService } from './bitstream-format.service'; import { BitstreamFormatsComponent } from './bitstream-formats.component'; describe('BitstreamFormatsComponent', () => { let comp: BitstreamFormatsComponent; let fixture: ComponentFixture; + let bitstreamFormatDataService; let bitstreamFormatService; let notificationsServiceStub; let paginationService; @@ -87,15 +89,17 @@ describe('BitstreamFormatsComponent', () => { const initAsync = () => { notificationsServiceStub = new NotificationsServiceStub(); - bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', { + bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', { findAll: of(mockFormatsRD), find: createSuccessfulRemoteDataObject$(mockFormatsList[0]), + delete: createSuccessfulRemoteDataObject$({}), + clearBitStreamFormatRequests: of('cleared'), + }); + bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', { getSelectedBitstreamFormats: hot('a', { a: mockFormatsList }), selectBitstreamFormat: {}, deselectBitstreamFormat: {}, deselectAllBitstreamFormats: {}, - delete: createSuccessfulRemoteDataObject$({}), - clearBitStreamFormatRequests: of('cleared'), }); paginationService = new PaginationServiceStub(); @@ -109,7 +113,8 @@ describe('BitstreamFormatsComponent', () => { ], providers: [ provideMockStore(), - { provide: BitstreamFormatDataService, useValue: bitstreamFormatService }, + { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService }, + { provide: BitstreamFormatService, useValue: bitstreamFormatService }, { provide: NotificationsService, useValue: notificationsServiceStub }, { provide: PaginationService, useValue: paginationService }, ], @@ -224,15 +229,18 @@ describe('BitstreamFormatsComponent', () => { beforeEach(waitForAsync(() => { notificationsServiceStub = new NotificationsServiceStub(); - bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', { + bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', { findAll: of(mockFormatsRD), find: createSuccessfulRemoteDataObject$(mockFormatsList[0]), + delete: createNoContentRemoteDataObject$(), + clearBitStreamFormatRequests: of('cleared'), + }); + + bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', { getSelectedBitstreamFormats: of(mockFormatsList), selectBitstreamFormat: {}, deselectBitstreamFormat: {}, deselectAllBitstreamFormats: {}, - delete: createNoContentRemoteDataObject$(), - clearBitStreamFormatRequests: of('cleared'), }); paginationService = new PaginationServiceStub(); @@ -247,7 +255,8 @@ describe('BitstreamFormatsComponent', () => { ], providers: [ provideMockStore(), - { provide: BitstreamFormatDataService, useValue: bitstreamFormatService }, + { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService }, + { provide: BitstreamFormatService, useValue: bitstreamFormatService }, { provide: NotificationsService, useValue: notificationsServiceStub }, { provide: PaginationService, useValue: paginationService }, ], @@ -264,11 +273,11 @@ describe('BitstreamFormatsComponent', () => { it('should clear bitstream formats and show a success notification', () => { comp.deleteFormats(); - expect(bitstreamFormatService.clearBitStreamFormatRequests).toHaveBeenCalled(); - expect(bitstreamFormatService.delete).toHaveBeenCalledWith(bitstreamFormat1.id); - expect(bitstreamFormatService.delete).toHaveBeenCalledWith(bitstreamFormat2.id); - expect(bitstreamFormatService.delete).toHaveBeenCalledWith(bitstreamFormat3.id); - expect(bitstreamFormatService.delete).toHaveBeenCalledWith(bitstreamFormat4.id); + expect(bitstreamFormatDataService.clearBitStreamFormatRequests).toHaveBeenCalled(); + expect(bitstreamFormatDataService.delete).toHaveBeenCalledWith(bitstreamFormat1.id); + expect(bitstreamFormatDataService.delete).toHaveBeenCalledWith(bitstreamFormat2.id); + expect(bitstreamFormatDataService.delete).toHaveBeenCalledWith(bitstreamFormat3.id); + expect(bitstreamFormatDataService.delete).toHaveBeenCalledWith(bitstreamFormat4.id); expect(notificationsServiceStub.success).toHaveBeenCalledWith('admin.registries.bitstream-formats.delete.success.head', 'admin.registries.bitstream-formats.delete.success.amount'); @@ -281,17 +290,19 @@ describe('BitstreamFormatsComponent', () => { beforeEach(waitForAsync(() => { notificationsServiceStub = new NotificationsServiceStub(); - bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', { + bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', { findAll: of(mockFormatsRD), find: createSuccessfulRemoteDataObject$(mockFormatsList[0]), + delete: createFailedRemoteDataObject$(), + clearBitStreamFormatRequests: of('cleared'), + }); + + bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', { getSelectedBitstreamFormats: of(mockFormatsList), selectBitstreamFormat: {}, deselectBitstreamFormat: {}, deselectAllBitstreamFormats: {}, - delete: createFailedRemoteDataObject$(), - clearBitStreamFormatRequests: of('cleared'), }); - paginationService = new PaginationServiceStub(); TestBed.configureTestingModule({ @@ -302,7 +313,8 @@ describe('BitstreamFormatsComponent', () => { TranslateModule.forRoot(), ], providers: [ - { provide: BitstreamFormatDataService, useValue: bitstreamFormatService }, + { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService }, + { provide: BitstreamFormatService, useValue: bitstreamFormatService }, { provide: NotificationsService, useValue: notificationsServiceStub }, { provide: PaginationService, useValue: paginationService }, ], @@ -319,11 +331,11 @@ describe('BitstreamFormatsComponent', () => { it('should clear bitstream formats and show an error notification', () => { comp.deleteFormats(); - expect(bitstreamFormatService.clearBitStreamFormatRequests).toHaveBeenCalled(); - expect(bitstreamFormatService.delete).toHaveBeenCalledWith(bitstreamFormat1.id); - expect(bitstreamFormatService.delete).toHaveBeenCalledWith(bitstreamFormat2.id); - expect(bitstreamFormatService.delete).toHaveBeenCalledWith(bitstreamFormat3.id); - expect(bitstreamFormatService.delete).toHaveBeenCalledWith(bitstreamFormat4.id); + expect(bitstreamFormatDataService.clearBitStreamFormatRequests).toHaveBeenCalled(); + expect(bitstreamFormatDataService.delete).toHaveBeenCalledWith(bitstreamFormat1.id); + expect(bitstreamFormatDataService.delete).toHaveBeenCalledWith(bitstreamFormat2.id); + expect(bitstreamFormatDataService.delete).toHaveBeenCalledWith(bitstreamFormat3.id); + expect(bitstreamFormatDataService.delete).toHaveBeenCalledWith(bitstreamFormat4.id); expect(notificationsServiceStub.error).toHaveBeenCalledWith('admin.registries.bitstream-formats.delete.failure.head', 'admin.registries.bitstream-formats.delete.failure.amount'); diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index af23b68d378..bc13ea14a09 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -29,6 +29,7 @@ import { import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; +import { BitstreamFormatService } from './bitstream-format.service'; /** * This component renders a list of bitstream formats @@ -68,7 +69,8 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { constructor(private notificationsService: NotificationsService, private translateService: TranslateService, - private bitstreamFormatService: BitstreamFormatDataService, + private bitstreamFormatDataService: BitstreamFormatDataService, + private bitstreamFormatService: BitstreamFormatService, private paginationService: PaginationService, ) { } @@ -78,13 +80,13 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { * Deletes the currently selected formats from the registry and updates the presented list */ deleteFormats() { - this.bitstreamFormatService.clearBitStreamFormatRequests(); + this.bitstreamFormatDataService.clearBitStreamFormatRequests(); this.bitstreamFormatService.getSelectedBitstreamFormats().pipe( take(1), // emit all formats in the array one at a time mergeMap((formats: BitstreamFormat[]) => formats), // delete each format - mergeMap((format: BitstreamFormat) => this.bitstreamFormatService.delete(format.id).pipe( + mergeMap((format: BitstreamFormat) => this.bitstreamFormatDataService.delete(format.id).pipe( // wait for each response to come back getFirstCompletedRemoteData(), // return a boolean to indicate whether a response succeeded @@ -162,7 +164,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { ngOnInit(): void { this.bitstreamFormats$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe( switchMap((findListOptions: FindListOptions) => { - return this.bitstreamFormatService.findAll(findListOptions); + return this.bitstreamFormatDataService.findAll(findListOptions); }), ); this.selectedBitstreamFormatIDs$ = this.selectedBitstreamFormatIDs(); diff --git a/src/app/core/data/bitstream-format-data.service.spec.ts b/src/app/core/data/bitstream-format-data.service.spec.ts index 794ec100a54..12bd801c7e8 100644 --- a/src/app/core/data/bitstream-format-data.service.spec.ts +++ b/src/app/core/data/bitstream-format-data.service.spec.ts @@ -1,8 +1,4 @@ import { waitForAsync } from '@angular/core/testing'; -import { - Action, - Store, -} from '@ngrx/store'; import { cold, getTestScheduler, @@ -14,12 +10,6 @@ import { } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { - BitstreamFormatsRegistryDeselectAction, - BitstreamFormatsRegistryDeselectAllAction, - BitstreamFormatsRegistrySelectAction, -} from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions'; -import { AppState } from '../../app.reducer'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; @@ -43,12 +33,6 @@ describe('BitstreamFormatDataService', () => { const responseCacheEntry = new RequestEntry(); responseCacheEntry.response = new RestResponse(true, 200, 'Success'); - const store = { - dispatch(action: Action) { - // Do Nothing - }, - } as Store; - const requestUUIDs = ['some', 'uuid']; const objectCache = jasmine.createSpyObj('objectCache', { @@ -79,12 +63,11 @@ describe('BitstreamFormatDataService', () => { objectCache, halService, notificationsService, - store, ); } describe('composition', () => { - const initService = () => new BitstreamFormatDataService(null, null, null, null, null, null); + const initService = () => new BitstreamFormatDataService(null, null, null, null, null); testFindAllDataImplementation(initService); testDeleteDataImplementation(initService); }); @@ -228,73 +211,6 @@ describe('BitstreamFormatDataService', () => { }); }); - describe('selectBitstreamFormat', () => { - beforeEach(waitForAsync(() => { - scheduler = getTestScheduler(); - requestService = jasmine.createSpyObj('requestService', { - send: {}, - getByHref: of(responseCacheEntry), - getByUUID: cold('a', { a: responseCacheEntry }), - setStaleByUUID: of(true), - generateRequestId: 'request-id', - removeByHrefSubstring: {}, - }); - service = initTestService(halEndpointService); - spyOn(store, 'dispatch'); - })); - it('should add a selected bitstream to the store', () => { - const format = new BitstreamFormat(); - format.uuid = 'uuid'; - - service.selectBitstreamFormat(format); - expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistrySelectAction(format)); - }); - }); - - describe('deselectBitstreamFormat', () => { - beforeEach(waitForAsync(() => { - scheduler = getTestScheduler(); - requestService = jasmine.createSpyObj('requestService', { - send: {}, - getByHref: of(responseCacheEntry), - getByUUID: cold('a', { a: responseCacheEntry }), - setStaleByUUID: of(true), - generateRequestId: 'request-id', - removeByHrefSubstring: {}, - }); - service = initTestService(halEndpointService); - spyOn(store, 'dispatch'); - })); - it('should remove a bitstream from the store', () => { - const format = new BitstreamFormat(); - format.uuid = 'uuid'; - - service.deselectBitstreamFormat(format); - expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistryDeselectAction(format)); - }); - }); - - describe('deselectAllBitstreamFormats', () => { - beforeEach(waitForAsync(() => { - scheduler = getTestScheduler(); - requestService = jasmine.createSpyObj('requestService', { - send: {}, - getByHref: of(responseCacheEntry), - getByUUID: cold('a', { a: responseCacheEntry }), - setStaleByUUID: of(true), - generateRequestId: 'request-id', - removeByHrefSubstring: {}, - }); - service = initTestService(halEndpointService); - spyOn(store, 'dispatch'); - - })); - it('should remove all bitstreamFormats from the store', () => { - service.deselectAllBitstreamFormats(); - expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistryDeselectAllAction()); - }); - }); - describe('delete', () => { beforeEach(waitForAsync(() => { scheduler = getTestScheduler(); diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts index 472ce416c1a..b3f0293df1d 100644 --- a/src/app/core/data/bitstream-format-data.service.ts +++ b/src/app/core/data/bitstream-format-data.service.ts @@ -1,9 +1,4 @@ import { Injectable } from '@angular/core'; -import { - createSelector, - select, - Store, -} from '@ngrx/store'; import { Observable } from 'rxjs'; import { distinctUntilChanged, @@ -12,13 +7,6 @@ import { } from 'rxjs/operators'; import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model'; -import { - BitstreamFormatsRegistryDeselectAction, - BitstreamFormatsRegistryDeselectAllAction, - BitstreamFormatsRegistrySelectAction, -} from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions'; -import { BitstreamFormatRegistryState } from '../../admin/admin-registries/bitstream-formats/bitstream-format.reducers'; -import { AppState } from '../../app.reducer'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../cache/object-cache.service'; @@ -45,12 +33,6 @@ import { } from './request.models'; import { RequestService } from './request.service'; -export const bitstreamFormatsStateSelector = (state: AppState) => state.bitstreamFormats; -const selectedBitstreamFormatSelector = createSelector( - bitstreamFormatsStateSelector, - (bitstreamFormatRegistryState: BitstreamFormatRegistryState) => bitstreamFormatRegistryState.selectedBitstreamFormats, -); - /** * A service responsible for fetching/sending data from/to the REST API on the bitstreamformats endpoint */ @@ -68,7 +50,6 @@ export class BitstreamFormatDataService extends IdentifiableDataService, ) { super('bitstreamformats', requestService, rdbService, objectCache, halService); @@ -136,36 +117,6 @@ export class BitstreamFormatDataService extends IdentifiableDataService { - return this.store.pipe(select(selectedBitstreamFormatSelector)); - } - - /** - * Adds a BistreamFormat to the selected BitstreamFormats in the store - * @param bitstreamFormat - */ - public selectBitstreamFormat(bitstreamFormat: BitstreamFormat) { - this.store.dispatch(new BitstreamFormatsRegistrySelectAction(bitstreamFormat)); - } - - /** - * Removes a BistreamFormat from the list of selected BitstreamFormats in the store - * @param bitstreamFormat - */ - public deselectBitstreamFormat(bitstreamFormat: BitstreamFormat) { - this.store.dispatch(new BitstreamFormatsRegistryDeselectAction(bitstreamFormat)); - } - - /** - * Removes all BitstreamFormats from the list of selected BitstreamFormats in the store - */ - public deselectAllBitstreamFormats() { - this.store.dispatch(new BitstreamFormatsRegistryDeselectAllAction()); - } - findByBitstream(bitstream: Bitstream): Observable> { return this.findByHref(bitstream._links.format.href); } diff --git a/src/app/core/data/relationship-data.service.spec.ts b/src/app/core/data/relationship-data.service.spec.ts index 89e11e5d818..30cc6d73095 100644 --- a/src/app/core/data/relationship-data.service.spec.ts +++ b/src/app/core/data/relationship-data.service.spec.ts @@ -1,6 +1,4 @@ import { TestBed } from '@angular/core/testing'; -import { Store } from '@ngrx/store'; -import { provideMockStore } from '@ngrx/store/testing'; import { of } from 'rxjs'; import { APP_CONFIG } from '../../../config/app-config.interface'; @@ -35,7 +33,7 @@ import { DeleteRequest } from './request.models'; import { RequestService } from './request.service'; import { RequestEntry } from './request-entry.model'; -describe('RelationshipDataService', () => { +describe('NameVariantService', () => { let service: RelationshipDataService; let requestService: RequestService; @@ -151,7 +149,6 @@ describe('RelationshipDataService', () => { { provide: ItemDataService, useValue: itemService }, { provide: RequestService, useValue: requestService }, { provide: PAGINATED_RELATIONS_TO_ITEMS_OPERATOR, useValue: jasmine.createSpy('paginatedRelationsToItems').and.returnValue((v) => v) }, - { provide: Store, useValue: provideMockStore() }, { provide: APP_CONFIG, useValue: environment }, RelationshipDataService, ], @@ -160,7 +157,7 @@ describe('RelationshipDataService', () => { }); describe('composition', () => { - const initService = () => new RelationshipDataService(null, null, null, null, null, null, null, null, environment); + const initService = () => new RelationshipDataService(null, null, null, null, null, null, null, environment); testSearchDataImplementation(initService); }); diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts index f28c9803303..e4c37ab0e7b 100644 --- a/src/app/core/data/relationship-data.service.ts +++ b/src/app/core/data/relationship-data.service.ts @@ -3,11 +3,6 @@ import { Inject, Injectable, } from '@angular/core'; -import { - MemoizedSelector, - select, - Store, -} from '@ngrx/store'; import { combineLatest as observableCombineLatest, Observable, @@ -28,10 +23,6 @@ import { APP_CONFIG, AppConfig, } from '../../../config/app-config.interface'; -import { - AppState, - keySelector, -} from '../../app.reducer'; import { compareArraysUsingIds, PAGINATED_RELATIONS_TO_ITEMS_OPERATOR, @@ -44,11 +35,6 @@ import { isNotEmptyOperator, } from '../../shared/empty.util'; import { ReorderableRelationship } from '../../shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component'; -import { - RemoveNameVariantAction, - SetNameVariantAction, -} from '../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions'; -import { NameVariantListState } from '../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer'; import { followLink, FollowLinkConfig, @@ -97,16 +83,6 @@ import { RequestService } from './request.service'; import { RequestEntryState } from './request-entry-state.model'; import { RestRequest } from './rest-request.model'; -const relationshipListsStateSelector = (state: AppState) => state.relationshipLists; - -const relationshipListStateSelector = (listID: string): MemoizedSelector => { - return keySelector(listID, relationshipListsStateSelector); -}; - -const relationshipStateSelector = (listID: string, itemID: string): MemoizedSelector => { - return keySelector(itemID, relationshipListStateSelector(listID)); -}; - /** * Return true if the Item in the payload of the source observable matches * the given Item by UUID @@ -135,7 +111,6 @@ export class RelationshipDataService extends IdentifiableDataService, @Inject(PAGINATED_RELATIONS_TO_ITEMS_OPERATOR) private paginatedRelationsToItems: (thisId: string) => (source: Observable>>) => Observable>>, @Inject(APP_CONFIG) private appConfig: AppConfig, ) { @@ -435,44 +410,6 @@ export class RelationshipDataService extends IdentifiableDataService { - return this.appStore.pipe( - select(relationshipStateSelector(listID, itemID)), - ); - } - - /** - * Method to remove the name variant for specific list and item - * @param listID The list for which to remove the name variant - * @param itemID The item ID for which to remove the name variant - */ - public removeNameVariant(listID: string, itemID: string) { - this.appStore.dispatch(new RemoveNameVariantAction(listID, itemID)); - } - - /** - * Method to retrieve all name variants for a single list - * @param listID The id of the list - */ - public getNameVariantsByListID(listID: string) { - return this.appStore.pipe(select(relationshipListStateSelector(listID))); - } - /** * Method to update the name variant on the server * @param item1 The first item of the relationship diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts index 620ca190b2c..9368a1941d2 100644 --- a/src/app/core/eperson/eperson-data.service.spec.ts +++ b/src/app/core/eperson/eperson-data.service.spec.ts @@ -14,13 +14,8 @@ import { compare, Operation, } from 'fast-json-patch'; -import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; -import { - EPeopleRegistryCancelEPersonAction, - EPeopleRegistryEditEPersonAction, -} from '../../access-control/epeople-registry/epeople-registry.actions'; import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock'; import { getMockRequestService } from '../../shared/mocks/request.service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; @@ -55,10 +50,7 @@ import { import { RequestService } from '../data/request.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; import { Item } from '../shared/item.model'; -import { - editEPersonSelector, - EPersonDataService, -} from './eperson-data.service'; +import { EPersonDataService } from './eperson-data.service'; import { EPerson } from './models/eperson.model'; describe('EPersonDataService', () => { @@ -327,33 +319,6 @@ describe('EPersonDataService', () => { })); }); - describe('getActiveEPerson', () => { - it('should retrieve the ePerson currently getting edited, if any', () => { - // Update the state with the ePerson (the provideMockStore doesn't update itself when dispatch is called) - store.overrideSelector(editEPersonSelector, EPersonMock); - - expect(service.getActiveEPerson()).toBeObservable(cold('a', { a: EPersonMock })); - }); - - it('should retrieve the ePerson currently getting edited, null if none being edited', () => { - expect(service.getActiveEPerson()).toBeObservable(cold('a', { a: null })); - }); - }); - - describe('cancelEditEPerson', () => { - it('should dispatch a CANCEL_EDIT_EPERSON action', () => { - service.cancelEditEPerson(); - expect(store.dispatch).toHaveBeenCalledWith(new EPeopleRegistryCancelEPersonAction()); - }); - }); - - describe('editEPerson', () => { - it('should dispatch a EDIT_EPERSON action with the EPerson to start editing', () => { - service.editEPerson(EPersonMock); - expect(store.dispatch).toHaveBeenCalledWith(new EPeopleRegistryEditEPersonAction(EPersonMock)); - }); - }); - describe('deleteEPerson', () => { beforeEach(() => { spyOn(service, 'delete').and.returnValue(createNoContentRemoteDataObject$()); diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts index a493f554053..2b20703fcd0 100644 --- a/src/app/core/eperson/eperson-data.service.ts +++ b/src/app/core/eperson/eperson-data.service.ts @@ -1,9 +1,4 @@ import { Injectable } from '@angular/core'; -import { - createSelector, - select, - Store, -} from '@ngrx/store'; import { Operation } from 'fast-json-patch'; import { Observable } from 'rxjs'; import { @@ -12,13 +7,6 @@ import { take, } from 'rxjs/operators'; -import { getEPersonEditRoute } from '../../access-control/access-control-routing-paths'; -import { - EPeopleRegistryCancelEPersonAction, - EPeopleRegistryEditEPersonAction, -} from '../../access-control/epeople-registry/epeople-registry.actions'; -import { EPeopleRegistryState } from '../../access-control/epeople-registry/epeople-registry.reducers'; -import { AppState } from '../../app.reducer'; import { hasNoValue, hasValue, @@ -69,8 +57,6 @@ import { EPerson } from './models/eperson.model'; // todo: optimize imports -const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry; -export const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson); /** * A service to retrieve {@link EPerson}s from the REST API & EPerson related CRUD actions @@ -92,7 +78,6 @@ export class EPersonDataService extends IdentifiableDataService impleme protected halService: HALEndpointService, protected comparator: DSOChangeAnalyzer, protected notificationsService: NotificationsService, - protected store: Store, ) { super('epersons', requestService, rdbService, objectCache, halService); @@ -305,28 +290,6 @@ export class EPersonDataService extends IdentifiableDataService impleme this.requestService.setStaleByHrefSubstring(href); } - /** - * Method to retrieve the eperson that is currently being edited - */ - public getActiveEPerson(): Observable { - return this.store.pipe(select(editEPersonSelector)); - } - - /** - * Method to cancel editing an EPerson, dispatches a cancel EPerson action - */ - public cancelEditEPerson() { - this.store.dispatch(new EPeopleRegistryCancelEPersonAction()); - } - - /** - * Method to set the EPerson being edited, dispatches an edit EPerson action - * @param ePerson The EPerson to edit - */ - public editEPerson(ePerson: EPerson) { - this.store.dispatch(new EPeopleRegistryEditEPersonAction(ePerson)); - } - /** * Method to delete an EPerson * @param ePerson The EPerson to delete @@ -335,21 +298,6 @@ export class EPersonDataService extends IdentifiableDataService impleme return this.delete(ePerson.id); } - /** - * Change which ePerson is being edited and return the link for EPeople edit page - * @param ePerson New EPerson to edit - */ - public startEditingNewEPerson(ePerson: EPerson): string { - this.getActiveEPerson().pipe(take(1)).subscribe((activeEPerson: EPerson) => { - if (ePerson === activeEPerson) { - this.cancelEditEPerson(); - } else { - this.editEPerson(ePerson); - } - }); - return getEPersonEditRoute(ePerson.id); - } - /** * Create a new EPerson using a token * @param eperson diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts index 039fe8492b6..3cf210cfd47 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts @@ -18,7 +18,6 @@ import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.servic import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; import { ItemDataService } from '@core/data/item-data.service'; import { buildPaginatedList } from '@core/data/paginated-list.model'; -import { RelationshipDataService } from '@core/data/relationship-data.service'; import { RemoteData } from '@core/data/remote-data'; import { Bitstream } from '@core/shared/bitstream.model'; import { HALEndpointService } from '@core/shared/hal-endpoint.service'; @@ -34,6 +33,7 @@ import { import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; +import { NameVariantService } from '../../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.service'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; @@ -51,7 +51,7 @@ let mockItemWithMetadata: ItemSearchResult; let mockItemWithoutMetadata: ItemSearchResult; let nameVariant; -let mockRelationshipService; +let mockNameVariantService; function init() { mockItemWithMetadata = Object.assign( @@ -98,7 +98,7 @@ function init() { }); nameVariant = 'Doe J.'; - mockRelationshipService = { + mockNameVariantService = { getNameVariant: () => of(nameVariant), }; } @@ -115,7 +115,7 @@ describe('OrgUnitSearchResultListSubmissionElementComponent', () => { imports: [TruncatePipe, OrgUnitSearchResultListSubmissionElementComponent], providers: [ { provide: TruncatableService, useValue: mockTruncatableService }, - { provide: RelationshipDataService, useValue: mockRelationshipService }, + { provide: NameVariantService, useValue: mockNameVariantService }, { provide: NotificationsService, useValue: {} }, { provide: TranslateService, useValue: {} }, { provide: NgbModal, useValue: {} }, diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts index 1c0b2dd6335..f06ec1c1eb4 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts @@ -6,22 +6,19 @@ import { } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { DSONameService } from '@core/breadcrumbs/dso-name.service'; -import { BitstreamDataService } from '@core/data/bitstream-data.service'; import { ItemDataService } from '@core/data/item-data.service'; -import { RelationshipDataService } from '@core/data/relationship-data.service'; import { Context } from '@core/shared/context.model'; import { Item } from '@core/shared/item.model'; import { MetadataValue } from '@core/shared/metadata.models'; import { ViewMode } from '@core/shared/view-mode.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateService } from '@ngx-translate/core'; import { take } from 'rxjs/operators'; import { APP_CONFIG, AppConfig, } from '../../../../../../config/app-config.interface'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; +import { NameVariantService } from '../../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.service'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; @@ -58,12 +55,9 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes showThumbnails: boolean; constructor(protected truncatableService: TruncatableService, - private relationshipService: RelationshipDataService, - private notificationsService: NotificationsService, - private translateService: TranslateService, + private nameVariantService: NameVariantService, private modalService: NgbModal, private itemDataService: ItemDataService, - private bitstreamDataService: BitstreamDataService, private selectableListService: SelectableListService, public dsoNameService: DSONameService, @Inject(APP_CONFIG) protected appConfig: AppConfig, @@ -81,7 +75,7 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes const alternatives = this.allMetadataValues(this.alternativeField); this.allSuggestions = [defaultValue, ...alternatives]; - this.relationshipService.getNameVariant(this.listID, this.dso.uuid) + this.nameVariantService.getNameVariant(this.listID, this.dso.uuid) .pipe(take(1)) .subscribe((nameVariant: string) => { this.selectedName = nameVariant || defaultValue; @@ -99,7 +93,7 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes this.selectableListService.selectSingle(this.listID, this.object); } }); - this.relationshipService.setNameVariant(this.listID, this.dso.uuid, value); + this.nameVariantService.setNameVariant(this.listID, this.dso.uuid, value); } selectCustom(value) { diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts index 7124fc3ec25..0b50e987fa9 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts @@ -36,6 +36,7 @@ import { import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { REQUEST } from '../../../../../../express.tokens'; +import { NameVariantService } from '../../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.service'; import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock'; import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; @@ -53,7 +54,7 @@ let mockItemWithMetadata: ItemSearchResult; let mockItemWithoutMetadata: ItemSearchResult; let nameVariant; -let mockRelationshipService; +let mockNameVariantService; const environmentUseThumbs = { browseBy: { @@ -114,7 +115,7 @@ function init() { }); nameVariant = 'Doe J.'; - mockRelationshipService = { + mockNameVariantService = { getNameVariant: () => of(nameVariant), }; } @@ -131,7 +132,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => { imports: [TruncatePipe, PersonSearchResultListSubmissionElementComponent], providers: [ { provide: TruncatableService, useValue: {} }, - { provide: RelationshipDataService, useValue: mockRelationshipService }, + { provide: NameVariantService, useValue: mockNameVariantService }, { provide: TranslateService, useValue: translateServiceStub }, { provide: NgbModal, useValue: {} }, { provide: ItemDataService, useValue: {} }, @@ -232,7 +233,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => { imports: [TruncatePipe, PersonSearchResultListSubmissionElementComponent], providers: [ { provide: TruncatableService, useValue: {} }, - { provide: RelationshipDataService, useValue: mockRelationshipService }, + { provide: RelationshipDataService, useValue: mockNameVariantService }, { provide: TranslateService, useValue: translateServiceStub }, { provide: NgbModal, useValue: {} }, { provide: ItemDataService, useValue: {} }, diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts index 2bf5011f571..247d156237b 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts @@ -10,7 +10,6 @@ import { import { FormsModule } from '@angular/forms'; import { DSONameService } from '@core/breadcrumbs/dso-name.service'; import { ItemDataService } from '@core/data/item-data.service'; -import { RelationshipDataService } from '@core/data/relationship-data.service'; import { Context } from '@core/shared/context.model'; import { Item } from '@core/shared/item.model'; import { MetadataValue } from '@core/shared/metadata.models'; @@ -22,6 +21,7 @@ import { APP_CONFIG, AppConfig, } from '../../../../../../config/app-config.interface'; +import { NameVariantService } from '../../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.service'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; @@ -60,7 +60,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu showThumbnails: boolean; constructor(protected truncatableService: TruncatableService, - private relationshipService: RelationshipDataService, + private nameVariantService: NameVariantService, private modalService: NgbModal, private itemDataService: ItemDataService, private selectableListService: SelectableListService, @@ -76,7 +76,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu const alternatives = this.allMetadataValues(this.alternativeField); this.allSuggestions = [defaultValue, ...alternatives]; - this.relationshipService.getNameVariant(this.listID, this.dso.uuid) + this.nameVariantService.getNameVariant(this.listID, this.dso.uuid) .pipe(take(1)) .subscribe((nameVariant: string) => { this.selectedName = nameVariant || defaultValue; @@ -86,7 +86,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu } select(value) { - this.relationshipService.setNameVariant(this.listID, this.dso.uuid, value); + this.nameVariantService.setNameVariant(this.listID, this.dso.uuid, value); this.selectableListService.isObjectSelected(this.listID, this.object) .pipe(take(1)) .subscribe((selected) => { diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts index c9079b79da2..3917982fd37 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts @@ -42,6 +42,7 @@ import { import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment.test'; import { REQUEST } from '../../../../../express.tokens'; +import { NameVariantService } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.service'; import { HostWindowService } from '../../../../shared/host-window.service'; import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service'; import { PaginationComponent } from '../../../../shared/pagination/pagination.component'; @@ -65,6 +66,7 @@ describe('EditRelationshipListComponent', () => { let linkService; let objectUpdatesService; + let nameVariantService; let relationshipService; let selectableListService; let paginationService: PaginationServiceStub; @@ -213,6 +215,11 @@ describe('EditRelationshipListComponent', () => { isLeftItem: of(true), }, ); + nameVariantService = jasmine.createSpyObj('nameVariantService', + { + getNameVariant: jasmine.createSpy('getNameVariant'), + }, + ); selectableListService = {}; @@ -255,6 +262,7 @@ describe('EditRelationshipListComponent', () => { providers: [ provideMockStore({ initialState }), { provide: ObjectUpdatesService, useValue: objectUpdatesService }, + { provide: NameVariantService, useValue: nameVariantService }, { provide: RelationshipDataService, useValue: relationshipService }, { provide: SelectableListService, useValue: selectableListService }, { provide: LinkService, useValue: linkService }, diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts index a6e539f1801..6e1b1186a5e 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts @@ -71,6 +71,7 @@ import { isNotEmpty, } from '../../../../shared/empty.util'; import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component'; +import { NameVariantService } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.service'; import { RelationshipOptions } from '../../../../shared/form/builder/models/relationship-options.model'; import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component'; import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model'; @@ -209,6 +210,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { constructor( protected objectUpdatesService: ObjectUpdatesService, protected linkService: LinkService, + protected nameVariantService: NameVariantService, protected relationshipService: RelationshipDataService, protected modalService: NgbModal, protected paginationService: PaginationService, @@ -352,7 +354,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { concatMap(({ type, searchResult }: { type: string, searchResult: ItemSearchResult }) => { const relatedItem: Item = searchResult.indexableObject; if (type === 'add') { - return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe( + return this.nameVariantService.getNameVariant(this.listId, relatedItem.uuid).pipe( switchMap((nameVariant) => { const update = { uuid: `${this.relationshipType.id}-${relatedItem.uuid}`, @@ -367,7 +369,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { take(1), ); } else if (type === 'remove') { - return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe( + return this.nameVariantService.getNameVariant(this.listId, relatedItem.uuid).pipe( switchMap((nameVariant) => { return this.getRelationFromId(searchResult.indexableObject).pipe( map( (relationship: Relationship) => { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts index 30b610ca80f..6bb5887e4c0 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts @@ -100,7 +100,6 @@ import { import { AppState } from '../../../../app.reducer'; import { paginatedRelationsToItems } from '../../../../item-page/simple/item-types/shared/item-relationships-utils'; import { SubmissionService } from '../../../../submission/submission.service'; -import { BtnDisabledDirective } from '../../../btn-disabled.directive'; import { hasNoValue, hasValue, @@ -124,6 +123,7 @@ import { import { ExistingRelationListElementComponent } from './existing-relation-list-element/existing-relation-list-element.component'; import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model'; import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component'; +import { NameVariantService } from './relation-lookup-modal/name-variant.service'; @Component({ selector: 'ds-dynamic-form-control-container', @@ -132,7 +132,6 @@ import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/d changeDetection: ChangeDetectionStrategy.Default, imports: [ AsyncPipe, - BtnDisabledDirective, ExistingMetadataListElementComponent, ExistingRelationListElementComponent, FormsModule, @@ -203,6 +202,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo protected translateService: TranslateService, protected relationService: DynamicFormRelationService, protected modalService: NgbModal, + protected nameVariantService: NameVariantService, protected relationshipService: RelationshipDataService, protected selectableListService: SelectableListService, protected store: Store, @@ -254,7 +254,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo const relationshipMD: MetadataValue = item.firstMetadata(relationshipOptions.metadataField, { authority: `${VIRTUAL_METADATA_PREFIX}${relationship.id}` }); const nameVariantMD: MetadataValue = item.firstMetadata(this.model.metadataFields, { authority: `${VIRTUAL_METADATA_PREFIX}${relationship.id}` }); if (hasValue(relationshipMD) && isNotEmpty(relationshipMD.value) && hasValue(nameVariantMD) && isNotEmpty(nameVariantMD.value)) { - this.relationshipService.setNameVariant(this.listId, relationshipMD.value, nameVariantMD.value); + this.nameVariantService.setNameVariant(this.listId, relationshipMD.value, nameVariantMD.value); } }); }); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts index e7f96ba6756..d391f0fd263 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts @@ -14,7 +14,6 @@ import { ExternalSourceDataService } from '@core/data/external-source-data.servi import { FindListOptions } from '@core/data/find-list-options.model'; import { LookupRelationService } from '@core/data/lookup-relation.service'; import { PaginatedList } from '@core/data/paginated-list.model'; -import { RelationshipDataService } from '@core/data/relationship-data.service'; import { Context } from '@core/shared/context.model'; import { DSpaceObject } from '@core/shared/dspace-object.model'; import { ExternalSource } from '@core/shared/external-source.model'; @@ -60,6 +59,7 @@ import { SearchResult } from '../../../../search/models/search-result.model'; import { followLink } from '../../../../utils/follow-link-config.model'; import { RelationshipOptions } from '../../models/relationship-options.model'; import { ThemedDynamicLookupRelationExternalSourceTabComponent } from './external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component'; +import { NameVariantService } from './name-variant.service'; import { AddRelationshipAction, RemoveRelationshipAction, @@ -210,7 +210,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy constructor( public modal: NgbActiveModal, private selectableListService: SelectableListService, - private relationshipService: RelationshipDataService, + private nameVariantService: NameVariantService, private externalSourceService: ExternalSourceDataService, private lookupRelationService: LookupRelationService, private searchConfigService: SearchConfigurationService, @@ -289,7 +289,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy () => { const obs: Observable = observableCombineLatest([...selectableObjects.map((sri: SearchResult) => { this.addNameVariantSubscription(sri); - return this.relationshipService.getNameVariant(this.listId, sri.indexableObject.uuid) + return this.nameVariantService.getNameVariant(this.listId, sri.indexableObject.uuid) .pipe( take(1), map((nameVariant: string) => { @@ -317,7 +317,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy * @param sri The search result to track name variants for */ private addNameVariantSubscription(sri: SearchResult) { - const nameVariant$ = this.relationshipService.getNameVariant(this.listId, sri.indexableObject.uuid); + const nameVariant$ = this.nameVariantService.getNameVariant(this.listId, sri.indexableObject.uuid); this.subMap[sri.indexableObject.uuid] = nameVariant$.pipe( skip(1), ).subscribe((nameVariant: string) => this.store.dispatch(new UpdateRelationshipNameVariantAction(this.item, sri.indexableObject, this.relationshipOptions.relationshipType, this.submissionId, nameVariant))); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.service.ts new file mode 100644 index 00000000000..7a641ac8443 --- /dev/null +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.service.ts @@ -0,0 +1,77 @@ +import { Injectable } from '@angular/core'; +import { + MemoizedSelector, + select, + Store, +} from '@ngrx/store'; +import { Observable } from 'rxjs'; + +import { + AppState, + keySelector, +} from '../../../../../app.reducer'; +import { + RemoveNameVariantAction, + SetNameVariantAction, +} from './name-variant.actions'; +import { NameVariantListState } from './name-variant.reducer'; + +const relationshipListsStateSelector = (state: AppState) => state.relationshipLists; + +const relationshipListStateSelector = (listID: string): MemoizedSelector => { + return keySelector(listID, relationshipListsStateSelector); +}; + +const relationshipStateSelector = (listID: string, itemID: string): MemoizedSelector => { + return keySelector(itemID, relationshipListStateSelector(listID)); +}; + + +/** + * The service handling all relationship requests + */ +@Injectable({ providedIn: 'root' }) +export class NameVariantService { + + constructor(protected store: Store) { + } + + /** + * Method to set the name variant for specific list and item + * @param listID The list for which to save the name variant + * @param itemID The item ID for which to save the name variant + * @param nameVariant The name variant to save + */ + public setNameVariant(listID: string, itemID: string, nameVariant: string) { + this.store.dispatch(new SetNameVariantAction(listID, itemID, nameVariant)); + } + + /** + * Method to retrieve the name variant for a specific list and item + * @param listID The list for which to retrieve the name variant + * @param itemID The item ID for which to retrieve the name variant + */ + public getNameVariant(listID: string, itemID: string): Observable { + return this.store.pipe( + select(relationshipStateSelector(listID, itemID)), + ); + } + + /** + * Method to remove the name variant for specific list and item + * @param listID The list for which to remove the name variant + * @param itemID The item ID for which to remove the name variant + */ + public removeNameVariant(listID: string, itemID: string) { + this.store.dispatch(new RemoveNameVariantAction(listID, itemID)); + } + + /** + * Method to retrieve all name variants for a single list + * @param listID The id of the list + */ + public getNameVariantsByListID(listID: string) { + return this.store.pipe(select(relationshipListStateSelector(listID))); + } + +} From 29a194ba9f8bb2ecea9a7f10a6c27cfd65bcfd97 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 24 Jul 2025 09:34:53 +0200 Subject: [PATCH 06/52] [DURACOM-327] Move registry.service out the core folder --- .../metadata-registry.component.spec.ts | 2 +- .../metadata-registry.component.ts | 2 +- .../metadata-schema-form.component.spec.ts | 2 +- .../metadata-schema-form.component.ts | 2 +- .../metadata-field-form.component.spec.ts | 2 +- .../metadata-field-form.component.ts | 2 +- .../metadata-schema.component.spec.ts | 2 +- .../metadata-schema.component.ts | 2 +- .../registry/registry.service.spec.ts | 34 ++++++++-------- .../registry/registry.service.ts | 40 +++++++++---------- ...metadata-authority-field.component.spec.ts | 2 +- ...edit-metadata-authority-field.component.ts | 2 +- .../metadata-field-selector.component.spec.ts | 2 +- .../metadata-field-selector.component.ts | 2 +- 14 files changed, 49 insertions(+), 49 deletions(-) rename src/app/{core => admin/admin-registries}/registry/registry.service.spec.ts (93%) rename src/app/{core => admin/admin-registries}/registry/registry.service.ts (92%) diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts index 0120bc190ee..602a0e24a69 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -16,7 +16,6 @@ import { ConfigurationDataService } from '@core/data/configuration-data.service' import { GroupDataService } from '@core/eperson/group-data.service'; import { MetadataSchema } from '@core/metadata/metadata-schema.model'; import { PaginationService } from '@core/pagination/pagination.service'; -import { RegistryService } from '@core/registry/registry.service'; import { ConfigurationProperty } from '@core/shared/configuration-property.model'; import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @@ -38,6 +37,7 @@ import { RegistryServiceStub } from '../../../shared/testing/registry.service.st import { SearchConfigurationServiceStub } from '../../../shared/testing/search-configuration-service.stub'; import { createPaginatedList } from '../../../shared/testing/utils.test'; import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe'; +import { RegistryService } from '../registry/registry.service'; import { MetadataRegistryComponent } from './metadata-registry.component'; import { MetadataSchemaFormComponent } from './metadata-schema-form/metadata-schema-form.component'; diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts index c958086e481..1048084f018 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts @@ -12,7 +12,6 @@ import { PaginatedList } from '@core/data/paginated-list.model'; import { RemoteData } from '@core/data/remote-data'; import { MetadataSchema } from '@core/metadata/metadata-schema.model'; import { PaginationService } from '@core/pagination/pagination.service'; -import { RegistryService } from '@core/registry/registry.service'; import { NoContent } from '@core/shared/NoContent.model'; import { getFirstCompletedRemoteData } from '@core/shared/operators'; import { @@ -36,6 +35,7 @@ import { NotificationsService } from '../../../shared/notifications/notification import { PaginationComponent } from '../../../shared/pagination/pagination.component'; import { toFindListOptions } from '../../../shared/pagination/pagination.utils'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; +import { RegistryService } from '../registry/registry.service'; import { MetadataSchemaFormComponent } from './metadata-schema-form/metadata-schema-form.component'; @Component({ diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts index ce5c1ebee02..5de9ce2bdcb 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts @@ -8,7 +8,6 @@ import { } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { MetadataSchema } from '@core/metadata/metadata-schema.model'; -import { RegistryService } from '@core/registry/registry.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; @@ -18,6 +17,7 @@ import { FormComponent } from '../../../../shared/form/form.component'; import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; import { RegistryServiceStub } from '../../../../shared/testing/registry.service.stub'; import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe'; +import { RegistryService } from '../../registry/registry.service'; import { MetadataSchemaFormComponent } from './metadata-schema-form.component'; describe('MetadataSchemaFormComponent', () => { diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts index fbe3482a99d..98dee1744f4 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts @@ -8,7 +8,6 @@ import { } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; import { MetadataSchema } from '@core/metadata/metadata-schema.model'; -import { RegistryService } from '@core/registry/registry.service'; import { DynamicFormControlModel, DynamicFormGroupModel, @@ -31,6 +30,7 @@ import { import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { FormComponent } from '../../../../shared/form/form.component'; +import { RegistryService } from '../../registry/registry.service'; @Component({ selector: 'ds-metadata-schema-form', diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts index 28db95257be..2e1c7ba01cf 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts @@ -9,7 +9,6 @@ import { import { RouterTestingModule } from '@angular/router/testing'; import { MetadataField } from '@core/metadata/metadata-field.model'; import { MetadataSchema } from '@core/metadata/metadata-schema.model'; -import { RegistryService } from '@core/registry/registry.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; @@ -19,6 +18,7 @@ import { FormComponent } from '../../../../shared/form/form.component'; import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; import { RegistryServiceStub } from '../../../../shared/testing/registry.service.stub'; import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe'; +import { RegistryService } from '../../registry/registry.service'; import { MetadataFieldFormComponent } from './metadata-field-form.component'; describe('MetadataFieldFormComponent', () => { diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts index 09e577adb22..f1982d6dc85 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts @@ -10,7 +10,6 @@ import { import { UntypedFormGroup } from '@angular/forms'; import { MetadataField } from '@core/metadata/metadata-field.model'; import { MetadataSchema } from '@core/metadata/metadata-schema.model'; -import { RegistryService } from '@core/registry/registry.service'; import { DynamicFormControlModel, DynamicFormGroupModel, @@ -27,6 +26,7 @@ import { take } from 'rxjs/operators'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { FormComponent } from '../../../../shared/form/form.component'; +import { RegistryService } from '../../registry/registry.service'; @Component({ selector: 'ds-metadata-field-form', diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts index a625393841f..96f560b3d4a 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts @@ -15,7 +15,6 @@ import { GroupDataService } from '@core/eperson/group-data.service'; import { MetadataField } from '@core/metadata/metadata-field.model'; import { MetadataSchema } from '@core/metadata/metadata-schema.model'; import { PaginationService } from '@core/pagination/pagination.service'; -import { RegistryService } from '@core/registry/registry.service'; import { ConfigurationProperty } from '@core/shared/configuration-property.model'; import { SearchConfigurationService } from '@core/shared/search/search-configuration.service'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @@ -35,6 +34,7 @@ import { SearchConfigurationServiceStub } from '../../../shared/testing/search-c import { createPaginatedList } from '../../../shared/testing/utils.test'; import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe'; import { VarDirective } from '../../../shared/utils/var.directive'; +import { RegistryService } from '../registry/registry.service'; import { MetadataFieldFormComponent } from './metadata-field-form/metadata-field-form.component'; import { MetadataSchemaComponent } from './metadata-schema.component'; diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts index 92742571dda..465d8037aad 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts @@ -16,7 +16,6 @@ import { RemoteData } from '@core/data/remote-data'; import { MetadataField } from '@core/metadata/metadata-field.model'; import { MetadataSchema } from '@core/metadata/metadata-schema.model'; import { PaginationService } from '@core/pagination/pagination.service'; -import { RegistryService } from '@core/registry/registry.service'; import { NoContent } from '@core/shared/NoContent.model'; import { getFirstCompletedRemoteData, @@ -45,6 +44,7 @@ import { PaginationComponent } from '../../../shared/pagination/pagination.compo import { toFindListOptions } from '../../../shared/pagination/pagination.utils'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; import { VarDirective } from '../../../shared/utils/var.directive'; +import { RegistryService } from '../registry/registry.service'; import { MetadataFieldFormComponent } from './metadata-field-form/metadata-field-form.component'; @Component({ diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/admin/admin-registries/registry/registry.service.spec.ts similarity index 93% rename from src/app/core/registry/registry.service.spec.ts rename to src/app/admin/admin-registries/registry/registry.service.spec.ts index 3a34474d5bd..78b87d0619f 100644 --- a/src/app/core/registry/registry.service.spec.ts +++ b/src/app/admin/admin-registries/registry/registry.service.spec.ts @@ -1,6 +1,13 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { TestBed } from '@angular/core/testing'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { MetadataFieldDataService } from '@core/data/metadata-field-data.service'; +import { MetadataSchemaDataService } from '@core/data/metadata-schema-data.service'; +import { RemoteData } from '@core/data/remote-data'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { NoContent } from '@core/shared/NoContent.model'; import { Store, StoreModule, @@ -11,6 +18,15 @@ import { of, } from 'rxjs'; +import { storeModuleConfig } from '../../../app.reducer'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { + createNoContentRemoteDataObject$, + createSuccessfulRemoteDataObject$, +} from '../../../shared/remote-data.utils'; +import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; +import { StoreMock } from '../../../shared/testing/store.mock'; +import { createPaginatedList } from '../../../shared/testing/utils.test'; import { MetadataRegistryCancelFieldAction, MetadataRegistryCancelSchemaAction, @@ -22,23 +38,7 @@ import { MetadataRegistryEditSchemaAction, MetadataRegistrySelectFieldAction, MetadataRegistrySelectSchemaAction, -} from '../../admin/admin-registries/metadata-registry/metadata-registry.actions'; -import { storeModuleConfig } from '../../app.reducer'; -import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { - createNoContentRemoteDataObject$, - createSuccessfulRemoteDataObject$, -} from '../../shared/remote-data.utils'; -import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; -import { StoreMock } from '../../shared/testing/store.mock'; -import { createPaginatedList } from '../../shared/testing/utils.test'; -import { FindListOptions } from '../data/find-list-options.model'; -import { MetadataFieldDataService } from '../data/metadata-field-data.service'; -import { MetadataSchemaDataService } from '../data/metadata-schema-data.service'; -import { RemoteData } from '../data/remote-data'; -import { MetadataField } from '../metadata/metadata-field.model'; -import { MetadataSchema } from '../metadata/metadata-schema.model'; -import { NoContent } from '../shared/NoContent.model'; +} from '../metadata-registry/metadata-registry.actions'; import { RegistryService } from './registry.service'; @Component({ diff --git a/src/app/core/registry/registry.service.ts b/src/app/admin/admin-registries/registry/registry.service.ts similarity index 92% rename from src/app/core/registry/registry.service.ts rename to src/app/admin/admin-registries/registry/registry.service.ts index d4a272570bf..2d21c43911b 100644 --- a/src/app/core/registry/registry.service.ts +++ b/src/app/admin/admin-registries/registry/registry.service.ts @@ -1,4 +1,14 @@ import { Injectable } from '@angular/core'; +import { RequestParam } from '@core/cache/models/request-param.model'; +import { FindListOptions } from '@core/data/find-list-options.model'; +import { MetadataFieldDataService } from '@core/data/metadata-field-data.service'; +import { MetadataSchemaDataService } from '@core/data/metadata-schema-data.service'; +import { PaginatedList } from '@core/data/paginated-list.model'; +import { RemoteData } from '@core/data/remote-data'; +import { MetadataField } from '@core/metadata/metadata-field.model'; +import { MetadataSchema } from '@core/metadata/metadata-schema.model'; +import { NoContent } from '@core/shared/NoContent.model'; +import { getFirstSucceededRemoteDataPayload } from '@core/shared/operators'; import { createSelector, select, @@ -15,6 +25,14 @@ import { tap, } from 'rxjs/operators'; +import { AppState } from '../../../app.reducer'; +import { + hasValue, + hasValueOperator, + isNotEmptyOperator, +} from '../../../shared/empty.util'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; import { MetadataRegistryCancelFieldAction, MetadataRegistryCancelSchemaAction, @@ -26,26 +44,8 @@ import { MetadataRegistryEditSchemaAction, MetadataRegistrySelectFieldAction, MetadataRegistrySelectSchemaAction, -} from '../../admin/admin-registries/metadata-registry/metadata-registry.actions'; -import { MetadataRegistryState } from '../../admin/admin-registries/metadata-registry/metadata-registry.reducers'; -import { AppState } from '../../app.reducer'; -import { - hasValue, - hasValueOperator, - isNotEmptyOperator, -} from '../../shared/empty.util'; -import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; -import { RequestParam } from '../cache/models/request-param.model'; -import { FindListOptions } from '../data/find-list-options.model'; -import { MetadataFieldDataService } from '../data/metadata-field-data.service'; -import { MetadataSchemaDataService } from '../data/metadata-schema-data.service'; -import { PaginatedList } from '../data/paginated-list.model'; -import { RemoteData } from '../data/remote-data'; -import { MetadataField } from '../metadata/metadata-field.model'; -import { MetadataSchema } from '../metadata/metadata-schema.model'; -import { NoContent } from '../shared/NoContent.model'; -import { getFirstSucceededRemoteDataPayload } from '../shared/operators'; +} from '../metadata-registry/metadata-registry.actions'; +import { MetadataRegistryState } from '../metadata-registry/metadata-registry.reducers'; const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry; const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema); diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.spec.ts index fb1704785a9..252781c0753 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.spec.ts @@ -7,7 +7,6 @@ import { By } from '@angular/platform-browser'; import { ItemDataService } from '@core/data/item-data.service'; import { MetadataField } from '@core/metadata/metadata-field.model'; import { MetadataSchema } from '@core/metadata/metadata-schema.model'; -import { RegistryService } from '@core/registry/registry.service'; import { Collection } from '@core/shared/collection.model'; import { ConfidenceType } from '@core/shared/confidence-type'; import { DSpaceObject } from '@core/shared/dspace-object.model'; @@ -17,6 +16,7 @@ import { Vocabulary } from '@core/submission/vocabularies/models/vocabulary.mode import { VocabularyService } from '@core/submission/vocabularies/vocabulary.service'; import { TranslateModule } from '@ngx-translate/core'; +import { RegistryService } from '../../../../admin/admin-registries/registry/registry.service'; import { DynamicOneboxModel } from '../../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model'; import { DsDynamicScrollableDropdownComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component'; import { DynamicScrollableDropdownModel } from '../../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.ts index dd54f2262e5..a4fe5a8cbf1 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.ts @@ -15,7 +15,6 @@ import { UntypedFormGroup, } from '@angular/forms'; import { ItemDataService } from '@core/data/item-data.service'; -import { RegistryService } from '@core/registry/registry.service'; import { ConfidenceType } from '@core/shared/confidence-type'; import { getFirstCompletedRemoteData, @@ -40,6 +39,7 @@ import { tap, } from 'rxjs/operators'; +import { RegistryService } from '../../../../admin/admin-registries/registry/registry.service'; import { isNotEmpty } from '../../../../shared/empty.util'; import { DsDynamicOneboxComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component'; import { diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts index dbfef5fbac4..bd5c4da3578 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts @@ -12,9 +12,9 @@ import { } from '@core/cache/models/sort-options.model'; import { MetadataField } from '@core/metadata/metadata-field.model'; import { MetadataSchema } from '@core/metadata/metadata-schema.model'; -import { RegistryService } from '@core/registry/registry.service'; import { TranslateModule } from '@ngx-translate/core'; +import { RegistryService } from '../../../admin/admin-registries/registry/registry.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createFailedRemoteDataObject$, diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts index 53c11eb5b3a..cc143520f21 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts @@ -23,7 +23,6 @@ import { SortOptions, } from '@core/cache/models/sort-options.model'; import { FindListOptions } from '@core/data/find-list-options.model'; -import { RegistryService } from '@core/registry/registry.service'; import { getAllSucceededRemoteData, getFirstCompletedRemoteData, @@ -50,6 +49,7 @@ import { tap, } from 'rxjs/operators'; +import { RegistryService } from '../../../admin/admin-registries/registry/registry.service'; import { hasValue } from '../../../shared/empty.util'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; From f6764b7e2d83cd55d4d396dc027ffb1e2bb6067b Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 24 Jul 2025 12:32:21 +0200 Subject: [PATCH 07/52] [DURACOM-327] fix tests --- .../epeople-registry.component.spec.ts | 13 ++++++----- .../eperson-form.component.spec.ts | 22 ++++++++++++------- ...-list-submission-element.component.spec.ts | 3 +-- ...ic-lookup-relation-modal.component.spec.ts | 9 ++++---- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts index 71b9a6ba267..c29928c1c72 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts @@ -71,13 +71,16 @@ describe('EPeopleRegistryComponent', () => { let authorizationService: AuthorizationDataService; let modalService: NgbModal; let paginationService: PaginationServiceStub; + let activeEPerson = null; beforeEach(waitForAsync(async () => { jasmine.getEnv().allowRespy(true); mockEPeople = [EPersonMock, EPersonMock2]; - epeopleRegistryServiceStub = jasmine.createSpyObj('', { - getActiveEPerson: of(null), - }); + epeopleRegistryServiceStub = { + getActiveEPerson(): Observable { + return of(activeEPerson); + }, + }; ePersonDataServiceStub = { activeEPerson: null, allEpeople: mockEPeople, @@ -134,10 +137,10 @@ describe('EPeopleRegistryComponent', () => { return of(true); }, editEPerson(ePerson: EPerson) { - this.activeEPerson = ePerson; + activeEPerson = ePerson; }, cancelEditEPerson() { - this.activeEPerson = null; + activeEPerson = null; }, clearEPersonRequests(): void { // empty diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts index 08d1f459a13..cdfa74569d6 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts @@ -64,6 +64,7 @@ import { createPaginatedList } from '../../../shared/testing/utils.test'; import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe'; import { EPeopleRegistryComponent } from '../epeople-registry.component'; +import { EpeopleRegistryService } from '../epeople-registry.service'; import { EPersonFormComponent } from './eperson-form.component'; import { ValidateEmailNotTaken } from './validators/email-taken.validator'; @@ -74,12 +75,14 @@ describe('EPersonFormComponent', () => { let mockEPeople; let ePersonDataServiceStub: any; + let epeopleRegistryServiceStub: any; let authService: AuthServiceStub; let authorizationService: AuthorizationDataService; let groupsDataService: GroupDataService; let epersonRegistrationService: EpersonRegistrationService; let route: ActivatedRouteStub; let router: RouterStub; + let activeEPerson = null; let paginationService; @@ -87,12 +90,14 @@ describe('EPersonFormComponent', () => { beforeEach(waitForAsync(() => { mockEPeople = [EPersonMock, EPersonMock2]; + epeopleRegistryServiceStub = { + getActiveEPerson(): Observable { + return of(activeEPerson); + }, + }; ePersonDataServiceStub = { activeEPerson: null, allEpeople: mockEPeople, - getActiveEPerson(): Observable { - return of(this.activeEPerson); - }, searchByScope(scope: string, query: string, options: FindListOptions = {}): Observable>> { if (scope === 'email') { const result = this.allEpeople.find((ePerson: EPerson) => { @@ -122,10 +127,10 @@ describe('EPersonFormComponent', () => { return createSuccessfulRemoteDataObject$(ePerson); }, editEPerson(ePerson: EPerson) { - this.activeEPerson = ePerson; + activeEPerson = ePerson; }, cancelEditEPerson() { - this.activeEPerson = null; + activeEPerson = null; }, clearEPersonRequests(): void { // empty @@ -230,6 +235,7 @@ describe('EPersonFormComponent', () => { ], providers: [ { provide: EPersonDataService, useValue: ePersonDataServiceStub }, + { provide: EpeopleRegistryService, useValue: epeopleRegistryServiceStub }, { provide: GroupDataService, useValue: groupsDataService }, { provide: FormBuilderService, useValue: builderService }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, @@ -389,7 +395,7 @@ describe('EPersonFormComponent', () => { }); describe('without active EPerson', () => { beforeEach(() => { - spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(of(undefined)); + spyOn(epeopleRegistryServiceStub, 'getActiveEPerson').and.returnValue(of(undefined)); component.onSubmit(); fixture.detectChanges(); }); @@ -429,7 +435,7 @@ describe('EPersonFormComponent', () => { }, }, }); - spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(of(expectedWithId)); + spyOn(epeopleRegistryServiceStub, 'getActiveEPerson').and.returnValue(of(expectedWithId)); component.ngOnInit(); component.onSubmit(); fixture.detectChanges(); @@ -486,7 +492,7 @@ describe('EPersonFormComponent', () => { eperson = EPersonMock; component.epersonInitial = eperson; component.canDelete$ = of(true); - spyOn(component.epersonService, 'getActiveEPerson').and.returnValue(of(eperson)); + spyOn(component.epeopleRegistryService, 'getActiveEPerson').and.returnValue(of(eperson)); modalService = (component as any).modalService; spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: of(true) }) })); component.ngOnInit(); diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts index 0b50e987fa9..52ce0617257 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts @@ -19,7 +19,6 @@ import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.servic import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service'; import { ItemDataService } from '@core/data/item-data.service'; import { buildPaginatedList } from '@core/data/paginated-list.model'; -import { RelationshipDataService } from '@core/data/relationship-data.service'; import { RemoteData } from '@core/data/remote-data'; import { Bitstream } from '@core/shared/bitstream.model'; import { HALEndpointService } from '@core/shared/hal-endpoint.service'; @@ -233,7 +232,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => { imports: [TruncatePipe, PersonSearchResultListSubmissionElementComponent], providers: [ { provide: TruncatableService, useValue: {} }, - { provide: RelationshipDataService, useValue: mockNameVariantService }, + { provide: NameVariantService, useValue: mockNameVariantService }, { provide: TranslateService, useValue: translateServiceStub }, { provide: NgbModal, useValue: {} }, { provide: ItemDataService, useValue: {} }, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts index 54a30f9d214..127d3f1825f 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts @@ -9,11 +9,10 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { RouterTestingModule } from '@angular/router/testing'; +import { provideRouter } from '@angular/router'; import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service'; import { ExternalSourceDataService } from '@core/data/external-source-data.service'; import { LookupRelationService } from '@core/data/lookup-relation.service'; -import { RelationshipDataService } from '@core/data/relationship-data.service'; import { Collection } from '@core/shared/collection.model'; import { ExternalSource } from '@core/shared/external-source.model'; import { Item } from '@core/shared/item.model'; @@ -41,6 +40,7 @@ import { PaginatedSearchOptions } from '../../../../search/models/paginated-sear import { createPaginatedList } from '../../../../testing/utils.test'; import { RelationshipOptions } from '../../models/relationship-options.model'; import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation-modal.component'; +import { NameVariantService } from './name-variant.service'; import { AddRelationshipAction, RemoveRelationshipAction, @@ -124,8 +124,9 @@ describe('DsDynamicLookupRelationModalComponent', () => { beforeEach(waitForAsync(() => { init(); TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule, DsDynamicLookupRelationModalComponent, BtnDisabledDirective], + imports: [TranslateModule.forRoot(), NgbModule, DsDynamicLookupRelationModalComponent, BtnDisabledDirective], providers: [ + provideRouter(([])), { provide: SearchConfigurationService, useValue: { paginatedSearchOptions: of(pSearchOptions), @@ -137,7 +138,7 @@ describe('DsDynamicLookupRelationModalComponent', () => { provide: SelectableListService, useValue: selectableListService, }, { - provide: RelationshipDataService, useValue: { getNameVariant: () => of(nameVariant) }, + provide: NameVariantService, useValue: { getNameVariant: () => of(nameVariant) }, }, { provide: RemoteDataBuildService, useValue: rdbService }, { From 48a82cdf4ddd575d688540e560129df6d2c1a249 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 24 Jul 2025 14:31:04 +0200 Subject: [PATCH 08/52] [DURACOM-327] Decoupling state management from data service --- .../eperson-form/eperson-form.component.html | 2 +- .../eperson-form.component.spec.ts | 6 ++ .../eperson-form/eperson-form.component.ts | 2 + .../group-form/group-form.component.spec.ts | 27 ++++--- .../group-form/group-form.component.ts | 16 ++-- .../members-list.component.spec.ts | 12 ++- .../members-list/members-list.component.ts | 8 +- .../subgroups-list.component.html | 4 +- .../subgroups-list.component.spec.ts | 11 ++- .../subgroup-list/subgroups-list.component.ts | 8 +- .../group-registry.service.spec.ts | 64 ++++++++++++++++ .../group-registry/group-registry.service.ts | 74 +++++++++++++++++++ .../core/eperson/group-data.service.spec.ts | 29 +------- src/app/core/eperson/group-data.service.ts | 57 -------------- .../reviewers-list.component.spec.ts | 20 +++-- .../reviewers-list.component.ts | 6 +- 16 files changed, 221 insertions(+), 125 deletions(-) create mode 100644 src/app/access-control/group-registry/group-registry.service.spec.ts create mode 100644 src/app/access-control/group-registry/group-registry.service.ts diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html index ae36b27c87c..37e87a6a762 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html @@ -81,7 +81,7 @@

{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}

{{group.id}} - {{ dsoNameService.getName(group) }} diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts index cdfa74569d6..db8d1c2c98d 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts @@ -63,6 +63,7 @@ import { RouterStub } from '../../../shared/testing/router.stub'; import { createPaginatedList } from '../../../shared/testing/utils.test'; import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe'; +import { GroupRegistryService } from '../../group-registry/group-registry.service'; import { EPeopleRegistryComponent } from '../epeople-registry.component'; import { EpeopleRegistryService } from '../epeople-registry.service'; import { EPersonFormComponent } from './eperson-form.component'; @@ -79,6 +80,7 @@ describe('EPersonFormComponent', () => { let authService: AuthServiceStub; let authorizationService: AuthorizationDataService; let groupsDataService: GroupDataService; + let groupRegistryService: GroupRegistryService; let epersonRegistrationService: EpersonRegistrationService; let route: ActivatedRouteStub; let router: RouterStub; @@ -222,6 +224,9 @@ describe('EPersonFormComponent', () => { findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])), getGroupRegistryRouterLink: '', }); + groupRegistryService = jasmine.createSpyObj('GroupRegistryService', { + startEditingNewGroup: jasmine.createSpy('startEditingNewGroup'), + }); paginationService = new PaginationServiceStub(); route = new ActivatedRouteStub(); @@ -237,6 +242,7 @@ describe('EPersonFormComponent', () => { { provide: EPersonDataService, useValue: ePersonDataServiceStub }, { provide: EpeopleRegistryService, useValue: epeopleRegistryServiceStub }, { provide: GroupDataService, useValue: groupsDataService }, + { provide: GroupRegistryService, useValue: groupRegistryService }, { provide: FormBuilderService, useValue: builderService }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, { provide: AuthService, useValue: authService }, diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts index b458740c485..2af0ee64a8d 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts @@ -72,6 +72,7 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio import { followLink } from '../../../shared/utils/follow-link-config.model'; import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe'; import { getEPersonsRoute } from '../../access-control-routing-paths'; +import { GroupRegistryService } from '../../group-registry/group-registry.service'; import { EpeopleRegistryService } from '../epeople-registry.service'; import { ValidateEmailNotTaken } from './validators/email-taken.validator'; @@ -242,6 +243,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy { public epersonService: EPersonDataService, public epeopleRegistryService: EpeopleRegistryService, public groupsDataService: GroupDataService, + public groupRegistryService: GroupRegistryService, private formBuilderService: FormBuilderService, private translateService: TranslateService, private notificationsService: NotificationsService, diff --git a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts index 1c89830d10e..a14b5da83af 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts @@ -65,6 +65,7 @@ import { GroupMock2, } from '../../../shared/testing/group-mock'; import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; +import { GroupRegistryService } from '../group-registry.service'; import { GroupFormComponent } from './group-form.component'; import { MembersListComponent } from './members-list/members-list.component'; import { SubgroupsListComponent } from './subgroup-list/subgroups-list.component'; @@ -76,6 +77,7 @@ describe('GroupFormComponent', () => { let builderService: FormBuilderService; let ePersonDataServiceStub: any; let groupsDataServiceStub: any; + let groupRegistryServiceStub: any; let dsoDataServiceStub: any; let authorizationService: AuthorizationDataService; let notificationService: NotificationsServiceStub; @@ -86,6 +88,7 @@ describe('GroupFormComponent', () => { let groupName: string; let groupDescription: string; let expected: Group; + let activeGroup; beforeEach(waitForAsync(() => { groups = [GroupMock, GroupMock2]; @@ -111,19 +114,24 @@ describe('GroupFormComponent', () => { }, }); ePersonDataServiceStub = {}; + groupRegistryServiceStub = { + getActiveGroup(): Observable { + return of(activeGroup); + }, + cancelEditGroup(): void { + activeGroup = null; + }, + editGroup(group: Group) { + activeGroup = group; + }, + }; groupsDataServiceStub = { allGroups: groups, activeGroup: null, createdGroup: null, - getActiveGroup(): Observable { - return of(this.activeGroup); - }, getGroupRegistryRouterLink(): string { return '/access-control/groups'; }, - editGroup(group: Group) { - this.activeGroup = group; - }, clearGroupsRequests() { return null; }, @@ -133,9 +141,7 @@ describe('GroupFormComponent', () => { delete(objectId: string, copyVirtualMetadata?: string[]): Observable> { return createSuccessfulRemoteDataObject$({}); }, - cancelEditGroup(): void { - this.activeGroup = null; - }, + findById(id: string) { return of({ payload: null, hasSucceeded: true }); }, @@ -247,6 +253,7 @@ describe('GroupFormComponent', () => { { provide: DSONameService, useValue: new DSONameServiceMock() }, { provide: EPersonDataService, useValue: ePersonDataServiceStub }, { provide: GroupDataService, useValue: groupsDataServiceStub }, + { provide: GroupRegistryService, useValue: groupRegistryServiceStub }, { provide: DSpaceObjectDataService, useValue: dsoDataServiceStub }, { provide: NotificationsService, useValue: notificationService }, { provide: FormBuilderService, useValue: builderService }, @@ -330,7 +337,7 @@ describe('GroupFormComponent', () => { }, }, }); - spyOn(groupsDataServiceStub, 'getActiveGroup').and.returnValue(of(expected)); + spyOn(groupRegistryServiceStub, 'getActiveGroup').and.returnValue(of(expected)); spyOn(groupsDataServiceStub, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(expected2)); component.ngOnInit(); }); diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts index ece9db38dbe..d63d80da76e 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.ts +++ b/src/app/access-control/group-registry/group-form/group-form.component.ts @@ -79,6 +79,7 @@ import { getGroupEditRoute, getGroupsRoute, } from '../../access-control-routing-paths'; +import { GroupRegistryService } from '../group-registry.service'; import { MembersListComponent } from './members-list/members-list.component'; import { SubgroupsListComponent } from './subgroup-list/subgroups-list.component'; import { ValidateGroupExists } from './validators/group-exists.validator'; @@ -190,6 +191,7 @@ export class GroupFormComponent implements OnInit, OnDestroy { constructor( public groupDataService: GroupDataService, + public groupRegistryService: GroupRegistryService, protected dSpaceObjectDataService: DSpaceObjectDataService, protected formBuilderService: FormBuilderService, protected translateService: TranslateService, @@ -208,7 +210,7 @@ export class GroupFormComponent implements OnInit, OnDestroy { if (this.route.snapshot.params.groupId !== 'newGroup') { this.setActiveGroup(this.route.snapshot.params.groupId); } - this.activeGroup$ = this.groupDataService.getActiveGroup(); + this.activeGroup$ = this.groupRegistryService.getActiveGroup(); this.activeGroupLinkedDSO$ = this.getActiveGroupLinkedDSO(); this.linkedEditRolesRoute$ = this.getLinkedEditRolesRoute(); this.canEdit$ = this.activeGroupLinkedDSO$.pipe( @@ -311,7 +313,7 @@ export class GroupFormComponent implements OnInit, OnDestroy { * Stop editing the currently selected group */ onCancel() { - this.groupDataService.cancelEditGroup(); + this.groupRegistryService.cancelEditGroup(); this.cancelForm.emit(); void this.router.navigate([getGroupsRoute()]); } @@ -429,13 +431,13 @@ export class GroupFormComponent implements OnInit, OnDestroy { * @param groupId ID of group to set as active */ setActiveGroup(groupId: string) { - this.groupDataService.cancelEditGroup(); + this.groupRegistryService.cancelEditGroup(); this.groupDataService.findById(groupId) .pipe( getFirstSucceededRemoteData(), getRemoteDataPayload()) .subscribe((group: Group) => { - this.groupDataService.editGroup(group); + this.groupRegistryService.editGroup(group); }); } @@ -446,13 +448,13 @@ export class GroupFormComponent implements OnInit, OnDestroy { setActiveGroupWithLink(groupSelfLink: string) { this.activeGroup$.pipe(take(1)).subscribe((activeGroup: Group) => { if (activeGroup === null) { - this.groupDataService.cancelEditGroup(); + this.groupRegistryService.cancelEditGroup(); this.groupDataService.findByHref(groupSelfLink, false, false, followLink('subgroups'), followLink('epersons'), followLink('object')) .pipe( getFirstSucceededRemoteData(), getRemoteDataPayload()) .subscribe((group: Group) => { - this.groupDataService.editGroup(group); + this.groupRegistryService.editGroup(group); }); } }); @@ -497,7 +499,7 @@ export class GroupFormComponent implements OnInit, OnDestroy { */ @HostListener('window:beforeunload') ngOnDestroy(): void { - this.groupDataService.cancelEditGroup(); + this.groupRegistryService.cancelEditGroup(); this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); if ( hasValue(this.groupNameValueChangeSubscribe) ) { diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts index 0c490bcf612..054a812a4c2 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts @@ -66,6 +66,7 @@ import { GroupMock } from '../../../../shared/testing/group-mock'; import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock'; +import { GroupRegistryService } from '../../group-registry.service'; import { MembersListComponent } from './members-list.component'; // todo: optimize imports @@ -77,6 +78,7 @@ describe('MembersListComponent', () => { let builderService: FormBuilderService; let ePersonDataServiceStub: any; let groupsDataServiceStub: any; + let groupRegistryServiceStub: any; let activeGroup; let epersonMembers: EPerson[]; let epersonNonMembers: EPerson[]; @@ -108,13 +110,16 @@ describe('MembersListComponent', () => { // empty }, }; + groupRegistryServiceStub = { + getActiveGroup(): Observable { + return of(activeGroup); + }, + }; groupsDataServiceStub = { activeGroup: activeGroup, epersonMembers: epersonMembers, epersonNonMembers: epersonNonMembers, - getActiveGroup(): Observable { - return of(activeGroup); - }, + getEPersonMembers() { return this.epersonMembers; }, @@ -165,6 +170,7 @@ describe('MembersListComponent', () => { providers: [MembersListComponent, { provide: EPersonDataService, useValue: ePersonDataServiceStub }, { provide: GroupDataService, useValue: groupsDataServiceStub }, + { provide: GroupRegistryService, useValue: groupRegistryServiceStub }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, { provide: FormBuilderService, useValue: builderService }, { provide: Router, useValue: new RouterMock() }, diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts index 4601592b5bb..c8e5cb60310 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts @@ -58,6 +58,7 @@ import { NotificationsService } from '../../../../shared/notifications/notificat import { PaginationComponent } from '../../../../shared/pagination/pagination.component'; import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; import { getEPersonEditRoute } from '../../../access-control-routing-paths'; +import { GroupRegistryService } from '../../group-registry.service'; // todo: optimize imports @@ -183,6 +184,7 @@ export class MembersListComponent implements OnInit, OnDestroy { constructor( protected groupDataService: GroupDataService, + protected groupRegistryService: GroupRegistryService, public ePersonDataService: EPersonDataService, protected translateService: TranslateService, protected notificationsService: NotificationsService, @@ -198,7 +200,7 @@ export class MembersListComponent implements OnInit, OnDestroy { this.searchForm = this.formBuilder.group(({ query: '', })); - this.subs.set(SubKey.ActiveGroup, this.groupDataService.getActiveGroup().subscribe((activeGroup: Group) => { + this.subs.set(SubKey.ActiveGroup, this.groupRegistryService.getActiveGroup().subscribe((activeGroup: Group) => { if (activeGroup != null) { this.groupBeingEdited = activeGroup; this.retrieveMembers(this.config.currentPage); @@ -282,7 +284,7 @@ export class MembersListComponent implements OnInit, OnDestroy { * @param eperson EPerson we want to delete as member from group that is currently being edited */ deleteMemberFromGroup(eperson: EPerson) { - this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => { + this.groupRegistryService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => { if (activeGroup != null) { const response = this.groupDataService.deleteMemberFromGroup(activeGroup, eperson); this.showNotifications('deleteMember', response, this.dsoNameService.getName(eperson), activeGroup); @@ -302,7 +304,7 @@ export class MembersListComponent implements OnInit, OnDestroy { * @param eperson EPerson we want to add as member to group that is currently being edited */ addMemberToGroup(eperson: EPerson) { - this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => { + this.groupRegistryService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => { if (activeGroup != null) { const response = this.groupDataService.addMemberToGroup(activeGroup, eperson); this.showNotifications('addMember', response, this.dsoNameService.getName(eperson), activeGroup); diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html index d09ab08c42a..d3f6e675f48 100644 --- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html +++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html @@ -24,7 +24,7 @@

{{messagePrefix + '.headSubgroups' | translate}}

{{group.id}} - {{ dsoNameService.getName(group) }} @@ -107,7 +107,7 @@