From 02e81a600a87cb0d4de69fc7052ab8d9ef4001ec Mon Sep 17 00:00:00 2001 From: Kasinhou <129340513+Kasinhou@users.noreply.github.com> Date: Mon, 28 Jul 2025 12:20:30 +0200 Subject: [PATCH 01/71] ZCU-DATA/added to trigger ui tests (#934) Co-authored-by: Matus Kasak --- .github/workflows/trigger-ui-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-ui-tests.yml b/.github/workflows/trigger-ui-tests.yml index 277f46d1680..a5d6bbccb72 100644 --- a/.github/workflows/trigger-ui-tests.yml +++ b/.github/workflows/trigger-ui-tests.yml @@ -24,7 +24,7 @@ jobs: git fetch --prune origin BRANCHES=$(git ls-remote --heads origin | awk -F'/' '{print $3"/"$4}' | grep '^customer/') - SKIP_BRANCHES=("customer/sav" "customer/vsb-tuo" "customer/zcu-data") + SKIP_BRANCHES=("customer/sav" "customer/vsb-tuo") for branch in $(echo "$BRANCHES" | sed -e 's/[\[\]"]//g' -e 's/,/\n/g'); do if [[ " ${SKIP_BRANCHES[@]} " =~ " ${branch} " ]]; then From 9c58cf5a45a5d280c55f165c0e504dca5c07c31a Mon Sep 17 00:00:00 2001 From: Matus Beke Date: Fri, 1 Aug 2025 13:37:01 +0200 Subject: [PATCH 02/71] FIX: Add quotes to curl download command (#939) * FIX: Add quotes to curl download command --- .../clarin-files-section/clarin-files-section.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/item-page/clarin-files-section/clarin-files-section.component.ts b/src/app/item-page/clarin-files-section/clarin-files-section.component.ts index cd7575d4d62..15820be9f68 100644 --- a/src/app/item-page/clarin-files-section/clarin-files-section.component.ts +++ b/src/app/item-page/clarin-files-section/clarin-files-section.component.ts @@ -107,7 +107,8 @@ export class ClarinFilesSectionComponent implements OnInit { return file.name; }); - this.command = `curl -o allzip.zip ` + this.halService.getRootHref() + `/core/items/${this.item.id}/allzip?handleId=${this.itemHandle}`; + const url = `${this.halService.getRootHref()}/core/items/${this.item.id}/allzip?handleId=${this.itemHandle}`; + this.command = `curl -o "allzip.zip" "${url}"`; } loadDownloadZipConfigProperties() { From 28fb578e417cf5d3e0845fe7562faa014df5e4db Mon Sep 17 00:00:00 2001 From: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com> Date: Mon, 4 Aug 2025 15:05:27 +0200 Subject: [PATCH 03/71] Upgrade CLARIN-DSpace to v7.6.5. (#941) --- .eslintrc.json | 7 +- .github/workflows/build.yml | 145 +- .github/workflows/codescan.yml | 2 +- .github/workflows/docker.yml | 14 +- .github/workflows/issue_opened.yml | 0 .../workflows/port_merged_pull_request.yml | 4 +- Dockerfile | 2 +- Dockerfile.dist | 2 +- angular.json | 1 - config/config.example.yml | 126 +- cypress.config.ts | 15 +- cypress/e2e/admin-add-new-modals.cy.ts | 54 + cypress/e2e/admin-curation-tasks.cy.ts | 16 + cypress/e2e/admin-edit-modals.cy.ts | 54 + cypress/e2e/admin-export-modals.cy.ts | 39 + cypress/e2e/admin-menu.cy.ts | 4 +- cypress/e2e/admin-search-page.cy.ts | 20 + cypress/e2e/admin-sidebar.cy.ts | 28 + cypress/e2e/admin-workflow-page.cy.ts | 20 + cypress/e2e/batch-import-page.cy.ts | 16 + cypress/e2e/bitstreams-format.cy.ts | 16 + cypress/e2e/breadcrumbs.cy.ts | 3 +- cypress/e2e/bulk-access.cy.ts | 29 + cypress/e2e/collection-edit.cy.ts | 128 + cypress/e2e/collection-page.cy.ts | 24 +- cypress/e2e/collection-statistics.cy.ts | 16 +- cypress/e2e/community-edit.cy.ts | 86 + cypress/e2e/community-page.cy.ts | 5 +- cypress/e2e/community-statistics.cy.ts | 10 +- cypress/e2e/create-eperson.cy.ts | 16 + cypress/e2e/create-group.cy.ts | 16 + cypress/e2e/edit-eperson.cy.ts | 16 + cypress/e2e/edit-group.cy.ts | 16 + cypress/e2e/end-user-agreement.cy.ts | 13 + cypress/e2e/epeople-registry.cy.ts | 16 + cypress/e2e/feedback.cy.ts | 13 + cypress/e2e/groups-registry.cy.ts | 16 + cypress/e2e/header.cy.ts | 11 +- cypress/e2e/health-page.cy.ts | 62 + cypress/e2e/homepage-statistics.cy.ts | 9 +- cypress/e2e/item-edit.cy.ts | 180 + cypress/e2e/item-page.cy.ts | 42 +- cypress/e2e/item-statistics.cy.ts | 19 +- cypress/e2e/login-modal.cy.ts | 103 +- cypress/e2e/metadata-import-page.cy.ts | 16 + cypress/e2e/metadata-registry.cy.ts | 16 + cypress/e2e/metadata-schema.cy.ts | 16 + cypress/e2e/my-dspace.cy.ts | 34 +- cypress/e2e/new-process.cy.ts | 16 + cypress/e2e/privacy.cy.ts | 13 + cypress/e2e/processes-overview.cy.ts | 17 + cypress/e2e/profile-page.cy.ts | 16 + cypress/e2e/search-navbar.cy.ts | 12 +- cypress/e2e/search-page.cy.ts | 89 +- cypress/e2e/submission.cy.ts | 40 +- cypress/e2e/system-wide-alert.cy.ts | 16 + cypress/plugins/index.ts | 24 + cypress/support/commands.ts | 206 +- cypress/support/e2e.ts | 56 +- docker/cli.assetstore.yml | 3 +- docker/cli.yml | 18 +- docker/db.entities.yml | 2 +- docker/docker-compose-ci.yml | 33 +- docker/docker-compose-dist.yml | 2 +- docker/docker-compose-rest.yml | 8 +- docker/docker-compose.yml | 3 + package.json | 149 +- postcss.config.js | 4 +- server.ts | 34 +- .../browse/bulk-access-browse.component.html | 101 +- .../bulk-access/bulk-access.component.html | 3 +- .../bulk-access/bulk-access.component.spec.ts | 45 +- .../bulk-access/bulk-access.component.ts | 4 +- .../bulk-access-settings.component.html | 12 +- .../bulk-access-settings.component.ts | 4 + .../epeople-registry.component.html | 11 +- .../epeople-registry.component.spec.ts | 6 +- .../epeople-registry.component.ts | 20 +- .../eperson-form/eperson-form.component.html | 17 +- .../eperson-form.component.spec.ts | 75 +- .../eperson-form/eperson-form.component.ts | 235 +- .../group-form/group-form.component.html | 44 +- .../group-form/group-form.component.spec.ts | 142 +- .../group-form/group-form.component.ts | 337 +- .../members-list/members-list.component.html | 20 +- .../members-list.component.spec.ts | 3 - .../members-list/members-list.component.ts | 3 + .../subgroups-list.component.html | 2 - .../groups-registry.component.html | 7 +- .../groups-registry.component.spec.ts | 12 +- .../accessibility-settings.config.ts | 11 + .../accessibility-settings.service.spec.ts | 410 + .../accessibility-settings.service.stub.ts | 44 + .../accessibility-settings.service.ts | 361 + .../admin-curation-tasks.component.html | 2 +- .../batch-import-page.component.html | 2 +- .../metadata-import-page.component.html | 2 +- .../add-bitstream-format.component.html | 6 +- .../bitstream-formats.component.html | 21 +- .../bitstream-formats.component.spec.ts | 26 +- .../bitstream-formats.component.ts | 42 +- .../edit-bitstream-format.component.html | 6 +- .../metadata-registry.component.html | 10 +- .../metadata-registry.component.spec.ts | 42 +- .../metadata-registry.component.ts | 128 +- .../metadata-schema-form.component.html | 6 +- .../metadata-schema-form.component.spec.ts | 37 +- .../metadata-schema-form.component.ts | 183 +- .../metadata-field-form.component.html | 6 +- .../metadata-field-form.component.spec.ts | 38 +- .../metadata-field-form.component.ts | 126 +- .../metadata-schema.component.html | 20 +- .../metadata-schema.component.spec.ts | 65 +- .../metadata-schema.component.ts | 140 +- src/app/admin/admin-routing.module.ts | 8 +- ...in-search-result-grid-element.component.ts | 43 +- .../admin-search-page/admin-search.module.ts | 2 + .../themed-admin-search-page.component.ts | 26 + .../admin-sidebar-section.component.html | 40 +- .../admin-sidebar-section.component.spec.ts | 4 +- .../admin-sidebar-section.component.ts | 8 + .../admin-sidebar.component.html | 100 +- .../admin-sidebar.component.scss | 231 +- .../admin-sidebar.component.spec.ts | 2 +- .../admin-sidebar/admin-sidebar.component.ts | 20 +- ...dable-admin-sidebar-section.component.html | 55 +- ...dable-admin-sidebar-section.component.scss | 37 +- ...le-admin-sidebar-section.component.spec.ts | 4 +- ...andable-admin-sidebar-section.component.ts | 30 +- .../themed-admin-sidebar.component.ts | 16 +- ...t-admin-workflow-grid-element.component.ts | 50 +- ...t-admin-workflow-grid-element.component.ts | 42 +- ...in-workflow-list-element.component.spec.ts | 4 +- .../admin-workflow.module.ts | 2 + .../themed-admin-workflow-page.component.ts | 26 + src/app/app-routing.module.ts | 13 +- src/app/app.component.ts | 7 +- src/app/app.module.ts | 7 + .../bitstream-authorizations.component.ts | 4 +- .../bitstream-download-page.component.html | 2 +- .../bitstream-page-routing.module.ts | 10 +- .../edit-bitstream-page.component.html | 8 +- .../edit-bitstream-page.component.spec.ts | 19 +- .../edit-bitstream-page.component.ts | 138 +- ...egacy-bitstream-url-redirect.guard.spec.ts | 158 + .../legacy-bitstream-url-redirect.guard.ts | 56 + .../legacy-bitstream-url.resolver.spec.ts | 145 - .../legacy-bitstream-url.resolver.ts | 49 - .../breadcrumbs/breadcrumbs.component.html | 2 +- .../browse-by-date-page.component.spec.ts | 47 +- .../browse-by-date-page.component.ts | 58 +- .../browse-by-metadata-page.component.html | 6 +- .../browse-by-metadata-page.component.spec.ts | 43 +- .../browse-by-metadata-page.component.ts | 57 +- .../browse-by-taxonomy-page.component.html | 5 +- .../browse-by-title-page.component.spec.ts | 37 +- .../browse-by-title-page.component.ts | 37 +- .../clarin-license-table.component.html | 1 - .../collection-item-mapper.component.html | 4 +- .../collection-item-mapper.component.ts | 4 +- .../collection-page-routing.module.ts | 31 +- .../collection-page.component.html | 3 +- .../collection-page.component.ts | 4 +- .../create-collection-page.component.html | 2 +- .../delete-collection-page.component.html | 6 +- .../collection-curate.component.html | 2 +- .../collection-metadata.component.html | 8 +- .../collection-source-controls.component.html | 14 +- ...llection-source-controls.component.spec.ts | 17 +- .../collection-source.component.html | 22 +- .../collection-source.component.ts | 55 +- .../edit-item-template-page.component.html | 2 +- .../community-list.component.html | 60 +- .../community-list.component.scss | 4 + .../community-list.component.spec.ts | 35 +- .../community-list.component.ts | 1 + .../community-page-routing.module.ts | 30 +- .../community-page.component.html | 3 +- .../create-community-page.component.html | 4 +- .../delete-community-page.component.html | 12 +- .../community-curate.component.html | 2 +- src/app/core/auth/auth.interceptor.ts | 12 + src/app/core/auth/auth.service.spec.ts | 8 +- src/app/core/auth/auth.service.ts | 74 +- src/app/core/auth/server-auth.service.ts | 60 +- .../community-breadcrumb.resolver.ts | 21 + .../dso-breadcrumb.resolver.spec.ts | 5 +- .../breadcrumbs/dso-breadcrumb.resolver.ts | 16 +- .../core/breadcrumbs/dso-name.service.spec.ts | 62 + src/app/core/breadcrumbs/dso-name.service.ts | 4 +- .../breadcrumbs/item-breadcrumb.resolver.ts | 4 +- src/app/core/browse/browse.service.spec.ts | 12 - src/app/core/browse/browse.service.ts | 19 +- .../core/cache/models/request-param.model.ts | 11 +- src/app/core/cache/object-cache.reducer.ts | 31 +- src/app/core/cache/object-cache.service.ts | 16 +- .../models/config-submission-section.model.ts | 19 +- src/app/core/core.module.ts | 2 + .../core/data/base/base-data.service.spec.ts | 71 +- src/app/core/data/base/base-data.service.ts | 10 +- src/app/core/data/base/delete-data.spec.ts | 5 + src/app/core/data/base/delete-data.ts | 5 +- .../core/data/bitstream-data.service.spec.ts | 37 +- src/app/core/data/bitstream-data.service.ts | 54 +- src/app/core/data/bundle-data.service.ts | 8 +- .../dspace-rest-response-parsing.service.ts | 11 +- .../authorization-data.service.spec.ts | 2 +- .../authorization-data.service.ts | 3 +- .../object-updates/object-updates.reducer.ts | 2 + .../object-updates.service.stub.ts | 28 + .../object-updates/object-updates.service.ts | 18 +- .../data/relationship-data.service.spec.ts | 17 +- .../core/data/relationship-data.service.ts | 91 +- .../data/relationship-type-data.service.ts | 86 +- src/app/core/data/request.effects.ts | 13 +- src/app/core/data/request.service.spec.ts | 2 +- src/app/core/data/request.service.ts | 5 +- .../core/data/version-history-data.service.ts | 2 +- .../dspace-rest.interceptor.spec.ts | 194 + .../dspace-rest/dspace-rest.interceptor.ts | 52 + .../core/eperson/eperson-data.service.spec.ts | 43 +- src/app/core/eperson/eperson-data.service.ts | 16 +- src/app/core/eperson/models/eperson.model.ts | 2 +- .../forward-client-ip.interceptor.ts | 10 +- src/app/core/index/index.effects.ts | 4 +- .../json-patch-operations.reducer.spec.ts | 380 + .../json-patch-operations.reducer.ts | 27 +- src/app/core/metadata/metadata.service.ts | 16 +- src/app/core/services/cookie.service.ts | 8 +- .../core/services/server-cookie.service.ts | 7 +- .../server-hard-redirect.service.spec.ts | 23 +- .../services/server-hard-redirect.service.ts | 16 +- .../core/shared/browse-definition.model.ts | 8 +- .../hierarchical-browse-definition.model.ts | 5 +- src/app/core/shared/metadata.utils.ts | 2 +- .../non-hierarchical-browse-definition.ts | 3 - .../shared/search/search-filter.service.ts | 1 + .../core/shared/search/search.service.spec.ts | 466 +- src/app/core/shared/search/search.service.ts | 21 +- .../statistics/usage-report-data.service.ts | 6 +- .../resolver/submission-links-to-follow.ts | 14 + .../resolver/submission-object.resolver.ts | 6 +- .../submission-parent-breadcrumb.resolver.ts | 43 + .../submission-cc-license-url-data.service.ts | 14 +- ...sion-json-patch-operations.service.spec.ts | 15 + ...ubmission-json-patch-operations.service.ts | 17 + .../submission-parent-breadcrumb.service.ts | 66 + .../submission-rest.service.spec.ts | 10 +- .../submission/submission-rest.service.ts | 81 +- .../submission/workflowitem-data.service.ts | 2 +- .../submission/workspaceitem-data.service.ts | 2 +- .../core/xsrf/browser-xsrf.service.spec.ts | 58 + src/app/core/xsrf/browser-xsrf.service.ts | 30 + src/app/core/xsrf/server-xsrf.service.spec.ts | 33 + src/app/core/xsrf/server-xsrf.service.ts | 19 + src/app/core/xsrf/xsrf.service.spec.ts | 21 + src/app/core/xsrf/xsrf.service.ts | 15 + .../dso-edit-metadata-cells.scss | 6 +- .../dso-edit-metadata-value.component.html | 22 +- .../dso-edit-metadata-value.component.scss | 2 +- .../dso-edit-metadata-value.component.spec.ts | 14 +- .../dso-edit-metadata.component.html | 38 +- .../dso-edit-metadata.component.scss | 2 +- .../dso-edit-metadata.component.spec.ts | 11 +- .../metadata-field-selector.component.html | 32 +- .../metadata-field-selector.component.scss | 5 + .../metadata-field-selector.component.spec.ts | 17 +- .../metadata-field-selector.component.ts | 135 +- ...-search-result-grid-element.component.html | 4 +- ...-search-result-grid-element.component.html | 4 +- ...-search-result-grid-element.component.html | 4 +- ...-search-result-list-element.component.html | 30 +- ...-search-result-list-element.component.html | 8 +- ...-search-result-list-element.component.html | 6 +- .../journal-issue.component.html | 2 +- .../journal-volume.component.html | 2 +- .../item-pages/journal/journal.component.html | 2 +- .../journal/journal.component.spec.ts | 5 +- ...-search-result-grid-element.component.html | 4 +- ...-search-result-grid-element.component.html | 4 +- ...-search-result-grid-element.component.html | 4 +- ...-search-result-list-element.component.html | 4 +- ...-search-result-list-element.component.html | 4 +- ...-search-result-list-element.component.html | 6 +- .../org-unit/org-unit.component.html | 2 +- .../item-pages/person/person.component.html | 2 +- .../item-pages/project/project.component.html | 2 +- ...-item-metadata-list-element.component.html | 7 +- ...ult-list-submission-element.component.html | 4 +- ...esult-list-submission-element.component.ts | 2 +- .../org-unit-input-suggestions.component.html | 4 +- .../org-unit-input-suggestions.component.scss | 5 +- ...g-unit-input-suggestions.component.spec.ts | 2 + ...ult-list-submission-element.component.html | 12 +- ...-list-submission-element.component.spec.ts | 2 + .../person-input-suggestions.component.html | 4 +- .../person-input-suggestions.component.scss | 5 +- src/app/footer/footer.component.scss | 14 +- .../forgot-password-form.component.html | 10 +- .../forgot-password-form.component.spec.ts | 8 +- .../handle-table/handle-table.component.html | 1 - .../header-navbar-wrapper.component.html | 2 +- .../header-navbar-wrapper.component.ts | 30 +- .../context-help-toggle.component.html | 2 +- src/app/header/header.component.html | 6 +- src/app/header/header.component.scss | 24 +- src/app/header/header.component.ts | 8 +- .../health-info-component.component.html | 8 +- .../health-info/health-info.component.html | 15 +- .../health-page/health-page.component.html | 12 +- src/app/health-page/health-page.component.ts | 3 + .../health-component.component.html | 8 +- .../health-panel/health-panel.component.html | 21 +- .../health-status.component.html | 6 +- .../health-status.component.scss | 3 + .../home-news/home-news.component.html | 2 +- src/app/home-page/home-page-routing.module.ts | 7 - .../recent-item-list.component.html | 14 +- .../recent-item-list.component.ts | 3 + .../top-level-community-list.component.html | 2 +- .../accessibility-settings.component.html | 94 + .../accessibility-settings.component.spec.ts | 89 + .../accessibility-settings.component.ts | 126 + .../end-user-agreement-content.component.html | 4 +- .../end-user-agreement.component.html | 2 +- .../end-user-agreement.component.spec.ts | 6 +- .../feedback-form.component.html | 68 +- .../feedback-form.component.spec.ts | 9 +- src/app/info/info-routing-paths.ts | 5 + src/app/info/info-routing.module.ts | 16 +- src/app/info/info.module.ts | 6 +- .../privacy-content.component.html | 6 +- .../alerts/item-alerts.component.html | 2 +- ...tstream-request-a-copy-page.component.html | 4 +- .../upload/upload-bitstream.component.html | 2 +- .../clarin-license-info.component.ts | 6 +- .../abstract-item-update.component.ts | 17 +- .../edit-item-page.component.html | 11 +- .../edit-item-page/edit-item-page.module.ts | 10 +- .../item-authorizations.component.html | 10 +- .../item-authorizations.component.spec.ts | 10 +- .../item-authorizations.component.ts | 46 +- .../item-bitstreams.component.html | 49 +- .../item-bitstreams.component.scss | 45 +- .../item-bitstreams.component.spec.ts | 151 +- .../item-bitstreams.component.ts | 238 +- .../item-bitstreams.service.spec.ts | 705 ++ .../item-bitstreams.service.stub.ts | 78 + .../item-bitstreams.service.ts | 554 + .../item-edit-bitstream-bundle.component.html | 239 +- .../item-edit-bitstream-bundle.component.scss | 24 + ...em-edit-bitstream-bundle.component.spec.ts | 290 + .../item-edit-bitstream-bundle.component.ts | 569 +- ...rag-and-drop-bitstream-list.component.html | 33 - ...-and-drop-bitstream-list.component.spec.ts | 150 - ...-drag-and-drop-bitstream-list.component.ts | 76 - ...-edit-bitstream-drag-handle.component.html | 5 - ...em-edit-bitstream-drag-handle.component.ts | 26 - .../item-edit-bitstream.component.html | 143 - .../item-edit-bitstream.component.spec.ts | 191 - .../item-edit-bitstream.component.ts | 193 - .../item-collection-mapper.component.html | 4 +- .../item-curate/item-curate.component.html | 2 +- .../item-delete/item-delete.component.html | 30 +- .../item-delete/item-delete.component.spec.ts | 2 +- .../item-delete/item-delete.component.ts | 97 +- .../item-license-mapper.component.ts | 7 +- .../item-move/item-move.component.html | 6 +- .../item-operation.component.html | 10 +- .../item-operation.component.spec.ts | 6 +- .../item-private.component.spec.ts | 2 +- .../item-public/item-public.component.spec.ts | 2 +- .../item-reinstate.component.spec.ts | 2 +- .../edit-item-relationships.service.spec.ts | 412 + .../edit-item-relationships.service.ts | 251 + ...t-relationship-list-wrapper.component.html | 31 + ...t-relationship-list-wrapper.component.scss | 0 ...elationship-list-wrapper.component.spec.ts | 109 + ...dit-relationship-list-wrapper.component.ts | 88 + .../edit-relationship-list.component.html | 9 +- .../edit-relationship-list.component.spec.ts | 333 +- .../edit-relationship-list.component.ts | 366 +- .../edit-relationship.component.html | 4 +- .../edit-relationship.component.ts | 18 +- .../item-relationships.component.html | 106 +- .../item-relationships.component.spec.ts | 19 +- .../item-relationships.component.ts | 164 +- .../item-status/item-status.component.html | 16 +- .../item-withdraw.component.spec.ts | 2 +- ...abstract-simple-item-action.component.html | 2 +- ...tract-simple-item-action.component.spec.ts | 2 +- .../virtual-metadata.component.html | 12 +- .../virtual-metadata.component.spec.ts | 1 + .../virtual-metadata.component.ts | 50 +- .../collections/collections.component.html | 3 +- .../metadata-uri-values.component.html | 2 +- .../metadata-uri-values.component.spec.ts | 7 + .../metadata-uri-values.component.ts | 6 + .../metadata-values.component.html | 11 +- .../metadata-values.component.spec.ts | 16 + .../metadata-values.component.ts | 22 + .../full-file-section.component.html | 6 +- .../full/full-item-page.component.html | 1 - .../full/full-item-page.component.spec.ts | 8 - .../full/full-item-page.component.ts | 4 +- src/app/item-page/item-page-routing.module.ts | 13 +- src/app/item-page/item-page.resolver.spec.ts | 13 +- src/app/item-page/item-page.resolver.ts | 6 +- src/app/item-page/item.resolver.ts | 27 +- .../media-viewer-video.component.html | 4 +- .../media-viewer/media-viewer.component.html | 9 +- .../media-viewer.component.spec.ts | 4 +- .../media-viewer/media-viewer.component.ts | 4 +- .../orcid-auth/orcid-auth.component.html | 26 +- .../orcid-auth/orcid-auth.component.ts | 76 +- .../orcid-page/orcid-page.component.html | 20 +- .../orcid-page/orcid-page.component.ts | 18 +- .../orcid-queue/orcid-queue.component.html | 8 +- .../orcid-queue/orcid-queue.component.ts | 12 +- .../orcid-sync-settings.component.spec.ts | 10 +- .../orcid-sync-settings.component.ts | 165 +- .../file-section.component.spec.ts | 2 + ...item-page-abstract-field.component.spec.ts | 5 +- .../item-page-author-field.component.spec.ts | 5 +- .../item-page-date-field.component.spec.ts | 5 +- .../generic-item-page-field.component.spec.ts | 5 +- .../item-page-field.component.spec.ts | 5 +- .../item-page-field.component.ts | 38 +- .../uri/item-page-uri-field.component.spec.ts | 3 + .../uri/item-page-uri-field.component.ts | 4 +- .../item-page/simple/item-page.component.html | 1 - .../simple/item-page.component.spec.ts | 9 +- .../item-page/simple/item-page.component.ts | 4 - .../publication/publication.component.html | 4 - .../publication/publication.component.spec.ts | 3 + .../shared/item-relationships-utils.ts | 24 +- .../item-types/shared/item.component.spec.ts | 3 + .../untyped-item/untyped-item.component.html | 4 - .../untyped-item.component.spec.ts | 3 + .../metadata-representation-list.component.ts | 6 +- ...bed-related-entities-search.component.html | 8 +- .../related-items.component.html | 8 +- .../versions/item-versions.component.html | 258 +- .../versions/item-versions.component.spec.ts | 12 +- .../versions/item-versions.component.ts | 52 +- .../login-page/login-page.component.spec.ts | 4 +- .../objectnotfound.component.html | 2 +- .../objectnotfound.component.spec.ts | 16 +- .../objectnotfound.component.ts | 4 +- src/app/menu.resolver.spec.ts | 11 +- src/app/menu.resolver.ts | 17 +- ...space-new-external-dropdown.component.html | 11 +- ...ace-new-submission-dropdown.component.html | 11 +- .../expandable-navbar-section.component.html | 55 +- .../expandable-navbar-section.component.scss | 48 +- ...xpandable-navbar-section.component.spec.ts | 237 +- .../expandable-navbar-section.component.ts | 209 +- .../navbar-section.component.html | 3 +- .../navbar-section.component.scss | 5 - src/app/navbar/navbar.component.html | 33 +- src/app/navbar/navbar.component.scss | 80 +- src/app/navbar/navbar.component.ts | 11 +- src/app/navbar/navbar.module.ts | 7 + src/app/page-error/page-error.component.html | 2 +- .../pagenotfound/pagenotfound.component.html | 2 +- .../process-detail-field.component.html | 2 +- .../process-detail-field.component.spec.ts | 2 +- .../detail/process-detail.component.html | 6 +- .../form/process-form.component.html | 12 +- .../parameter-select.component.html | 12 +- .../parameter-select.component.spec.ts | 7 +- .../boolean-value-input.component.html | 2 +- .../boolean-value-input.component.spec.ts | 5 +- .../date-value-input.component.html | 4 +- .../date-value-input.component.scss | 5 + .../file-value-input.component.html | 2 +- .../string-value-input.component.html | 4 +- .../string-value-input.component.scss | 5 + .../script-help/script-help.component.html | 2 +- .../scripts-select.component.html | 59 +- .../scripts-select.component.scss | 23 + .../scripts-select.component.spec.ts | 4 +- .../scripts-select.component.ts | 102 +- .../overview/process-overview.component.html | 19 +- .../process-overview.component.spec.ts | 57 +- .../overview/process-overview.component.ts | 30 +- .../profile-claim-item-modal.component.html | 2 +- .../profile-page-metadata-form.component.ts | 8 +- ...rofile-page-researcher-form.component.html | 14 +- .../profile-page-researcher-form.component.ts | 20 +- .../profile-page-security-form.component.ts | 9 +- .../profile-page/profile-page.component.html | 44 +- .../profile-page.component.spec.ts | 6 +- .../profile-page/profile-page.component.ts | 42 +- .../register-email-form.component.html | 21 +- .../register-email-form.component.ts | 15 +- .../create-profile.component.html | 4 +- .../email-request-copy.component.html | 2 +- .../grant-deny-request-copy.component.html | 8 +- src/app/root/root.component.html | 10 +- src/app/root/root.component.ts | 46 +- .../search-navbar.component.html | 4 +- .../search-navbar.component.spec.ts | 21 +- .../search-navbar/search-navbar.component.ts | 3 +- .../configuration-search-page.component.ts | 10 +- .../access-control-array-form.component.html | 11 +- .../access-control-array-form.component.ts | 4 + ...cess-control-form-container.component.html | 50 +- ...access-control-form-container.component.ts | 4 + ...rol-select-bitstreams-modal.component.html | 13 +- ...ntrol-select-bitstreams-modal.component.ts | 47 +- src/app/shared/alert/alert.component.scss | 10 +- src/app/shared/animations/slide.ts | 50 +- .../auth-nav-menu.component.html | 73 +- .../auth-nav-menu.component.scss | 19 +- .../auth-nav-menu.component.spec.ts | 42 +- .../auth-nav-menu/auth-nav-menu.component.ts | 12 +- .../user-menu/user-menu.component.html | 37 +- .../user-menu/user-menu.component.scss | 45 + .../user-menu/user-menu.component.spec.ts | 8 +- .../shared/browse-by/browse-by.component.html | 2 +- .../browse-by/browse-by.component.spec.ts | 2 + .../shared/browse-by/browse-by.component.ts | 30 +- src/app/shared/btn-disabled.directive.ts | 57 + .../clarin-item-box-view.component.ts | 13 +- .../collection-dropdown.component.html | 22 +- .../collection-dropdown.component.scss | 3 +- .../comcol-form/comcol-form.component.html | 9 +- .../comcol-role/comcol-role.component.html | 4 +- .../edit-comcol-page.component.html | 21 +- .../comcol-page-browse-by.component.html | 7 +- .../comcol-page-handle.component.html | 8 +- .../comcol-page-handle.component.scss | 5 - .../comcol-page-logo.component.html | 2 +- .../comcol-page-logo.component.scss | 4 + src/app/shared/context-help.directive.ts | 21 +- .../cookies/browser-klaro.service.spec.ts | 6 +- .../shared/cookies/browser-klaro.service.ts | 15 +- src/app/shared/cookies/klaro-configuration.ts | 32 +- src/app/shared/cookies/klaro.service.stub.ts | 9 + src/app/shared/disabled-directive.spec.ts | 97 + .../shared/ds-select/ds-select.component.html | 4 +- ...dit-menu-expandable-section.component.html | 4 +- .../dso-edit-menu-section.component.html | 26 +- .../dso-edit-menu-section.component.spec.ts | 11 +- src/app/shared/dso-page/dso-page.module.ts | 2 + .../dso-selector/dso-selector.component.html | 6 +- .../dso-selector/dso-selector.component.ts | 10 + ...e-community-parent-selector.component.html | 9 +- ...ommunity-parent-selector.component.spec.ts | 26 +- ...ate-community-parent-selector.component.ts | 10 +- ...create-item-parent-selector.component.html | 2 +- .../dso-selector-modal-wrapper.component.html | 2 +- .../edit-item-selector.component.html | 2 +- .../entity-dropdown.component.html | 26 +- .../entity-dropdown.component.scss | 10 +- .../entity-dropdown.component.spec.ts | 2 +- .../eperson-group-list.component.html | 61 +- .../eperson-group-list.component.spec.ts | 64 +- .../eperson-group-list.component.ts | 81 +- .../file-download-link.component.html | 10 +- .../file-download-link.component.spec.ts | 4 + .../file-download-link.component.ts | 2 + ...amic-form-control-container.component.html | 2 + ...ynamic-form-control-container.component.ts | 2 +- .../dynamic-form-array.component.html | 19 +- .../dynamic-form-array.component.scss | 16 +- .../dynamic-form-array.component.spec.ts | 172 + .../dynamic-form-array.component.ts | 165 + .../dynamic-date-picker-inline.component.html | 2 +- .../date-picker/date-picker.component.html | 12 +- .../date-picker/date-picker.component.spec.ts | 4 +- .../date-picker/date-picker.component.ts | 6 +- .../models/list/dynamic-list.component.html | 8 +- .../models/list/dynamic-list.component.ts | 103 +- .../lookup/dynamic-lookup.component.html | 13 +- .../lookup/dynamic-lookup.component.spec.ts | 40 +- .../dynamic-relation-group.component.html | 8 +- .../dynamic-relation-group.component.spec.ts | 4 +- ...dynamic-scrollable-dropdown.component.html | 24 +- ...amic-scrollable-dropdown.component.spec.ts | 2 +- .../dynamic-scrollable-dropdown.component.ts | 174 +- .../dynamic-scrollable-dropdown.model.ts | 19 +- .../models/tag/dynamic-tag.component.ts | 2 +- ...namic-lookup-relation-modal.component.html | 21 +- ...ic-lookup-relation-modal.component.spec.ts | 22 +- ...dynamic-lookup-relation-modal.component.ts | 30 +- ...l-source-entry-import-modal.component.html | 2 +- .../relationship.effects.spec.ts | 6 +- .../relationship.effects.ts | 90 +- ...-lookup-relation-search-tab.component.html | 25 +- ...-lookup-relation-search-tab.component.scss | 4 + ...okup-relation-search-tab.component.spec.ts | 12 - ...ic-lookup-relation-search-tab.component.ts | 43 +- ...ic-lookup-relation-search-tab.component.ts | 8 +- ...lookup-relation-selection-tab.component.ts | 6 +- .../form/builder/form-builder.service.spec.ts | 6 +- .../parsers/clarin-name-field-parser.spec.ts | 10 +- .../parsers/clarin-name-field-parser.ts | 6 +- .../parsers/complex-field-parser.spec.ts | 8 +- .../builder/parsers/complex-field-parser.ts | 6 +- .../builder/parsers/concat-field-parser.ts | 4 +- .../builder/parsers/date-field-parser.spec.ts | 10 +- .../parsers/disabled-field-parser.spec.ts | 8 +- .../parsers/dropdown-field-parser.spec.ts | 8 +- .../builder/parsers/dropdown-field-parser.ts | 4 +- .../form/builder/parsers/field-parser.ts | 9 +- .../builder/parsers/list-field-parser.spec.ts | 10 +- .../parsers/lookup-field-parser.spec.ts | 8 +- .../parsers/lookup-name-field-parser.spec.ts | 8 +- .../builder/parsers/name-field-parser.spec.ts | 10 +- .../form/builder/parsers/name-field-parser.ts | 6 +- .../parsers/onebox-field-parser.spec.ts | 12 +- .../form/builder/parsers/parser-factory.ts | 2 + .../relation-group-field-parser.spec.ts | 10 +- .../form/builder/parsers/row-parser.spec.ts | 34 +- .../parsers/series-field-parser.spec.ts | 10 +- .../builder/parsers/series-field-parser.ts | 6 +- .../builder/parsers/tag-field-parser.spec.ts | 8 +- .../parsers/textarea-field-parser.spec.ts | 8 +- src/app/shared/form/form.component.html | 7 +- src/app/shared/form/form.component.spec.ts | 4 +- src/app/shared/form/form.component.ts | 6 +- src/app/shared/form/form.service.ts | 3 + .../number-picker.component.html | 9 +- .../number-picker.component.spec.ts | 5 +- .../number-picker/number-picker.component.ts | 5 +- .../vocabulary-treeview.component.html | 62 +- .../vocabulary-treeview.component.scss | 4 - .../vocabulary-treeview.component.spec.ts | 4 +- .../vocabulary-treeview.component.ts | 51 +- src/app/shared/host-window.service.ts | 61 +- .../dso-input-suggestions.component.html | 4 +- .../filter-input-suggestions.component.html | 7 +- .../input-suggestions.component.html | 4 +- .../input-suggestions.component.ts | 4 +- .../validation-suggestions.component.html | 4 +- .../lang-switch/lang-switch.component.html | 33 +- .../lang-switch/lang-switch.component.spec.ts | 2 +- .../live-region/live-region.component.html | 3 + .../live-region/live-region.component.scss | 13 + .../live-region/live-region.component.spec.ts | 57 + .../live-region/live-region.component.ts | 31 + .../shared/live-region/live-region.config.ts | 9 + .../live-region/live-region.service.spec.ts | 143 + .../live-region/live-region.service.stub.ts | 30 + .../shared/live-region/live-region.service.ts | 152 + src/app/shared/loading/loading.component.html | 6 +- .../loading/themed-loading.component.ts | 5 +- .../log-in-external-provider.component.html | 2 +- .../password/log-in-password.component.html | 12 +- src/app/shared/log-out/log-out.component.html | 2 +- .../external-link-menu-item.component.html | 3 +- .../external-link-menu-item.component.ts | 3 +- .../menu-item/link-menu-item.component.html | 8 +- .../menu-item/link-menu-item.component.ts | 3 +- .../menu/menu-item/menu-item.component.scss | 5 + .../onclick-menu-item.component.html | 7 +- .../onclick-menu-item.component.spec.ts | 2 +- .../menu-item/onclick-menu-item.component.ts | 2 +- .../menu-item/text-menu-item.component.html | 2 +- .../menu-item/text-menu-item.component.ts | 1 + .../menu-section/menu-section.component.ts | 25 +- ...etadata-representation-loader.component.ts | 21 +- ...laimed-task-actions-approve.component.html | 2 +- ...d-task-actions-decline-task.component.html | 2 +- ...claimed-task-actions-reject.component.html | 4 +- ...task-actions-return-to-pool.component.html | 2 +- .../claimed-task-actions-loader.component.ts | 24 +- .../pool-task-actions.component.html | 2 +- .../workspaceitem-actions.component.html | 2 +- .../models/notification-options.model.ts | 12 +- .../notification/notification.component.scss | 3 +- .../notifications-board.component.spec.ts | 52 +- .../notifications-board.component.ts | 90 +- .../access-status-badge.component.html | 6 +- .../access-status-badge.component.spec.ts | 2 +- .../my-dspace-status-badge.component.html | 2 + .../status-badge/status-badge.component.html | 8 +- .../type-badge/type-badge.component.html | 6 +- ...-object-component-loader.component.spec.ts | 62 +- ...table-object-component-loader.component.ts | 10 +- ...electable-list-item-control.component.html | 4 +- ...ctable-list-item-control.component.spec.ts | 6 +- .../item-detail-preview.component.html | 2 +- .../item-detail-preview.component.spec.ts | 2 + .../item-detail-preview.component.ts | 11 +- .../object-detail.component.html | 1 - .../object-grid/object-grid.component.html | 1 - ...-search-result-grid-element.component.html | 2 +- ...arch-result-grid-element.component.spec.ts | 2 + ...-search-result-grid-element.component.html | 2 +- ...arch-result-grid-element.component.spec.ts | 4 +- ...-search-result-grid-element.component.html | 2 +- .../browse-entry-list-element.component.html | 2 +- .../collection-list-element.component.html | 2 +- .../community-list-element.component.html | 2 +- .../item/item-list-element.component.html | 6 +- .../item/item-list-element.component.spec.ts | 67 +- .../item/item-list-element.component.ts | 21 +- ...-text-metadata-list-element.component.html | 6 +- .../item-list-preview.component.html | 2 +- .../object-list/object-list.component.html | 1 - ...-search-result-list-element.component.html | 2 +- ...-search-result-list-element.component.html | 4 +- .../search-result-list-element.component.ts | 13 +- ...y-sidebar-search-list-element.component.ts | 2 +- .../collection-select.component.html | 11 +- .../collection-select.component.ts | 37 +- .../item-select/item-select.component.html | 15 +- .../item-select/item-select.component.spec.ts | 16 +- .../item-select/item-select.component.ts | 39 +- .../object-select/object-select.model.ts | 29 + .../object-select/object-select.component.ts | 10 +- .../orcid-badge-and-tooltip.component.html | 11 + .../orcid-badge-and-tooltip.component.scss | 11 + .../orcid-badge-and-tooltip.component.spec.ts | 71 + .../orcid-badge-and-tooltip.component.ts | 56 + .../page-size-selector.component.html | 4 +- ...nated-drag-and-drop-list.component.spec.ts | 136 - ...-paginated-drag-and-drop-list.component.ts | 239 - .../pagination/pagination.component.html | 41 +- .../shared/pagination/pagination.component.ts | 126 +- .../resource-policy-create.component.html | 2 +- .../edit/resource-policy-edit.component.html | 2 +- .../resource-policy-entry.component.html | 8 +- .../form/resource-policy-form.component.html | 8 +- .../resource-policy-form.component.spec.ts | 10 +- .../form/resource-policy-form.model.ts | 2 + .../resource-policies.component.html | 16 +- .../results-back-button.component.html | 2 +- src/app/shared/rss-feed/rss.component.html | 2 +- .../scope-selector-modal.component.html | 6 +- .../search-form/search-form.component.html | 4 +- .../clarin-search/clarin-search.component.ts | 10 +- .../search-export-csv.component.html | 19 +- .../search-export-csv.component.spec.ts | 26 +- .../search-export-csv.component.ts | 71 +- .../search-authority-filter.component.html | 5 +- .../search-boolean-filter.component.html | 4 +- .../search-facet-option.component.html | 5 +- .../search-facet-option.component.spec.ts | 7 +- .../search-facet-option.component.ts | 14 +- .../search-facet-range-option.component.html | 1 + ...earch-facet-selected-option.component.html | 2 +- .../search-facet-filter-wrapper.component.ts | 9 +- .../search-facet-filter.component.spec.ts | 2 + .../search-facet-filter.component.ts | 18 +- .../search-filter.component.html | 16 +- .../search-filter/search-filter.component.ts | 25 +- .../search-hierarchy-filter.component.html | 9 +- .../search-hierarchy-filter.component.spec.ts | 11 +- .../search-hierarchy-filter.component.ts | 48 +- .../search-range-filter.component.html | 17 +- .../search-range-filter.component.scss | 6 + .../search-range-filter.component.spec.ts | 2 + .../search-range-filter.component.ts | 18 +- .../search-text-filter.component.html | 7 +- .../search-filters.component.html | 12 +- .../search-filters.component.scss | 12 +- .../search-filters.component.spec.ts | 4 +- .../search-filters.component.ts | 153 +- .../search-label/search-label.component.html | 9 +- .../search-label/search-label.component.scss | 3 + .../search-label/search-label.component.ts | 1 + .../search-labels.component.scss | 9 +- .../search-results-skeleton.component.html | 38 + .../search-results-skeleton.component.scss | 56 + .../search-results-skeleton.component.spec.ts | 33 + .../search-results-skeleton.component.ts | 59 + .../search-results.component.html | 15 +- .../search-results.component.scss | 17 + .../search-results.component.spec.ts | 15 +- .../search-results.component.ts | 14 + .../search-settings.component.html | 2 +- .../search-settings.component.spec.ts | 41 +- .../search-settings.component.ts | 11 +- .../search-sidebar.component.html | 5 +- ...search-switch-configuration.component.html | 2 +- src/app/shared/search/search.component.html | 7 +- .../shared/search/search.component.spec.ts | 67 +- src/app/shared/search/search.component.ts | 91 +- src/app/shared/search/search.module.ts | 9 +- .../shared/search/themed-search.component.ts | 37 +- src/app/shared/shared.module.ts | 8 +- .../sidebar/page-with-sidebar.component.html | 4 +- .../sidebar/sidebar-dropdown.component.html | 2 +- .../sidebar/sidebar-dropdown.component.ts | 2 +- .../date/starts-with-date.component.html | 2 +- .../text/starts-with-text.component.html | 9 +- .../text/starts-with-text.component.scss | 4 + .../subscription-modal.component.html | 2 +- .../subscription-view.component.html | 2 +- src/app/shared/testing/auth-service.stub.ts | 4 + .../shared/testing/base-data-service.stub.ts | 7 + src/app/shared/testing/browse-service.stub.ts | 91 + .../edit-item-relationships.service.stub.ts | 48 + .../testing/entity-type-data.service.stub.ts | 5 + src/app/shared/testing/eperson.mock.ts | 40 + .../testing/host-window-service.stub.ts | 9 + .../shared/testing/item-data.service.stub.ts | 8 + src/app/shared/testing/menu-service.stub.ts | 3 + .../testing/object-updates.service.stub.ts | 24 + .../shared/testing/registry.service.stub.ts | 107 + .../testing/relationship-data.service.stub.ts | 86 + .../search-configuration-service.stub.ts | 4 + .../testing/server-response-service.stub.ts | 30 + .../testing/truncatable-service.stub.ts | 21 + .../shared/theme-support/themed.component.ts | 10 +- .../abstract-trackable.component.spec.ts | 7 +- .../trackable/abstract-trackable.component.ts | 16 +- .../truncatable-part.component.html | 19 +- .../truncatable-part.component.spec.ts | 13 + .../truncatable-part.component.ts | 7 + .../upload/uploader/uploader-options.model.ts | 5 + .../upload/uploader/uploader.component.html | 8 +- .../upload/uploader/uploader.component.ts | 18 +- .../shared/utils/hover-outside.directive.ts | 52 + src/app/shared/utils/relation-query.utils.ts | 28 +- src/app/shared/utils/safe-url-pipe.ts | 2 +- .../view-mode-switch.component.html | 8 +- .../statistics-page.component.html | 4 +- .../statistics-table.component.html | 4 +- .../statistics/angulartics/dspace-provider.ts | 6 +- .../dspace/view-tracker-resolver.service.ts | 56 + .../dspace/view-tracker.component.html | 1 - .../dspace/view-tracker.component.scss | 3 - src/app/statistics/statistics.module.ts | 3 - .../edit/submission-edit.component.spec.ts | 3 +- .../submission-form-collection.component.html | 4 +- ...bmission-form-collection.component.spec.ts | 7 +- .../submission-form-footer.component.html | 8 +- .../submission-form-footer.component.spec.ts | 14 +- ...submission-form-section-add.component.html | 6 +- .../submission-form-section-add.component.ts | 6 + .../form/submission-form.component.html | 6 +- .../form/submission-form.component.spec.ts | 14 +- .../form/submission-form.component.ts | 19 +- ...ion-import-external-preview.component.html | 10 +- ...-import-external-preview.component.spec.ts | 2 +- ...ssion-import-external-preview.component.ts | 4 +- ...n-import-external-searchbar.component.html | 29 +- .../submission-import-external.component.html | 12 +- ...bmission-import-external.component.spec.ts | 6 + .../submission-import-external.component.ts | 3 + .../objects/section-visibility.model.ts | 6 + .../objects/submission-objects.actions.ts | 8 +- .../submission-objects.effects.spec.ts | 1 + .../objects/submission-objects.effects.ts | 1 + .../submission-objects.reducer.spec.ts | 2 + .../objects/submission-objects.reducer.ts | 1 + .../submission-section-object.model.ts | 7 +- .../section-accesses.component.spec.ts | 3 + ...mission-section-cc-licenses.component.html | 108 +- ...mission-section-cc-licenses.component.scss | 10 + ...sion-section-cc-licenses.component.spec.ts | 8 +- ...ubmission-section-cc-licenses.component.ts | 89 +- .../section-license.component.ts | 7 +- .../form/section-form-operations.service.ts | 2 +- .../form/section-form.component.spec.ts | 23 +- .../sections/form/section-form.component.ts | 21 +- .../section-identifiers.component.html | 25 +- .../section-identifiers.component.ts | 28 +- .../license/section-license.component.spec.ts | 2 + .../sections/sections.service.spec.ts | 281 +- .../submission/sections/sections.service.ts | 13 +- .../section-upload-file-edit.component.html | 2 +- ...section-upload-file-edit.component.spec.ts | 27 + .../section-upload-file-edit.component.ts | 84 +- .../file/section-upload-file.component.html | 2 +- .../upload/section-upload.component.html | 2 +- src/app/submission/submission.service.spec.ts | 239 +- src/app/submission/submission.service.ts | 40 +- .../subscriptions-page.component.html | 4 +- .../subscriptions-page.component.ts | 3 + .../system-wide-alert-banner.component.html | 36 +- .../system-wide-alert-form.component.html | 92 +- .../system-wide-alert-form.component.spec.ts | 8 + .../system-wide-alert-form.component.ts | 12 +- src/app/thumbnail/thumbnail.component.html | 22 +- src/app/thumbnail/thumbnail.component.spec.ts | 469 +- src/app/thumbnail/thumbnail.component.ts | 49 +- .../reviewers-list.component.spec.ts | 3 - ...anced-workflow-actions-loader.component.ts | 24 +- .../item-from-workflow-breadcrumb.resolver.ts | 22 + .../item-from-workflow.resolver.spec.ts | 2 +- .../item-from-workflow.resolver.ts | 9 +- .../workflow-item-page.resolver.ts | 1 + .../workflowitems-edit-page-routing.module.ts | 12 +- ...item-from-workspace-breadcrumb.resolver.ts | 22 + .../item-from-workspace.resolver.spec.ts | 2 +- .../item-from-workspace.resolver.ts | 15 +- .../workspace-item-page.resolver.ts | 7 +- .../workspaceitems-delete-page.component.html | 4 +- ...workspaceitems-edit-page-routing.module.ts | 12 +- src/assets/i18n/ar.json5 | 8956 +++++++++------ src/assets/i18n/bn.json5 | 3777 ++++++- src/assets/i18n/ca.json5 | 2400 +++- src/assets/i18n/de.json5 | 4767 +++++++- src/assets/i18n/el.json5 | 8678 ++++++++++++-- src/assets/i18n/en.json5 | 83 +- src/assets/i18n/es.json5 | 733 +- src/assets/i18n/fi.json5 | 927 +- src/assets/i18n/fr.json5 | 2999 ++++- src/assets/i18n/gd.json5 | 4001 ++++++- src/assets/i18n/hi.json5 | 7361 +++++++++--- src/assets/i18n/hu.json5 | 1558 ++- src/assets/i18n/it.json5 | 1379 ++- src/assets/i18n/ja.json5 | 9955 ++++++++++++----- src/assets/i18n/kk.json5 | 2618 ++++- src/assets/i18n/lv.json5 | 5325 ++++++++- src/assets/i18n/nl.json5 | 8820 +++++++++++---- src/assets/i18n/pl.json5 | 7427 ++++++++++-- src/assets/i18n/pt-BR.json5 | 1721 ++- src/assets/i18n/pt-PT.json5 | 946 +- src/assets/i18n/sr-cyr.json5 | 6142 +++++++++- src/assets/i18n/sr-lat.json5 | 6133 +++++++++- src/assets/i18n/sv.json5 | 3883 ++++++- src/assets/i18n/sw.json5 | 9955 ++++++++++++----- src/assets/i18n/tr.json5 | 5294 ++++++++- src/assets/i18n/uk.json5 | 5752 ++++++++-- src/assets/i18n/vi.json5 | 8246 ++++++++++++-- src/assets/images/dspace-logo.png | Bin 8609 -> 0 bytes src/config/app-config.interface.ts | 6 + src/config/config.server.ts | 1 + src/config/default-app-config.ts | 40 +- src/config/info-config.interface.ts | 1 + src/config/search-page-config.interface.ts | 12 + src/config/server-config.interface.ts | 4 + src/config/universal-config.interface.ts | 37 + src/environments/environment.production.ts | 23 + src/environments/environment.test.ts | 40 +- src/environments/environment.ts | 25 +- src/modules/app/browser-app.module.ts | 14 +- src/modules/app/browser-init.service.ts | 36 +- src/modules/app/server-app.module.ts | 6 + src/modules/app/server-init.service.ts | 30 +- src/robots.txt.ejs | 2 + src/styles/_bootstrap_variables.scss | 142 +- src/styles/_bootstrap_variables_mapping.scss | 7 - src/styles/_custom_variables.scss | 119 +- src/styles/_global-styles.scss | 278 +- src/styles/_mixins.scss | 2 +- src/styles/_truncatable-part.component.scss | 21 +- .../admin-search-page.component.html | 0 .../admin-search-page.component.scss | 0 .../admin-search-page.component.ts | 12 + .../admin-workflow-page.component.html | 0 .../admin-workflow-page.component.scss | 0 .../admin-workflow-page.component.ts | 12 + .../app/login-page/login-page.component.html | 13 - .../app/login-page/login-page.component.scss | 8 - .../logout-page/logout-page.component.html | 12 - .../logout-page/logout-page.component.scss | 6 - src/themes/custom/lazy-theme.module.ts | 7 + .../header-navbar-wrapper.component.html | 8 +- .../header-navbar-wrapper.component.scss | 79 + .../header-navbar-wrapper.component.ts | 2 + .../dspace/app/header/header.component.ts | 11 +- .../home-news/home-news.component.html | 4 +- .../home-news/home-news.component.scss | 86 +- .../dspace/app/navbar/navbar.component.html | 43 +- .../dspace/app/navbar/navbar.component.scss | 83 +- .../styles/_theme_css_variable_overrides.scss | 26 +- .../_theme_sass_variable_overrides.scss | 103 +- webpack/webpack.browser.ts | 9 +- yarn.lock | 3877 ++++--- 967 files changed, 130611 insertions(+), 32213 deletions(-) create mode 100644 .github/workflows/issue_opened.yml create mode 100644 cypress/e2e/admin-add-new-modals.cy.ts create mode 100644 cypress/e2e/admin-curation-tasks.cy.ts create mode 100644 cypress/e2e/admin-edit-modals.cy.ts create mode 100644 cypress/e2e/admin-export-modals.cy.ts create mode 100644 cypress/e2e/admin-search-page.cy.ts create mode 100644 cypress/e2e/admin-sidebar.cy.ts create mode 100644 cypress/e2e/admin-workflow-page.cy.ts create mode 100644 cypress/e2e/batch-import-page.cy.ts create mode 100644 cypress/e2e/bitstreams-format.cy.ts create mode 100644 cypress/e2e/bulk-access.cy.ts create mode 100644 cypress/e2e/collection-edit.cy.ts create mode 100644 cypress/e2e/community-edit.cy.ts create mode 100644 cypress/e2e/create-eperson.cy.ts create mode 100644 cypress/e2e/create-group.cy.ts create mode 100644 cypress/e2e/edit-eperson.cy.ts create mode 100644 cypress/e2e/edit-group.cy.ts create mode 100644 cypress/e2e/end-user-agreement.cy.ts create mode 100644 cypress/e2e/epeople-registry.cy.ts create mode 100644 cypress/e2e/feedback.cy.ts create mode 100644 cypress/e2e/groups-registry.cy.ts create mode 100644 cypress/e2e/health-page.cy.ts create mode 100644 cypress/e2e/item-edit.cy.ts create mode 100644 cypress/e2e/metadata-import-page.cy.ts create mode 100644 cypress/e2e/metadata-registry.cy.ts create mode 100644 cypress/e2e/metadata-schema.cy.ts create mode 100644 cypress/e2e/new-process.cy.ts create mode 100644 cypress/e2e/privacy.cy.ts create mode 100644 cypress/e2e/processes-overview.cy.ts create mode 100644 cypress/e2e/profile-page.cy.ts create mode 100644 cypress/e2e/system-wide-alert.cy.ts create mode 100644 src/app/accessibility/accessibility-settings.config.ts create mode 100644 src/app/accessibility/accessibility-settings.service.spec.ts create mode 100644 src/app/accessibility/accessibility-settings.service.stub.ts create mode 100644 src/app/accessibility/accessibility-settings.service.ts create mode 100644 src/app/admin/admin-search-page/themed-admin-search-page.component.ts create mode 100644 src/app/admin/admin-workflow-page/themed-admin-workflow-page.component.ts create mode 100644 src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts create mode 100644 src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts delete mode 100644 src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts delete mode 100644 src/app/bitstream-page/legacy-bitstream-url.resolver.ts create mode 100644 src/app/community-list-page/community-list/community-list.component.scss create mode 100644 src/app/core/data/object-updates/object-updates.service.stub.ts create mode 100644 src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts create mode 100644 src/app/core/dspace-rest/dspace-rest.interceptor.ts create mode 100644 src/app/core/submission/resolver/submission-links-to-follow.ts create mode 100644 src/app/core/submission/resolver/submission-parent-breadcrumb.resolver.ts create mode 100644 src/app/core/submission/submission-parent-breadcrumb.service.ts create mode 100644 src/app/core/xsrf/browser-xsrf.service.spec.ts create mode 100644 src/app/core/xsrf/browser-xsrf.service.ts create mode 100644 src/app/core/xsrf/server-xsrf.service.spec.ts create mode 100644 src/app/core/xsrf/server-xsrf.service.ts create mode 100644 src/app/core/xsrf/xsrf.service.spec.ts create mode 100644 src/app/core/xsrf/xsrf.service.ts create mode 100644 src/app/info/accessibility-settings/accessibility-settings.component.html create mode 100644 src/app/info/accessibility-settings/accessibility-settings.component.spec.ts create mode 100644 src/app/info/accessibility-settings/accessibility-settings.component.ts create mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts create mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts create mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts create mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.scss create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts create mode 100644 src/app/shared/btn-disabled.directive.ts create mode 100644 src/app/shared/cookies/klaro.service.stub.ts create mode 100644 src/app/shared/disabled-directive.spec.ts create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts create mode 100644 src/app/shared/live-region/live-region.component.html create mode 100644 src/app/shared/live-region/live-region.component.scss create mode 100644 src/app/shared/live-region/live-region.component.spec.ts create mode 100644 src/app/shared/live-region/live-region.component.ts create mode 100644 src/app/shared/live-region/live-region.config.ts create mode 100644 src/app/shared/live-region/live-region.service.spec.ts create mode 100644 src/app/shared/live-region/live-region.service.stub.ts create mode 100644 src/app/shared/live-region/live-region.service.ts create mode 100644 src/app/shared/menu/menu-item/menu-item.component.scss create mode 100644 src/app/shared/object-select/object-select.model.ts create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts delete mode 100644 src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts delete mode 100644 src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts create mode 100644 src/app/shared/search/search-labels/search-label/search-label.component.scss create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts create mode 100644 src/app/shared/search/search-results/search-results.component.scss create mode 100644 src/app/shared/testing/browse-service.stub.ts create mode 100644 src/app/shared/testing/edit-item-relationships.service.stub.ts create mode 100644 src/app/shared/testing/entity-type-data.service.stub.ts create mode 100644 src/app/shared/testing/item-data.service.stub.ts create mode 100644 src/app/shared/testing/object-updates.service.stub.ts create mode 100644 src/app/shared/testing/registry.service.stub.ts create mode 100644 src/app/shared/testing/relationship-data.service.stub.ts create mode 100644 src/app/shared/testing/server-response-service.stub.ts create mode 100644 src/app/shared/testing/truncatable-service.stub.ts create mode 100644 src/app/shared/utils/hover-outside.directive.ts create mode 100644 src/app/statistics/angulartics/dspace/view-tracker-resolver.service.ts delete mode 100644 src/app/statistics/angulartics/dspace/view-tracker.component.html delete mode 100644 src/app/statistics/angulartics/dspace/view-tracker.component.scss create mode 100644 src/app/workflowitems-edit-page/item-from-workflow-breadcrumb.resolver.ts create mode 100644 src/app/workspaceitems-edit-page/item-from-workspace-breadcrumb.resolver.ts delete mode 100644 src/assets/images/dspace-logo.png create mode 100644 src/config/search-page-config.interface.ts create mode 100644 src/themes/custom/app/admin/admin-search-page/admin-search-page.component.html create mode 100644 src/themes/custom/app/admin/admin-search-page/admin-search-page.component.scss create mode 100644 src/themes/custom/app/admin/admin-search-page/admin-search-page.component.ts create mode 100644 src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.html create mode 100644 src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.scss create mode 100644 src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.ts diff --git a/.eslintrc.json b/.eslintrc.json index af1b97849b6..6920cc47121 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -231,10 +231,13 @@ "*.json5" ], "extends": [ - "plugin:jsonc/recommended-with-jsonc" + "plugin:jsonc/recommended-with-json5" ], "rules": { - "no-irregular-whitespace": "error", + // The ESLint core no-irregular-whitespace rule doesn't work well in JSON + // See: https://ota-meshi.github.io/eslint-plugin-jsonc/rules/no-irregular-whitespace.html + "no-irregular-whitespace": "off", + "jsonc/no-irregular-whitespace": "error", "no-trailing-spaces": "error", "jsonc/comma-dangle": [ "error", diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fcbdd8dfa9f..d4e105ce6d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,8 @@ on: workflow_dispatch: permissions: - contents: read # to fetch code (actions/checkout) + contents: read # to fetch code (actions/checkout) + packages: read # to fetch private images from GitHub Container Registry (GHCR) jobs: tests: @@ -39,17 +40,22 @@ jobs: DSPACE_CACHE_SERVERSIDE_ANONYMOUSCACHE_MAX: 0 # Tell Cypress to run e2e tests using the same UI URL CYPRESS_BASE_URL: http://127.0.0.1:4000 + # Disable the cookie consent banner in e2e tests to avoid errors because of elements hidden by it + DSPACE_INFO_ENABLECOOKIECONSENTPOPUP: false # When Chrome version is specified, we pin to a specific version of Chrome # Comment this out to use the latest release #CHROME_VERSION: "90.0.4430.212-1" # Bump Node heap size (OOM in CI after upgrading to Angular 15) NODE_OPTIONS: '--max-old-space-size=4096' - # Project name to use when running docker compose prior to e2e tests + # Project name to use when running "docker compose" prior to e2e tests COMPOSE_PROJECT_NAME: 'ci' + # Docker Registry to use for Docker compose scripts below. + # We use GitHub's Container Registry to avoid aggressive rate limits at DockerHub. + DOCKER_REGISTRY: ghcr.io strategy: # Create a matrix of Node versions to test against (in parallel) matrix: - node-version: [16.x, 18.x] + node-version: [18.x, 20.x] # Do NOT exit immediately if one matrix job fails fail-fast: false # These are the actual CI steps to perform per job @@ -96,17 +102,17 @@ jobs: - name: Install Yarn dependencies run: yarn install --frozen-lockfile - - name: Run lint - run: yarn run lint --quiet +# - name: Run lint +# run: yarn run lint --quiet - - name: Check for circular dependencies - run: yarn run check-circ-deps +# - name: Check for circular dependencies +# run: yarn run check-circ-deps - name: Run build run: yarn run build:prod - - name: Run specs (unit tests) - run: yarn run test:headless +# - name: Run specs (unit tests) +# run: yarn run test:headless # Upload code coverage report to artifact (for one version of Node only), # so that it can be shared with the 'codecov' job (see below) @@ -119,7 +125,15 @@ jobs: path: 'coverage/dspace-angular/lcov.info' retention-days: 14 - # Using docker compose start backend using CI configuration + # Login to our Docker registry, so that we can access private Docker images using "docker compose" below. + - name: Login to ${{ env.DOCKER_REGISTRY }} + uses: docker/login-action@v3 + with: + registry: ${{ env.DOCKER_REGISTRY }} + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + # Using "docker compose" start backend using CI configuration # and load assetstore from a cached copy - name: Start DSpace REST Backend via Docker (for e2e tests) run: | @@ -183,21 +197,124 @@ jobs: # Get homepage and verify that the tag includes "DSpace". # If it does, then SSR is working, as this tag is created by our MetadataService. # This step also prints entire HTML of homepage for easier debugging if grep fails. - - name: Verify SSR (server-side rendering) + - name: Verify SSR (server-side rendering) on Homepage run: | result=$(wget -O- -q http://127.0.0.1:4000/home) echo "$result" echo "$result" | grep -oE "]*>" | grep Home + # Get a specific community in our test data and verify that the "

" tag includes "Publications" (the community name). + # If it does, then SSR is working. + - name: Verify SSR on a Community page + run: | + result=$(wget -O- -q http://127.0.0.1:4000/communities/0958c910-2037-42a9-81c7-dca80e3892b4) + echo "$result" + echo "$result" | grep -oE "

]*>[^><]*

" | grep Publications + + # Get a specific collection in our test data and verify that the "

" tag includes "Articles" (the collection name). + # If it does, then SSR is working. + - name: Verify SSR on a Collection page + run: | + result=$(wget -O- -q http://127.0.0.1:4000/collections/282164f5-d325-4740-8dd1-fa4d6d3e7200) + echo "$result" + echo "$result" | grep -oE "

]*>[^><]*

" | grep Articles + + # Get a specific publication in our test data and verify that the tag includes + # the title of this publication. If it does, then SSR is working. + - name: Verify SSR on a Publication page + run: | + result=$(wget -O- -q http://127.0.0.1:4000/entities/publication/6160810f-1e53-40db-81ef-f6621a727398) + echo "$result" + echo "$result" | grep -oE "]*>" | grep "An Economic Model of Mortality Salience" + + # Get a specific person in our test data and verify that the tag includes + # the name of the person. If it does, then SSR is working. + - name: Verify SSR on a Person page + run: | + result=$(wget -O- -q http://127.0.0.1:4000/entities/person/b1b2c768-bda1-448a-a073-fc541e8b24d9) + echo "$result" + echo "$result" | grep -oE "]*>" | grep "Simmons, Cameron" + + # Get a specific project in our test data and verify that the tag includes + # the name of the project. If it does, then SSR is working. + - name: Verify SSR on a Project page + run: | + result=$(wget -O- -q http://127.0.0.1:4000/entities/project/46ccb608-a74c-4bf6-bc7a-e29cc7defea9) + echo "$result" + echo "$result" | grep -oE "]*>" | grep "University Research Fellowship" + + # Get a specific orgunit in our test data and verify that the tag includes + # the name of the orgunit. If it does, then SSR is working. + - name: Verify SSR on an OrgUnit page + run: | + result=$(wget -O- -q http://127.0.0.1:4000/entities/orgunit/9851674d-bd9a-467b-8d84-068deb568ccf) + echo "$result" + echo "$result" | grep -oE "]*>" | grep "Law and Development" + + # Get a specific journal in our test data and verify that the tag includes + # the name of the journal. If it does, then SSR is working. + - name: Verify SSR on a Journal page + run: | + result=$(wget -O- -q http://127.0.0.1:4000/entities/journal/d4af6c3e-53d0-4757-81eb-566f3b45d63a) + echo "$result" + echo "$result" | grep -oE "]*>" | grep "Environmental & Architectural Phenomenology" + + # Get a specific journal volume in our test data and verify that the tag includes + # the name of the volume. If it does, then SSR is working. + - name: Verify SSR on a Journal Volume page + run: | + result=$(wget -O- -q http://127.0.0.1:4000/entities/journalvolume/07c6249f-4bf7-494d-9ce3-6ffdb2aed538) + echo "$result" + echo "$result" | grep -oE "]*>" | grep "Environmental & Architectural Phenomenology Volume 28 (2017)" + + # Get a specific journal issue in our test data and verify that the tag includes + # the name of the issue. If it does, then SSR is working. + - name: Verify SSR on a Journal Issue page + run: | + result=$(wget -O- -q http://127.0.0.1:4000/entities/journalissue/44c29473-5de2-48fa-b005-e5029aa1a50b) + echo "$result" + echo "$result" | grep -oE "]*>" | grep "Environmental & Architectural Phenomenology Vol. 28, No. 1" + + # Verify 301 Handle redirect behavior + # Note: /handle/123456789/260 is the same test Publication used by our e2e tests + - name: Verify 301 redirect from '/handle' URLs + run: | + result=$(wget --server-response --quiet http://127.0.0.1:4000/handle/123456789/260 2>&1 | head -1 | awk '{print $2}') + echo "$result" + [[ "$result" -eq "301" ]] + + # Verify 403 error code behavior + - name: Verify 403 error code from '/403' + run: | + result=$(wget --server-response --quiet http://127.0.0.1:4000/403 2>&1 | head -1 | awk '{print $2}') + echo "$result" + [[ "$result" -eq "403" ]] + + # Verify 404 error code behavior + - name: Verify 404 error code from '/404' and on invalid pages + run: | + result=$(wget --server-response --quiet http://127.0.0.1:4000/404 2>&1 | head -1 | awk '{print $2}') + echo "$result" + result2=$(wget --server-response --quiet http://127.0.0.1:4000/invalidurl 2>&1 | head -1 | awk '{print $2}') + echo "$result2" + [[ "$result" -eq "404" && "$result2" -eq "404" ]] + + # Verify 500 error code behavior + - name: Verify 500 error code from '/500' + run: | + result=$(wget --server-response --quiet http://127.0.0.1:4000/500 2>&1 | head -1 | awk '{print $2}') + echo "$result" + [[ "$result" -eq "500" ]] + - name: Stop running app run: kill -9 $(lsof -t -i:4000) - name: Shutdown Docker containers run: docker compose -f ./docker/docker-compose-ci.yml down - # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test - # job above. This is necessary because Codecov uploads seem to randomly fail at times. - # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954 +# # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test +# # job above. This is necessary because Codecov uploads seem to randomly fail at times. +# # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954 # codecov: # # Must run after 'tests' job above # needs: tests diff --git a/.github/workflows/codescan.yml b/.github/workflows/codescan.yml index 520db7523dc..1e16f8fcf86 100644 --- a/.github/workflows/codescan.yml +++ b/.github/workflows/codescan.yml @@ -35,7 +35,7 @@ jobs: steps: # https://github.com/actions/checkout - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. # https://github.com/github/codeql-action diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 54b79bee00b..4166c307a56 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,7 +4,7 @@ name: Docker images # Run this Build for all pushes to 'main' or maintenance branches, or tagged releases. # Also run for PRs to ensure PR doesn't break Docker build process # NOTE: uses "reusable-docker-build.yml" in DSpace/DSpace to actually build each of the Docker images -# https://github.com/DSpace/DSpace/blob/main/.github/workflows/reusable-docker-build.yml +# https://github.com/DSpace/DSpace/blob/dspace-7_x/.github/workflows/reusable-docker-build.yml # on: push: @@ -15,12 +15,17 @@ on: workflow_dispatch: permissions: - contents: read # to fetch code (actions/checkout) + contents: read # to fetch code (actions/checkout) + packages: write # to write images to GitHub Container Registry (GHCR) jobs: + ############################################################# + # Build/Push the 'dspace/dspace-angular' image + ############################################################# dspace-angular: # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular' if: github.repository == 'dataquest-dev/dspace-angular' + # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev with: build_id: dspace-angular @@ -38,6 +43,7 @@ jobs: dspace-angular-dist: # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace-angular' if: github.repository == 'dataquest-dev/dspace-angular' && false # not used for now + # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev with: build_id: dspace-angular-dist @@ -51,6 +57,10 @@ jobs: secrets: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} + # Enable redeploy of sandbox & demo if the branch for this image matches the deployment branch of + # these sites as specified in reusable-docker-build.xml + REDEPLOY_SANDBOX_URL: ${{ secrets.REDEPLOY_SANDBOX_URL }} + REDEPLOY_DEMO_URL: ${{ secrets.REDEPLOY_DEMO_URL }} deploy: needs: dspace-angular diff --git a/.github/workflows/issue_opened.yml b/.github/workflows/issue_opened.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/.github/workflows/port_merged_pull_request.yml b/.github/workflows/port_merged_pull_request.yml index 109835d14d3..857f22755e4 100644 --- a/.github/workflows/port_merged_pull_request.yml +++ b/.github/workflows/port_merged_pull_request.yml @@ -23,11 +23,11 @@ jobs: if: github.event.pull_request.merged steps: # Checkout code - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Port PR to other branch (ONLY if labeled with "port to") # See https://github.com/korthout/backport-action - name: Create backport pull requests - uses: korthout/backport-action@v1 + uses: korthout/backport-action@v2 with: # Trigger based on a "port to [branch]" label on PR # (This label must specify the branch name to port to) diff --git a/Dockerfile b/Dockerfile index 26b07b099ba..e1e72cbf43f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # This image will be published as dspace/dspace-angular # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details -FROM node:18-alpine +FROM docker.io/node:18-alpine # Ensure Python and other build tools are available # These are needed to install some node modules, especially on linux/arm64 diff --git a/Dockerfile.dist b/Dockerfile.dist index de5b41ff64e..26c8bf6d6ab 100644 --- a/Dockerfile.dist +++ b/Dockerfile.dist @@ -4,7 +4,7 @@ # Test build: # docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-7_x-dist . -FROM node:18-alpine AS build +FROM docker.io/node:18-alpine AS build # Ensure Python and other build tools are available # These are needed to install some node modules, especially on linux/arm64 diff --git a/angular.json b/angular.json index bf3dd88c524..a57b7582109 100644 --- a/angular.json +++ b/angular.json @@ -30,7 +30,6 @@ "lodash", "jwt-decode", "uuid", - "webfontloader", "zone.js" ], "outputPath": "dist/browser", diff --git a/config/config.example.yml b/config/config.example.yml index 8e23e60a8da..8b56711c7d2 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -1,7 +1,7 @@ # NOTE: will log all redux actions and transfers in console debug: false -# Angular Universal server settings +# Angular User Inteface settings # NOTE: these settings define where Node.js will start your UI application. Therefore, these # "ui" settings usually specify a localhost port/URL which is later proxied to a public URL (using Apache or similar) ui: @@ -17,12 +17,48 @@ ui: # Trust X-FORWARDED-* headers from proxies (default = true) useProxies: true +# Angular Universal / Server Side Rendering (SSR) settings universal: - # Whether to inline "critical" styles into the server-side rendered HTML. - # Determining which styles are critical is a relatively expensive operation; - # this option can be disabled to boost server performance at the expense of - # loading smoothness. + # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML. + # Determining which styles are critical is a relatively expensive operation; this option is + # disabled (false) by default to boost server performance at the expense of loading smoothness. inlineCriticalCss: false + # Patterns to be run as regexes against the path of the page to check if SSR is allowed. + # If the path match any of the regexes it will be served directly in CSR. + # By default, excludes community and collection browse, global browse, global search, community list, statistics and various administrative tools. + excludePathPatterns: + - pattern: "^/communities/[a-f0-9-]{36}/browse(/.*)?$" + flag: "i" + - pattern: "^/collections/[a-f0-9-]{36}/browse(/.*)?$" + flag: "i" + - pattern: "^/browse/" + - pattern: "^/search$" + - pattern: "^/community-list$" + - pattern: "^/admin/" + - pattern: "^/processes/?" + - pattern: "^/notifications/" + - pattern: "^/statistics/?" + - pattern: "^/access-control/" + - pattern: "^/health$" + + # Whether to enable rendering of Search component on SSR. + # If set to true the component will be included in the HTML returned from the server side rendering. + # If set to false the component will not be included in the HTML returned from the server side rendering. + enableSearchComponent: false + # Whether to enable rendering of Browse component on SSR. + # If set to true the component will be included in the HTML returned from the server side rendering. + # If set to false the component will not be included in the HTML returned from the server side rendering. + enableBrowseComponent: false + # Enable state transfer from the server-side application to the client-side application. + # Defaults to true. + # Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it. + # Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and + # ensure that users always use the most up-to-date state. + transferState: true + # When a different REST base URL is used for the server-side application, the generated state contains references to + # REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs. + # Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues. + replaceRestUrl: true # The REST API server settings # NOTE: these settings define which (publicly available) REST API to use. They are usually @@ -33,6 +69,9 @@ rest: port: 443 # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript nameSpace: /server + # Provide a different REST url to be used during SSR execution. It must contain the whole url including protocol, server port and + # server namespace (uncomment to use it). + #ssrBaseUrl: http://localhost:8080/server # Caching settings cache: @@ -176,6 +215,12 @@ languages: - code: en label: English active: true + - code: ar + label: العربية + active: true + - code: bn + label: বাংলা + active: true - code: ca label: Català active: true @@ -185,24 +230,36 @@ languages: - code: de label: Deutsch active: true + - code: el + label: Ελληνικά + active: true - code: es label: Español active: true + - code: fi + label: Suomi + active: true - code: fr label: Français active: true - code: gd label: Gàidhlig active: true + - code: hi + label: हिंदी + active: true + - code: hu + label: Magyar + active: true - code: it label: Italiano active: true + - code: kk + label: Қазақ + active: true - code: lv label: Latviešu active: true - - code: hu - label: Magyar - active: true - code: nl label: Nederlands active: true @@ -218,8 +275,8 @@ languages: - code: sr-lat label: Srpski (lat) active: true - - code: fi - label: Suomi + - code: sr-cyr + label: Српски active: true - code: sv label: Svenska @@ -227,27 +284,12 @@ languages: - code: tr label: Türkçe active: true - - code: vi - label: Tiếng Việt - active: true - - code: kk - label: Қазақ - active: true - - code: bn - label: বাংলা - active: true - - code: hi - label: हिंदी - active: true - - code: el - label: Ελληνικά - active: true - - code: sr-cyr - label: Српски - active: true - code: uk label: Yкраї́нська active: true + - code: vi + label: Tiếng Việt + active: true # Browse-By Pages @@ -394,6 +436,34 @@ comcolSelectionSort: sortField: 'dc.title' sortDirection: 'ASC' +# Live Region configuration +# Live Region as defined by w3c, https://www.w3.org/TR/wai-aria-1.1/#terms: +# Live regions are perceivable regions of a web page that are typically updated as a +# result of an external event when user focus may be elsewhere. +# +# The DSpace live region is a component present at the bottom of all pages that is invisible by default, but is useful +# for screen readers. Any message pushed to the live region will be announced by the screen reader. These messages +# usually contain information about changes on the page that might not be in focus. +liveRegion: + # The duration after which messages disappear from the live region in milliseconds + messageTimeOutDurationMs: 30000 + # The visibility of the live region. Setting this to true is only useful for debugging purposes. + isVisible: false + + +# Search settings +search: + # Number used to render n UI elements called loading skeletons that act as placeholders. + # These elements indicate that some content will be loaded in their stead. + # Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count. + # e.g. If we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved. + defaultFiltersCount: 5 + +# Configuration for storing accessibility settings, used by the AccessibilitySettingsService +accessibility: + # The duration in days after which the accessibility settings cookie expires + cookieExpirationDuration: 7 + matomo: hostUrl: http://localhost:8135/ siteId: 1 diff --git a/cypress.config.ts b/cypress.config.ts index c7676fb7010..28463a44c61 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -1,6 +1,7 @@ import { defineConfig } from 'cypress'; export default defineConfig({ + video: true, videosFolder: 'cypress/videos', screenshotsFolder: 'cypress/screenshots', fixturesFolder: 'cypress/fixtures', @@ -9,27 +10,33 @@ export default defineConfig({ openMode: 0, }, env: { - // Global constants used in DSpace e2e tests (see also ./cypress/support/e2e.ts) - // May be overridden in our cypress.json config file using specified environment variables. + // Global DSpace environment variables used in all our Cypress e2e tests + // May be modified in this config, or overridden in a variety of ways. + // See Cypress environment variable docs: https://docs.cypress.io/guides/guides/environment-variables // Default values listed here are all valid for the Demo Entities Data set available at // https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data // (This is the data set used in our CI environment) // Admin account used for administrative tests DSPACE_TEST_ADMIN_USER: 'dspacedemo+admin@gmail.com', + DSPACE_TEST_ADMIN_USER_UUID: '335647b6-8a52-4ecb-a8c1-7ebabb199bda', DSPACE_TEST_ADMIN_PASSWORD: 'dspace', // Community/collection/publication used for view/edit tests DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4', DSPACE_TEST_COLLECTION: '282164f5-d325-4740-8dd1-fa4d6d3e7200', - DSPACE_TEST_ENTITY_PUBLICATION: 'e98b0f27-5c19-49a0-960d-eb6ad5287067', + DSPACE_TEST_ENTITY_PUBLICATION: '6160810f-1e53-40db-81ef-f6621a727398', // Search term (should return results) used in search tests DSPACE_TEST_SEARCH_TERM: 'test', - // Collection used for submission tests + // Main Collection used for submission tests. Should be able to accept normal Item objects DSPACE_TEST_SUBMIT_COLLECTION_NAME: 'Sample Collection', DSPACE_TEST_SUBMIT_COLLECTION_UUID: '9d8334e9-25d3-4a67-9cea-3dffdef80144', + // Collection used for Person entity submission tests. MUST be configured with EntityType=Person. + DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'People', // Account used to test basic submission process DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com', DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace', + // Administrator users group + DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4', CLARIN_TEST_WITHDRAWN_ITEM: '7282fc76-0941-4055-a5a3-1f582c638050', CLARIN_TEST_WITHDRAWN_ITEM_WITH_REASON: '8ae76fcf-b26b-42f2-84d3-9a85e0517bca', CLARIN_TEST_WITHDRAWN_ITEM_WITH_REASON_AND_AUTHORS: 'cd368b6a-0019-4813-bad9-5050e50ba36d', diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts new file mode 100644 index 00000000000..332d44da138 --- /dev/null +++ b/cypress/e2e/admin-add-new-modals.cy.ts @@ -0,0 +1,54 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Admin Add New Modals', () => { + beforeEach(() => { + // Must login as an Admin for sidebar to appear + cy.visit('/login'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('Add new Community modal should pass accessibility tests', () => { + // Pin the sidebar open + cy.get('#sidebar-collapse-toggle').trigger('mouseover'); + cy.get('#sidebar-collapse-toggle').click(); + + // Click on entry of menu + cy.get('#admin-menu-section-new-title').should('be.visible'); + cy.get('#admin-menu-section-new-title').click(); + + cy.get('a[data-test="menu.section.new_community"]').click(); + + // Analyze for accessibility + testA11y('ds-create-community-parent-selector'); + }); + + it('Add new Collection modal should pass accessibility tests', () => { + // Pin the sidebar open + cy.get('#sidebar-collapse-toggle').trigger('mouseover'); + cy.get('#sidebar-collapse-toggle').click(); + + // Click on entry of menu + cy.get('#admin-menu-section-new-title').should('be.visible'); + cy.get('#admin-menu-section-new-title').click(); + + cy.get('a[data-test="menu.section.new_collection"]').click(); + + // Analyze for accessibility + testA11y('ds-create-collection-parent-selector'); + }); + + it('Add new Item modal should pass accessibility tests', () => { + // Pin the sidebar open + cy.get('#sidebar-collapse-toggle').trigger('mouseover'); + cy.get('#sidebar-collapse-toggle').click(); + + // Click on entry of menu + cy.get('#admin-menu-section-new-title').should('be.visible'); + cy.get('#admin-menu-section-new-title').click(); + + cy.get('a[data-test="menu.section.new_item"]').click(); + + // Analyze for accessibility + testA11y('ds-create-item-parent-selector'); + }); +}); diff --git a/cypress/e2e/admin-curation-tasks.cy.ts b/cypress/e2e/admin-curation-tasks.cy.ts new file mode 100644 index 00000000000..e66f0ccaad8 --- /dev/null +++ b/cypress/e2e/admin-curation-tasks.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Admin Curation Tasks', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/admin/curation-tasks'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Page must first be visible + cy.get('ds-admin-curation-task').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-admin-curation-task'); + }); +}); diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts new file mode 100644 index 00000000000..8ba524d5be1 --- /dev/null +++ b/cypress/e2e/admin-edit-modals.cy.ts @@ -0,0 +1,54 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Admin Edit Modals', () => { + beforeEach(() => { + // Must login as an Admin for sidebar to appear + cy.visit('/login'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('Edit Community modal should pass accessibility tests', () => { + // Pin the sidebar open + cy.get('#sidebar-collapse-toggle').trigger('mouseover'); + cy.get('#sidebar-collapse-toggle').click(); + + // Click on entry of menu + cy.get('#admin-menu-section-edit-title').should('be.visible'); + cy.get('#admin-menu-section-edit-title').click(); + + cy.get('a[data-test="menu.section.edit_community"]').click(); + + // Analyze for accessibility + testA11y('ds-edit-community-selector'); + }); + + it('Edit Collection modal should pass accessibility tests', () => { + // Pin the sidebar open + cy.get('#sidebar-collapse-toggle').trigger('mouseover'); + cy.get('#sidebar-collapse-toggle').click(); + + // Click on entry of menu + cy.get('#admin-menu-section-edit-title').should('be.visible'); + cy.get('#admin-menu-section-edit-title').click(); + + cy.get('a[data-test="menu.section.edit_collection"]').click(); + + // Analyze for accessibility + testA11y('ds-edit-collection-selector'); + }); + + it('Edit Item modal should pass accessibility tests', () => { + // Pin the sidebar open + cy.get('#sidebar-collapse-toggle').trigger('mouseover'); + cy.get('#sidebar-collapse-toggle').click(); + + // Click on entry of menu + cy.get('#admin-menu-section-edit-title').should('be.visible'); + cy.get('#admin-menu-section-edit-title').click(); + + cy.get('a[data-test="menu.section.edit_item"]').click(); + + // Analyze for accessibility + testA11y('ds-edit-item-selector'); + }); +}); diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts new file mode 100644 index 00000000000..24a184fd35e --- /dev/null +++ b/cypress/e2e/admin-export-modals.cy.ts @@ -0,0 +1,39 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Admin Export Modals', () => { + beforeEach(() => { + // Must login as an Admin for sidebar to appear + cy.visit('/login'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('Export metadata modal should pass accessibility tests', () => { + // Pin the sidebar open + cy.get('#sidebar-collapse-toggle').trigger('mouseover'); + cy.get('#sidebar-collapse-toggle').click(); + + // Click on entry of menu + cy.get('#admin-menu-section-export-title').should('be.visible'); + cy.get('#admin-menu-section-export-title').click(); + + cy.get('a[data-test="menu.section.export_metadata"]').click(); + + // Analyze for accessibility + testA11y('ds-export-metadata-selector'); + }); + + it('Export batch modal should pass accessibility tests', () => { + // Pin the sidebar open + cy.get('#sidebar-collapse-toggle').trigger('mouseover'); + cy.get('#sidebar-collapse-toggle').click(); + + // Click on entry of menu + cy.get('#admin-menu-section-export-title').should('be.visible'); + cy.get('#admin-menu-section-export-title').click(); + + cy.get('a[data-test="menu.section.export_batch"]').click(); + + // Analyze for accessibility + testA11y('ds-export-metadata-selector'); + }); +}); diff --git a/cypress/e2e/admin-menu.cy.ts b/cypress/e2e/admin-menu.cy.ts index 0d02148cd9d..f400a2adc27 100644 --- a/cypress/e2e/admin-menu.cy.ts +++ b/cypress/e2e/admin-menu.cy.ts @@ -18,9 +18,9 @@ describe('Admin Menu Page', () => { it('should pass accessibility tests', () => { // Check handles redirect url in the tag - cy.get('.sidebar-top-level-items a[href = "/handle-table"]').scrollIntoView().should('be.visible'); + cy.get('ds-admin-sidebar-section a[href = "/handle-table"]').scrollIntoView().should('be.visible'); // Check licenses redirect url in the tag - cy.get('.sidebar-top-level-items a[href = "/licenses/manage-table"]').scrollIntoView().should('be.visible'); + cy.get('ds-admin-sidebar-section a[href = "/licenses/manage-table"]').scrollIntoView().should('be.visible'); }); }); diff --git a/cypress/e2e/admin-search-page.cy.ts b/cypress/e2e/admin-search-page.cy.ts new file mode 100644 index 00000000000..38b02b92f0c --- /dev/null +++ b/cypress/e2e/admin-search-page.cy.ts @@ -0,0 +1,20 @@ +describe('Admin Search Page', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/admin/search'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + //Page must first be visible + cy.get('ds-admin-search-page').should('be.visible'); + // At least one search result should be displayed + cy.get('[data-test="list-object"]').should('be.visible'); + // Click each filter toggle to open *every* filter + // (As we want to scan filter section for accessibility issues as well) + cy.get('[data-test="filter-toggle"]').click({ multiple: true }); + // Analyze for accessibility issues + // CLARIN-DSpace still has some accessibility issues, so we will not fail the test + // testA11y('ds-admin-search-page'); + }); +}); diff --git a/cypress/e2e/admin-sidebar.cy.ts b/cypress/e2e/admin-sidebar.cy.ts new file mode 100644 index 00000000000..7612eb53132 --- /dev/null +++ b/cypress/e2e/admin-sidebar.cy.ts @@ -0,0 +1,28 @@ +import { Options } from 'cypress-axe'; +import { testA11y } from 'cypress/support/utils'; + +describe('Admin Sidebar', () => { + beforeEach(() => { + // Must login as an Admin for sidebar to appear + cy.visit('/login'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should be pinnable and pass accessibility tests', () => { + // Pin the sidebar open + cy.get('#sidebar-collapse-toggle').click(); + + // Click on every expandable section to open all menus + cy.get('ds-expandable-admin-sidebar-section').click({multiple: true}); + + // Analyze for accessibility + testA11y('ds-admin-sidebar', + { + rules: { + // Currently all expandable sections have nested interactive elements + // See https://github.com/DSpace/dspace-angular/issues/2178 + 'nested-interactive': { enabled: false }, + } + } as Options); + }); +}); diff --git a/cypress/e2e/admin-workflow-page.cy.ts b/cypress/e2e/admin-workflow-page.cy.ts new file mode 100644 index 00000000000..4feff0bee0f --- /dev/null +++ b/cypress/e2e/admin-workflow-page.cy.ts @@ -0,0 +1,20 @@ +describe('Admin Workflow Page', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/admin/workflow'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Page must first be visible + cy.get('ds-admin-workflow-page').should('be.visible'); + // At least one search result should be displayed + cy.get('[data-test="list-object"]').should('be.visible'); + // Click each filter toggle to open *every* filter + // (As we want to scan filter section for accessibility issues as well) + cy.get('[data-test="filter-toggle"]').click({ multiple: true }); + // Analyze for accessibility issues + // CLARIN-DSpace still has some accessibility issues, so we will not fail the test + // testA11y('ds-admin-workflow-page'); + }); +}); diff --git a/cypress/e2e/batch-import-page.cy.ts b/cypress/e2e/batch-import-page.cy.ts new file mode 100644 index 00000000000..871b8644ce1 --- /dev/null +++ b/cypress/e2e/batch-import-page.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Batch Import Page', () => { + beforeEach(() => { + // Must login as an Admin to see processes + cy.visit('/admin/batch-import'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Batch import form must first be visible + cy.get('ds-batch-import-page').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-batch-import-page'); + }); +}); diff --git a/cypress/e2e/bitstreams-format.cy.ts b/cypress/e2e/bitstreams-format.cy.ts new file mode 100644 index 00000000000..f113d45ebce --- /dev/null +++ b/cypress/e2e/bitstreams-format.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Bitstreams Formats', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/admin/registries/bitstream-formats'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Page must first be visible + cy.get('ds-bitstream-formats').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-bitstream-formats'); + }); +}); diff --git a/cypress/e2e/breadcrumbs.cy.ts b/cypress/e2e/breadcrumbs.cy.ts index ea6acdafcde..0cddbc723c6 100644 --- a/cypress/e2e/breadcrumbs.cy.ts +++ b/cypress/e2e/breadcrumbs.cy.ts @@ -1,10 +1,9 @@ -import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e'; import { testA11y } from 'cypress/support/utils'; describe('Breadcrumbs', () => { it('should pass accessibility tests', () => { // Visit an Item, as those have more breadcrumbs - cy.visit('/entities/publication/'.concat(TEST_ENTITY_PUBLICATION)); + cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'))); // Wait for breadcrumbs to be visible cy.get('ds-breadcrumbs').should('be.visible'); diff --git a/cypress/e2e/bulk-access.cy.ts b/cypress/e2e/bulk-access.cy.ts new file mode 100644 index 00000000000..c8921f5651c --- /dev/null +++ b/cypress/e2e/bulk-access.cy.ts @@ -0,0 +1,29 @@ +describe('Bulk Access', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/access-control/bulk-access'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Page must first be visible + cy.get('ds-bulk-access').should('be.visible'); + // At least one search result should be displayed + cy.get('[data-test="list-object"]').should('be.visible'); + // Click each filter toggle to open *every* filter + // (As we want to scan filter section for accessibility issues as well) + cy.get('[data-test="filter-toggle"]').click({ multiple: true }); + // Analyze for accessibility issues + // CLARIN-DSpace still has some accessibility issues, so we will not fail the test + // testA11y('ds-bulk-access', { + // rules: { + // // All panels are accordians & fail "aria-required-children" and "nested-interactive". + // // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216 + // 'aria-required-children': { enabled: false }, + // 'nested-interactive': { enabled: false }, + // // Card titles fail this test currently + // 'heading-order': { enabled: false }, + // }, + // } as Options); + }); +}); diff --git a/cypress/e2e/collection-edit.cy.ts b/cypress/e2e/collection-edit.cy.ts new file mode 100644 index 00000000000..63d873db3ec --- /dev/null +++ b/cypress/e2e/collection-edit.cy.ts @@ -0,0 +1,128 @@ +import { testA11y } from 'cypress/support/utils'; + +const COLLECTION_EDIT_PAGE = '/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')).concat('/edit'); + +beforeEach(() => { + // All tests start with visiting the Edit Collection Page + cy.visit(COLLECTION_EDIT_PAGE); + + // This page is restricted, so we will be shown the login form. Fill it out & submit. + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); +}); + +describe('Edit Collection > Edit Metadata tab', () => { + it('should pass accessibility tests', () => { + // tag must be loaded + cy.get('ds-edit-collection').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-edit-collection'); + }); +}); + +describe('Edit Collection > Assign Roles tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="roles"]').click(); + + // tag must be loaded + cy.get('ds-collection-roles').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-collection-roles'); + }); +}); + +describe('Edit Collection > Content Source tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="source"]').click(); + + // tag must be loaded + cy.get('ds-collection-source').should('be.visible'); + + // Check the external source checkbox (to display all fields on the page) + cy.get('#externalSourceCheck').check(); + + // Wait for the source controls to appear + // cy.get('ds-collection-source-controls').should('be.visible'); + + // Analyze entire page for accessibility issues + testA11y('ds-collection-source'); + }); +}); + +describe('Edit Collection > Curate tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="curate"]').click(); + + // tag must be loaded + cy.get('ds-collection-curate').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-collection-curate'); + }); +}); + +describe('Edit Collection > Access Control tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="access-control"]').click(); + + // tag must be loaded + cy.get('ds-collection-access-control').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-collection-access-control'); + }); +}); + +describe('Edit Collection > Authorizations tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="authorizations"]').click(); + + // tag must be loaded + cy.get('ds-collection-authorizations').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-collection-authorizations'); + }); +}); + +describe('Edit Collection > Item Mapper tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="mapper"]').click(); + + // tag must be loaded + cy.get('ds-collection-item-mapper').should('be.visible'); + + // Analyze entire page for accessibility issues + testA11y('ds-collection-item-mapper'); + + // Click on the "Map new Items" tab + cy.get('li[data-test="mapTab"] a').click(); + + // Make sure search form is now visible + cy.get('ds-search-form').should('be.visible'); + + // Analyze entire page (again) for accessibility issues + testA11y('ds-collection-item-mapper'); + }); +}); + + +describe('Edit Collection > Delete page', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="delete-button"]').click(); + + // tag must be loaded + cy.get('ds-delete-collection').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-delete-collection'); + }); +}); diff --git a/cypress/e2e/collection-page.cy.ts b/cypress/e2e/collection-page.cy.ts index e4e17d19c6d..1e308be4767 100644 --- a/cypress/e2e/collection-page.cy.ts +++ b/cypress/e2e/collection-page.cy.ts @@ -1,16 +1,22 @@ -import { TEST_COLLECTION } from 'cypress/support/e2e'; import { testA11y } from 'cypress/support/utils'; describe('Collection Page', () => { - it('should pass accessibility tests', () => { - cy.visit('/collections/'.concat(TEST_COLLECTION)); + it('should pass accessibility tests', () => { + cy.intercept('POST', '/server/api/statistics/viewevents').as('viewevent'); - // tag must be loaded - cy.get('ds-collection-page').should('be.visible'); + // Visit Collections page + cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION'))); - // TODO accessibility tests are failing because the UI has been changed - // Analyze for accessibility issues - // testA11y('ds-collection-page'); - }); + // Wait for the "viewevent" to trigger on the Collection page. + // This ensures our tag is fully loaded, as the tag is contained within it. + cy.wait('@viewevent'); + + // tag must be loaded + cy.get('ds-collection-page').should('be.visible'); + + // TODO accessibility tests are failing because the UI has been changed + // Analyze for accessibility issues + // testA11y('ds-collection-page'); + }); }); diff --git a/cypress/e2e/collection-statistics.cy.ts b/cypress/e2e/collection-statistics.cy.ts index d998e14e400..99b6f8218b0 100644 --- a/cypress/e2e/collection-statistics.cy.ts +++ b/cypress/e2e/collection-statistics.cy.ts @@ -1,15 +1,15 @@ -import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_COLLECTION } from 'cypress/support/e2e'; +import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e'; import { testA11y } from 'cypress/support/utils'; describe('Collection Statistics Page', () => { - const COLLECTIONSTATISTICSPAGE = '/statistics/collections/'.concat(TEST_COLLECTION); + const COLLECTIONSTATISTICSPAGE = '/statistics/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')); // NOTE: the statistics option was removed from the navbar - add it there in the future and uncomment this test - // it('should load if you click on "Statistics" from a Collection page', () => { - // cy.visit('/collections/'.concat(TEST_COLLECTION)); - // cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click(); - // cy.location('pathname').should('eq', COLLECTIONSTATISTICSPAGE); - // }); + // it('should load if you click on "Statistics" from a Collection page', () => { + // cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION'))); + // cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click(); + // cy.location('pathname').should('eq', COLLECTIONSTATISTICSPAGE); + // }); it('should contain a "Total visits" section', () => { cy.visit(COLLECTIONSTATISTICSPAGE); @@ -19,7 +19,7 @@ describe('Collection Statistics Page', () => { it('should contain a "Total visits per month" section', () => { cy.visit(COLLECTIONSTATISTICSPAGE); // Check just for existence because this table is empty in CI environment as it's historical data - cy.get('.'.concat(TEST_COLLECTION).concat('_TotalVisitsPerMonth')).should('exist'); + cy.get('.'.concat(Cypress.env('DSPACE_TEST_COLLECTION')).concat('_TotalVisitsPerMonth')).should('exist'); }); it('should pass accessibility tests', () => { diff --git a/cypress/e2e/community-edit.cy.ts b/cypress/e2e/community-edit.cy.ts new file mode 100644 index 00000000000..8fc1a7733e7 --- /dev/null +++ b/cypress/e2e/community-edit.cy.ts @@ -0,0 +1,86 @@ +import { testA11y } from 'cypress/support/utils'; + +const COMMUNITY_EDIT_PAGE = '/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')).concat('/edit'); + +beforeEach(() => { + // All tests start with visiting the Edit Community Page + cy.visit(COMMUNITY_EDIT_PAGE); + + // This page is restricted, so we will be shown the login form. Fill it out & submit. + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); +}); + +describe('Edit Community > Edit Metadata tab', () => { + it('should pass accessibility tests', () => { + // tag must be loaded + cy.get('ds-edit-community').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-edit-community'); + }); +}); + +describe('Edit Community > Assign Roles tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="roles"]').click(); + + // tag must be loaded + cy.get('ds-community-roles').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-community-roles'); + }); +}); + +describe('Edit Community > Curate tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="curate"]').click(); + + // tag must be loaded + cy.get('ds-community-curate').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-community-curate'); + }); +}); + +describe('Edit Community > Access Control tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="access-control"]').click(); + + // tag must be loaded + cy.get('ds-community-access-control').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-community-access-control'); + }); +}); + +describe('Edit Community > Authorizations tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="authorizations"]').click(); + + // tag must be loaded + cy.get('ds-community-authorizations').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-community-authorizations'); + }); +}); + +describe('Edit Community > Delete page', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="delete-button"]').click(); + + // tag must be loaded + cy.get('ds-delete-community').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-delete-community'); + }); +}); diff --git a/cypress/e2e/community-page.cy.ts b/cypress/e2e/community-page.cy.ts index 13e29e4fa07..8969e647058 100644 --- a/cypress/e2e/community-page.cy.ts +++ b/cypress/e2e/community-page.cy.ts @@ -1,16 +1,15 @@ -import { TEST_COMMUNITY } from 'cypress/support/e2e'; import { testA11y } from 'cypress/support/utils'; describe('Community Page', () => { it('should pass accessibility tests', () => { - cy.visit('/communities/'.concat(TEST_COMMUNITY)); + cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY'))); // tag must be loaded cy.get('ds-community-page').should('be.visible'); // TODO accessibility tests are failing because the UI has been changed // Analyze for accessibility issues - // testA11y('ds-community-page',); + // testA11y('ds-community-page'); }); }); diff --git a/cypress/e2e/community-statistics.cy.ts b/cypress/e2e/community-statistics.cy.ts index 5d4000ad052..7cd7c6fc3c3 100644 --- a/cypress/e2e/community-statistics.cy.ts +++ b/cypress/e2e/community-statistics.cy.ts @@ -1,13 +1,13 @@ -import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_COMMUNITY } from 'cypress/support/e2e'; +import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e'; import { testA11y } from 'cypress/support/utils'; describe('Community Statistics Page', () => { - const COMMUNITYSTATISTICSPAGE = '/statistics/communities/'.concat(TEST_COMMUNITY); + const COMMUNITYSTATISTICSPAGE = '/statistics/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')); // NOTE: Statistics option was removed from the navbar // it('should load if you click on "Statistics" from a Community page', () => { - // cy.visit('/communities/'.concat(TEST_COMMUNITY)); - // cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click(); + // cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY'))); + // cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click(); // cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE); // }); @@ -19,7 +19,7 @@ describe('Community Statistics Page', () => { it('should contain a "Total visits per month" section', () => { cy.visit(COMMUNITYSTATISTICSPAGE); // Check just for existence because this table is empty in CI environment as it's historical data - cy.get('.'.concat(TEST_COMMUNITY).concat('_TotalVisitsPerMonth')).should('exist'); + cy.get('.'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')).concat('_TotalVisitsPerMonth')).should('exist'); }); it('should pass accessibility tests', () => { diff --git a/cypress/e2e/create-eperson.cy.ts b/cypress/e2e/create-eperson.cy.ts new file mode 100644 index 00000000000..d23986ba29d --- /dev/null +++ b/cypress/e2e/create-eperson.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Create Eperson', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/access-control/epeople/create'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Form must first be visible + cy.get('ds-eperson-form').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-eperson-form'); + }); +}); diff --git a/cypress/e2e/create-group.cy.ts b/cypress/e2e/create-group.cy.ts new file mode 100644 index 00000000000..135c041a8d5 --- /dev/null +++ b/cypress/e2e/create-group.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Create Group', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/access-control/groups/create'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Form must first be visible + cy.get('ds-group-form').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-group-form'); + }); +}); diff --git a/cypress/e2e/edit-eperson.cy.ts b/cypress/e2e/edit-eperson.cy.ts new file mode 100644 index 00000000000..166c913b8c8 --- /dev/null +++ b/cypress/e2e/edit-eperson.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Edit Eperson', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/access-control/epeople/'.concat(Cypress.env('DSPACE_TEST_ADMIN_USER_UUID')).concat('/edit')); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Form must first be visible + cy.get('ds-eperson-form').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-eperson-form'); + }); +}); diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts new file mode 100644 index 00000000000..e43ede978ad --- /dev/null +++ b/cypress/e2e/edit-group.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Edit Group', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit')); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Form must first be visible + cy.get('ds-group-form').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-group-form'); + }); +}); diff --git a/cypress/e2e/end-user-agreement.cy.ts b/cypress/e2e/end-user-agreement.cy.ts new file mode 100644 index 00000000000..989d21ce60f --- /dev/null +++ b/cypress/e2e/end-user-agreement.cy.ts @@ -0,0 +1,13 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('End User Agreement', () => { + it('should pass accessibility tests', () => { + cy.visit('/info/end-user-agreement'); + + // Page must first be visible + cy.get('ds-end-user-agreement').should('be.visible'); + + // Analyze for accessibility + testA11y('ds-end-user-agreement'); + }); +}); diff --git a/cypress/e2e/epeople-registry.cy.ts b/cypress/e2e/epeople-registry.cy.ts new file mode 100644 index 00000000000..a6192f13d95 --- /dev/null +++ b/cypress/e2e/epeople-registry.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Epeople registry', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/access-control/epeople'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Epeople registry page must first be visible + cy.get('ds-epeople-registry').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-epeople-registry'); + }); +}); diff --git a/cypress/e2e/feedback.cy.ts b/cypress/e2e/feedback.cy.ts new file mode 100644 index 00000000000..75fe1097c63 --- /dev/null +++ b/cypress/e2e/feedback.cy.ts @@ -0,0 +1,13 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Feedback', () => { + it('should pass accessibility tests', () => { + cy.visit('/info/feedback'); + + // Page must first be visible + cy.get('ds-feedback').should('be.visible'); + + // Analyze for accessibility + testA11y('ds-feedback'); + }); +}); diff --git a/cypress/e2e/groups-registry.cy.ts b/cypress/e2e/groups-registry.cy.ts new file mode 100644 index 00000000000..5c0099c2f1f --- /dev/null +++ b/cypress/e2e/groups-registry.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Groups registry', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/access-control/groups'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Epeople registry page must first be visible + cy.get('ds-groups-registry').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-groups-registry'); + }); +}); diff --git a/cypress/e2e/header.cy.ts b/cypress/e2e/header.cy.ts index f2437a687a9..f8440b274be 100644 --- a/cypress/e2e/header.cy.ts +++ b/cypress/e2e/header.cy.ts @@ -7,14 +7,9 @@ describe('Header', () => { // Header must first be visible cy.get('ds-header').should('be.visible'); - // TODO accessibility tests are failing because the UI has been changed + // TODO accessibility tests are failing because the UI has been changed // Analyze for accessibility - // testA11y({ - // include: ['ds-header'], - // exclude: [ - // ['#search-navbar-container'], // search in navbar has duplicative ID. Will be fixed in #1174 - // ['.dropdownLogin'] // "Log in" link has color contrast issues. Will be fixed in #1149 - // ], - // }); + // testA11y('ds-header'); }); + }); diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts new file mode 100644 index 00000000000..c702fa72d79 --- /dev/null +++ b/cypress/e2e/health-page.cy.ts @@ -0,0 +1,62 @@ +import { testA11y } from 'cypress/support/utils'; +import { Options } from 'cypress-axe'; + + +beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/health'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); +}); + +describe('Health Page > Status Tab', () => { + it('should pass accessibility tests', () => { + cy.intercept('GET', '/server/actuator/health').as('status'); + cy.wait('@status'); + + cy.get('a[data-test="health-page.status-tab"]').click(); + // Page must first be visible + cy.get('ds-health-page').should('be.visible'); + cy.get('ds-health-panel').should('be.visible'); + + // wait for all the ds-health-info-component components to be rendered + cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => { + cy.wrap($panel).find('ds-health-component').should('be.visible'); + }); + // Analyze for accessibility issues + testA11y('ds-health-page', { + rules: { + // All panels are accordians & fail "aria-required-children" and "nested-interactive". + // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216 + 'aria-required-children': { enabled: false }, + 'nested-interactive': { enabled: false }, + }, + } as Options); + }); +}); + +describe('Health Page > Info Tab', () => { + it('should pass accessibility tests', () => { + cy.intercept('GET', '/server/actuator/info').as('info'); + cy.wait('@info'); + + cy.get('a[data-test="health-page.info-tab"]').click(); + // Page must first be visible + cy.get('ds-health-page').should('be.visible'); + cy.get('ds-health-info').should('be.visible'); + + // wait for all the ds-health-info-component components to be rendered + cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => { + cy.wrap($panel).find('ds-health-info-component').should('be.visible'); + }); + + // Analyze for accessibility issues + testA11y('ds-health-info', { + rules: { + // All panels are accordions & fail "aria-required-children" and "nested-interactive". + // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216 + 'aria-required-children': { enabled: false }, + 'nested-interactive': { enabled: false }, + }, + } as Options); + }); +}); diff --git a/cypress/e2e/homepage-statistics.cy.ts b/cypress/e2e/homepage-statistics.cy.ts index 3c10c42ae2b..86c2805557e 100644 --- a/cypress/e2e/homepage-statistics.cy.ts +++ b/cypress/e2e/homepage-statistics.cy.ts @@ -1,4 +1,4 @@ -import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e'; +import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e'; import { testA11y } from 'cypress/support/utils'; import '../support/commands'; @@ -7,15 +7,14 @@ describe('Site Statistics Page', () => { // NOTE: statistics were removed from the navbar // it('should load if you click on "Statistics" from homepage', () => { // cy.visit('/'); - // cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click(); + // cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click(); // cy.location('pathname').should('eq', '/statistics'); // }); - // CLARIN it('should pass accessibility tests', () => { // generate 2 view events on an Item's page - cy.generateViewEvent(TEST_ENTITY_PUBLICATION, 'item'); - cy.generateViewEvent(TEST_ENTITY_PUBLICATION, 'item'); + cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item'); + cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item'); cy.visit('/statistics'); diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts new file mode 100644 index 00000000000..ad5d8ea0930 --- /dev/null +++ b/cypress/e2e/item-edit.cy.ts @@ -0,0 +1,180 @@ +import { testA11y } from 'cypress/support/utils'; +import { Options } from 'cypress-axe'; + +const ITEM_EDIT_PAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('/edit'); + +beforeEach(() => { + // All tests start with visiting the Edit Item Page + cy.visit(ITEM_EDIT_PAGE); + + // This page is restricted, so we will be shown the login form. Fill it out & submit. + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); +}); + +describe('Edit Item > Edit Metadata tab', () => { + it('should pass accessibility tests', () => { + cy.get('a[data-test="metadata"]').should('be.visible'); + cy.get('a[data-test="metadata"]').click(); + + // Our selected tab should be both visible & active + cy.get('a[data-test="metadata"]').should('be.visible'); + cy.get('a[data-test="metadata"]').should('have.class', 'active'); + + // tag must be loaded + cy.get('ds-edit-item-page').should('be.visible'); + + // wait for all the ds-dso-edit-metadata-value components to be rendered + cy.get('ds-dso-edit-metadata-value div[role="row"]').each(($row: HTMLDivElement) => { + cy.wrap($row).find('div[role="cell"]').should('be.visible'); + }); + + // Analyze for accessibility issues + testA11y('ds-edit-item-page'); + }); +}); + +describe('Edit Item > Status tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="status"]').should('be.visible'); + cy.get('a[data-test="status"]').click(); + + // Our selected tab should be both visible & active + cy.get('a[data-test="status"]').should('be.visible'); + cy.get('a[data-test="status"]').should('have.class', 'active'); + + // tag must be loaded + cy.get('ds-item-status').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-item-status'); + }); +}); + +describe('Edit Item > Bitstreams tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="bitstreams"]').should('be.visible'); + cy.get('a[data-test="bitstreams"]').click(); + + // Our selected tab should be both visible & active + cy.get('a[data-test="bitstreams"]').should('be.visible'); + cy.get('a[data-test="bitstreams"]').should('have.class', 'active'); + + // tag must be loaded + cy.get('ds-item-bitstreams').should('be.visible'); + + // Table of item bitstreams must also be loaded + cy.get('div.item-bitstreams').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-item-bitstreams', + { + rules: { + // Currently Bitstreams page loads a pagination component per Bundle + // and they all use the same 'id="p-dad"'. + 'duplicate-id': { enabled: false }, + }, + } as Options, + ); + }); +}); + +describe('Edit Item > Curate tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="curate"]').should('be.visible'); + cy.get('a[data-test="curate"]').click(); + + // Our selected tab should be both visible & active + cy.get('a[data-test="curate"]').should('be.visible'); + cy.get('a[data-test="curate"]').should('have.class', 'active'); + + // tag must be loaded + cy.get('ds-item-curate').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-item-curate'); + }); +}); + +describe('Edit Item > Relationships tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="relationships"]').should('be.visible'); + cy.get('a[data-test="relationships"]').click(); + + // Our selected tab should be both visible & active + cy.get('a[data-test="relationships"]').should('be.visible'); + cy.get('a[data-test="relationships"]').should('have.class', 'active'); + + // tag must be loaded + cy.get('ds-item-relationships').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-item-relationships'); + }); +}); + +describe('Edit Item > Version History tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="versionhistory"]').should('be.visible'); + cy.get('a[data-test="versionhistory"]').click(); + + // Our selected tab should be both visible & active + cy.get('a[data-test="versionhistory"]').should('be.visible'); + cy.get('a[data-test="versionhistory"]').should('have.class', 'active'); + + // tag must be loaded + cy.get('ds-item-version-history').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-item-version-history'); + }); +}); + +describe('Edit Item > Access Control tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="access-control"]').should('be.visible'); + cy.get('a[data-test="access-control"]').click(); + + // Our selected tab should be both visible & active + cy.get('a[data-test="access-control"]').should('be.visible'); + cy.get('a[data-test="access-control"]').should('have.class', 'active'); + + // tag must be loaded + cy.get('ds-item-access-control').should('be.visible'); + + // Analyze for accessibility issues + testA11y('ds-item-access-control'); + }); +}); + +describe('Edit Item > Collection Mapper tab', () => { + + it('should pass accessibility tests', () => { + cy.get('a[data-test="mapper"]').should('be.visible'); + cy.get('a[data-test="mapper"]').click(); + + // Our selected tab should be both visible & active + cy.get('a[data-test="mapper"]').should('be.visible'); + cy.get('a[data-test="mapper"]').should('have.class', 'active'); + + // tag must be loaded + cy.get('ds-item-collection-mapper').should('be.visible'); + + // Analyze entire page for accessibility issues + testA11y('ds-item-collection-mapper'); + + // Click on the "Map new collections" tab + cy.get('li[data-test="mapTab"] a').click(); + + // Make sure search form is now visible + cy.get('ds-search-form').should('be.visible'); + + // Analyze entire page (again) for accessibility issues + testA11y('ds-item-collection-mapper'); + }); +}); diff --git a/cypress/e2e/item-page.cy.ts b/cypress/e2e/item-page.cy.ts index dae06289983..0c434e85237 100644 --- a/cypress/e2e/item-page.cy.ts +++ b/cypress/e2e/item-page.cy.ts @@ -1,37 +1,47 @@ -import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e'; import { testA11y } from 'cypress/support/utils'; describe('Item Page', () => { - const ITEMPAGE = '/items/'.concat(TEST_ENTITY_PUBLICATION); - const ENTITYPAGE = '/entities/publication/'.concat(TEST_ENTITY_PUBLICATION); + const ITEMPAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')); + const ENTITYPAGE = '/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')); // Test that entities will redirect to /entities/[type]/[uuid] when accessed via /items/[uuid] it('should redirect to the entity page when navigating to an item page', () => { cy.visit(ITEMPAGE); + cy.wait(1000); cy.location('pathname').should('eq', ENTITYPAGE); }); - // CLARIN - // NOTE: accessibility tests are failing because the UI has been changed - // it('should pass accessibility tests', () => { - // cy.visit(ENTITYPAGE); - // - // // tag must be loaded - // cy.get('ds-item-page').should('be.visible'); - // - // // Analyze for accessibility issues - // testA11y('ds-item-page'); - // }); - + // CLARIN + // NOTE: accessibility tests are failing because the UI has been changed + // it('should pass accessibility tests', () => { + // cy.intercept('POST', '/server/api/statistics/viewevents').as('viewevent'); + // + // cy.visit(ENTITYPAGE); + // + // // Wait for the "viewevent" to trigger on the Item page. + // // This ensures our tag is fully loaded, as the tag is contained within it. + // cy.wait('@viewevent'); + // + // // tag must be loaded + // cy.get('ds-item-page').should('be.visible'); + // + // // Analyze for accessibility issues + // testA11y('ds-item-page'); + // }); // it('should pass accessibility tests on full item page', () => { + // cy.intercept('POST', '/server/api/statistics/viewevents').as('viewevent'); + // // cy.visit(ENTITYPAGE + '/full'); // + // // Wait for the "viewevent" to trigger on the Item page. + // // This ensures our tag is fully loaded, as the tag is contained within it. + // cy.wait('@viewevent'); + // // // tag must be loaded // cy.get('ds-full-item-page').should('be.visible'); // // // Analyze for accessibility issues // testA11y('ds-full-item-page'); // }); - // CLARIN }); diff --git a/cypress/e2e/item-statistics.cy.ts b/cypress/e2e/item-statistics.cy.ts index c8bc0c0d4ee..2537416d33f 100644 --- a/cypress/e2e/item-statistics.cy.ts +++ b/cypress/e2e/item-statistics.cy.ts @@ -1,15 +1,15 @@ -import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e'; +import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e'; import { testA11y } from 'cypress/support/utils'; describe('Item Statistics Page', () => { - const ITEMSTATISTICSPAGE = '/statistics/items/'.concat(TEST_ENTITY_PUBLICATION); + const ITEMSTATISTICSPAGE = '/statistics/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')); - // NOTE add statistics to the navbar and change this test - // it('should load if you click on "Statistics" from an Item/Entity page', () => { - // cy.visit('/entities/publication/'.concat(TEST_ENTITY_PUBLICATION)); - // cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click(); - // cy.location('pathname').should('eq', ITEMSTATISTICSPAGE); - // }); + // NOTE add statistics to the navbar and change this test + // it('should load if you click on "Statistics" from an Item/Entity page', () => { + // cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'))); + // cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click(); + // cy.location('pathname').should('eq', ITEMSTATISTICSPAGE); + // }); it('should contain element ds-item-statistics-page when navigating to an item statistics page', () => { cy.visit(ITEMSTATISTICSPAGE); @@ -24,8 +24,7 @@ describe('Item Statistics Page', () => { it('should contain a "Total visits per month" section', () => { cy.visit(ITEMSTATISTICSPAGE); - // Check just for existence because this table is empty in CI environment as it's historical data - cy.get('.'.concat(TEST_ENTITY_PUBLICATION).concat('_TotalVisitsPerMonth')).should('exist'); + cy.get('table[data-test="TotalVisitsPerMonth"]').should('be.visible'); }); it('should pass accessibility tests', () => { diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts index e86aa6843ed..c7ba2d8197c 100644 --- a/cypress/e2e/login-modal.cy.ts +++ b/cypress/e2e/login-modal.cy.ts @@ -1,44 +1,42 @@ -import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e'; import { testA11y } from 'cypress/support/utils'; const page = { - openLoginMenu() { - // Click the "Log In" dropdown menu in header - cy.get('ds-themed-navbar [data-test="login-menu"]').click(); - }, - openUserMenu() { - // Once logged in, click the User menu in header - cy.get('ds-themed-navbar [data-test="user-menu"]').click(); - }, - submitLoginAndPasswordByPressingButton(email, password) { - // Enter email - cy.get('ds-themed-navbar [data-test="email"]').type(email); - // Enter password - cy.get('ds-themed-navbar [data-test="password"]').type(password); - // Click login button - cy.get('ds-themed-navbar [data-test="login-button"]').click(); - }, - submitLoginAndPasswordByPressingEnter(email, password) { - // In opened Login modal, fill out email & password, then click Enter - cy.get('ds-themed-navbar [data-test="email"]').type(email); - cy.get('ds-themed-navbar [data-test="password"]').type(password); - cy.get('ds-themed-navbar [data-test="password"]').type('{enter}'); - }, - submitLogoutByPressingButton() { - // This is the POST command that will actually log us out - cy.intercept('POST', '/server/api/authn/logout').as('logout'); - // Click logout button - cy.get('ds-themed-navbar [data-test="logout-button"]').click(); - // Wait until above POST command responds before continuing - // (This ensures next action waits until logout completes) - cy.wait('@logout'); - } + openLoginMenu() { + // Click the "Log In" dropdown menu in header + cy.get('[data-test="login-menu"]').click(); + }, + openUserMenu() { + // Once logged in, click the User menu in header + cy.get('[data-test="user-menu"]').click(); + }, + submitLoginAndPasswordByPressingButton(email, password) { + // Enter email + cy.get('[data-test="email"]').type(email); + // Enter password + cy.get('[data-test="password"]').type(password); + // Click login button + cy.get('[data-test="login-button"]').click(); + }, + submitLoginAndPasswordByPressingEnter(email, password) { + // In opened Login modal, fill out email & password, then click Enter + cy.get('[data-test="email"]').type(email); + cy.get('[data-test="password"]').type(password); + cy.get('[data-test="password"]').type('{enter}'); + }, + submitLogoutByPressingButton() { + // This is the POST command that will actually log us out + cy.intercept('POST', '/server/api/authn/logout').as('logout'); + // Click logout button + cy.get('[data-test="logout-button"]').click(); + // Wait until above POST command responds before continuing + // (This ensures next action waits until logout completes) + cy.wait('@logout'); + }, }; - // CLARIN - CLARIN-DSpace7.x has different login // describe('Login Modal', () => { // it('should login when clicking button & stay on same page', () => { -// const ENTITYPAGE = '/entities/publication/'.concat(TEST_ENTITY_PUBLICATION); +// const ENTITYPAGE = '/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')); // cy.visit(ENTITYPAGE); // // // Login menu should exist @@ -48,7 +46,7 @@ const page = { // page.openLoginMenu(); // cy.get('.form-login').should('be.visible'); // -// page.submitLoginAndPasswordByPressingButton(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD); +// page.submitLoginAndPasswordByPressingButton(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); // cy.get('ds-log-in').should('not.exist'); // // // Verify we are still on the same page @@ -68,8 +66,8 @@ const page = { // cy.get('.form-login').should('be.visible'); // // // Login, and the tag should no longer exist -// page.submitLoginAndPasswordByPressingEnter(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD); -// cy.get('.form-login').should('not.exist'); +// page.submitLoginAndPasswordByPressingEnter(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); +// cy.get('ds-log-in').should('not.exist'); // // // Verify we are still on homepage // cy.url().should('include', '/home'); @@ -82,7 +80,7 @@ const page = { // // it('should support logout', () => { // // First authenticate & access homepage -// cy.login(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD); +// cy.login(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); // cy.visit('/'); // // // Verify ds-log-in tag doesn't exist, but ds-log-out tag does exist @@ -104,12 +102,15 @@ const page = { // page.openLoginMenu(); // // // Registration link should be visible -// cy.get('ds-themed-navbar [data-test="register"]').should('be.visible'); +// cy.get('ds-themed-header [data-test="register"]').should('be.visible'); // // // Click registration link & you should go to registration page -// cy.get('ds-themed-navbar [data-test="register"]').click(); +// cy.get('ds-themed-header [data-test="register"]').click(); // cy.location('pathname').should('eq', '/register'); // cy.get('ds-register-email').should('exist'); +// +// // Test accessibility of this page +// testA11y('ds-register-email'); // }); // // it('should allow forgot password', () => { @@ -118,22 +119,32 @@ const page = { // page.openLoginMenu(); // // // Forgot password link should be visible -// cy.get('ds-themed-navbar [data-test="forgot"]').should('be.visible'); +// cy.get('ds-themed-header [data-test="forgot"]').should('be.visible'); // // // Click link & you should go to Forgot Password page -// cy.get('ds-themed-navbar [data-test="forgot"]').click(); +// cy.get('ds-themed-header [data-test="forgot"]').click(); // cy.location('pathname').should('eq', '/forgot'); // cy.get('ds-forgot-email').should('exist'); +// +// // Test accessibility of this page +// testA11y('ds-forgot-email'); // }); // -// it('should pass accessibility tests', () => { +// it('should pass accessibility tests in menus', () => { // cy.visit('/'); // +// // Open login menu & verify accessibility // page.openLoginMenu(); -// // cy.get('ds-log-in').should('exist'); -// -// // Analyze for accessibility issues // testA11y('ds-log-in'); +// +// // Now login +// page.submitLoginAndPasswordByPressingButton(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); +// cy.get('ds-log-in').should('not.exist'); +// +// // Open user menu, verify user menu accesibility +// page.openUserMenu(); +// cy.get('ds-user-menu').should('be.visible'); +// testA11y('ds-user-menu'); // }); // }); diff --git a/cypress/e2e/metadata-import-page.cy.ts b/cypress/e2e/metadata-import-page.cy.ts new file mode 100644 index 00000000000..a31c18e4ebb --- /dev/null +++ b/cypress/e2e/metadata-import-page.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Metadata Import Page', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/admin/metadata-import'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Metadata import form must first be visible + cy.get('ds-metadata-import-page').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-metadata-import-page'); + }); +}); diff --git a/cypress/e2e/metadata-registry.cy.ts b/cypress/e2e/metadata-registry.cy.ts new file mode 100644 index 00000000000..0402d33153e --- /dev/null +++ b/cypress/e2e/metadata-registry.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Metadata Registry', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/admin/registries/metadata'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Page must first be visible + cy.get('ds-metadata-registry').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-metadata-registry'); + }); +}); diff --git a/cypress/e2e/metadata-schema.cy.ts b/cypress/e2e/metadata-schema.cy.ts new file mode 100644 index 00000000000..9ff0db0714b --- /dev/null +++ b/cypress/e2e/metadata-schema.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Metadata Schema', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/admin/registries/metadata/dc'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Page must first be visible + cy.get('ds-metadata-schema').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-metadata-schema'); + }); +}); diff --git a/cypress/e2e/my-dspace.cy.ts b/cypress/e2e/my-dspace.cy.ts index 7ee733839eb..f43ed7dcff4 100644 --- a/cypress/e2e/my-dspace.cy.ts +++ b/cypress/e2e/my-dspace.cy.ts @@ -1,5 +1,3 @@ -import { Options } from 'cypress-axe'; -import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME } from 'cypress/support/e2e'; import { testA11y } from 'cypress/support/utils'; describe('My DSpace page', () => { @@ -7,7 +5,7 @@ describe('My DSpace page', () => { cy.visit('/mydspace'); // This page is restricted, so we will be shown the login form. Fill it out & submit. - cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD); + cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD')); cy.get('ds-my-dspace-page').should('be.visible'); @@ -32,7 +30,7 @@ describe('My DSpace page', () => { cy.visit('/mydspace'); // This page is restricted, so we will be shown the login form. Fill it out & submit. - cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD); + cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD')); cy.get('ds-my-dspace-page').should('be.visible'); @@ -45,19 +43,8 @@ describe('My DSpace page', () => { // CLARIN-search component show only Items, so there are no records in the /mydspace page // cy.get('ds-object-detail').should('be.visible'); - // Analyze for accessibility issues - // CLARIN - // Commented out accessibility violations - // testA11y('ds-my-dspace-page', - // { - // rules: { - // // Search filters fail these two "moderate" impact rules - // 'heading-order': { enabled: false }, - // 'landmark-unique': { enabled: false } - // } - // } as Options - // ); - // CLARIN + // Analyze for accessibility issues + // testA11y('ds-my-dspace-page'); }); // NOTE: Deleting existing submissions is exercised by submission.spec.ts @@ -65,7 +52,7 @@ describe('My DSpace page', () => { cy.visit('/mydspace'); // This page is restricted, so we will be shown the login form. Fill it out & submit. - cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD); + cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD')); // Open the New Submission dropdown cy.get('button[data-test="submission-dropdown"]').click(); @@ -76,10 +63,10 @@ describe('My DSpace page', () => { cy.get('ds-create-item-parent-selector').should('be.visible'); // Type in a known Collection name in the search box - cy.get('ds-authorized-collection-selector input[type="search"]').type(TEST_SUBMIT_COLLECTION_NAME); + cy.get('ds-authorized-collection-selector input[type="search"]').type(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME')); // Click on the button matching that known Collection name - cy.get('ds-authorized-collection-selector button[title="'.concat(TEST_SUBMIT_COLLECTION_NAME).concat('"]')).click(); + cy.get('ds-authorized-collection-selector button[title="'.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME')).concat('"]')).click(); // New URL should include /workspaceitems, as we've started a new submission cy.url().should('include', '/workspaceitems'); @@ -88,7 +75,7 @@ describe('My DSpace page', () => { cy.get('ds-submission-edit').should('be.visible'); // A Collection menu button should exist & its value should be the selected collection - cy.get('#collectionControlsMenuButton span').should('have.text', TEST_SUBMIT_COLLECTION_NAME); + cy.get('#collectionControlsMenuButton span').should('have.text', Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME')); // Now that we've created a submission, we'll test that we can go back and Edit it. // Get our Submission URL, to parse out the ID of this new submission @@ -140,7 +127,7 @@ describe('My DSpace page', () => { cy.visit('/mydspace'); // This page is restricted, so we will be shown the login form. Fill it out & submit. - cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD); + cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD')); // Open the New Import dropdown cy.get('button[data-test="import-dropdown"]').click(); @@ -152,6 +139,9 @@ describe('My DSpace page', () => { // The external import searchbox should be visible cy.get('ds-submission-import-external-searchbar').should('be.visible'); + + // Test for accessibility issues + testA11y('ds-submission-import-external'); }); }); diff --git a/cypress/e2e/new-process.cy.ts b/cypress/e2e/new-process.cy.ts new file mode 100644 index 00000000000..d26da7cc4df --- /dev/null +++ b/cypress/e2e/new-process.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('New Process', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/processes/new'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Process form must first be visible + cy.get('ds-new-process').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-new-process'); + }); +}); diff --git a/cypress/e2e/privacy.cy.ts b/cypress/e2e/privacy.cy.ts new file mode 100644 index 00000000000..16e049f701e --- /dev/null +++ b/cypress/e2e/privacy.cy.ts @@ -0,0 +1,13 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Privacy', () => { + it('should pass accessibility tests', () => { + cy.visit('/info/privacy'); + + // Page must first be visible + cy.get('ds-privacy').should('be.visible'); + + // Analyze for accessibility + testA11y('ds-privacy'); + }); +}); diff --git a/cypress/e2e/processes-overview.cy.ts b/cypress/e2e/processes-overview.cy.ts new file mode 100644 index 00000000000..2be3bd4c181 --- /dev/null +++ b/cypress/e2e/processes-overview.cy.ts @@ -0,0 +1,17 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Processes Overview', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/processes'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + + // Process overview must first be visible + cy.get('ds-process-overview').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-process-overview'); + }); +}); diff --git a/cypress/e2e/profile-page.cy.ts b/cypress/e2e/profile-page.cy.ts new file mode 100644 index 00000000000..911ef33ba58 --- /dev/null +++ b/cypress/e2e/profile-page.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Profile page', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/profile'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Process form must first be visible + cy.get('ds-profile-page').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-profile-page'); + }); +}); diff --git a/cypress/e2e/search-navbar.cy.ts b/cypress/e2e/search-navbar.cy.ts index 2f252b93a8a..c06c3fd4f3b 100644 --- a/cypress/e2e/search-navbar.cy.ts +++ b/cypress/e2e/search-navbar.cy.ts @@ -1,17 +1,15 @@ -import { TEST_SEARCH_TERM } from 'cypress/support/e2e'; - const page = { fillOutQueryInNavBar(query) { // Click the magnifying glass - cy.get('ds-themed-navbar [data-test="header-search-icon"]').click(); + cy.get('ds-themed-header [data-test="header-search-icon"]').click(); // Fill out a query in input that appears - cy.get('ds-themed-navbar [data-test="header-search-box"]').type(query); + cy.get('ds-themed-header [data-test="header-search-box"]').type(query); }, submitQueryByPressingEnter() { - cy.get('ds-themed-navbar [data-test="header-search-box"]').type('{enter}'); + cy.get('ds-themed-header [data-test="header-search-box"]').type('{enter}'); }, submitQueryByPressingIcon() { - cy.get('ds-themed-navbar [data-test="header-search-icon"]').click(); + cy.get('ds-themed-header [data-test="header-search-icon"]').click(); } }; @@ -19,7 +17,7 @@ const page = { // NOTE: search was removed from the navbar - these tests are not actual // describe('Search from Navigation Bar', () => { // // NOTE: these tests currently assume this query will return results! -// const query = TEST_SEARCH_TERM; +// const query = Cypress.env('DSPACE_TEST_SEARCH_TERM'); // // it('should go to search page with correct query if submitted (from home)', () => { // cy.visit('/'); diff --git a/cypress/e2e/search-page.cy.ts b/cypress/e2e/search-page.cy.ts index 83b25fdbce2..dcefe96e832 100644 --- a/cypress/e2e/search-page.cy.ts +++ b/cypress/e2e/search-page.cy.ts @@ -1,8 +1,10 @@ import { Options } from 'cypress-axe'; -import { TEST_SEARCH_TERM } from 'cypress/support/e2e'; import { testA11y } from 'cypress/support/utils'; describe('Search Page', () => { + // NOTE: these tests currently assume this query will return results! + const query = Cypress.env('DSPACE_TEST_SEARCH_TERM'); + it('should redirect to the correct url when query was set and submit button was triggered', () => { const queryString = 'Another interesting query string'; cy.visit('/search'); @@ -12,47 +14,46 @@ describe('Search Page', () => { cy.url().should('include', 'query=' + encodeURI(queryString)); }); - // CLARIN - // NOTE: accessibility tests are failing because the UI has been changed - // it('should load results and pass accessibility tests', () => { - // cy.visit('/search?query='.concat(TEST_SEARCH_TERM)); - // cy.get('[data-test="search-box"]').should('have.value', TEST_SEARCH_TERM); - // - // // tag must be loaded - // cy.get('ds-search-page').should('be.visible'); - // - // // At least one search result should be displayed - // cy.get('[data-test="list-object"]').should('be.visible'); - // - // // Click each filter toggle to open *every* filter - // // (As we want to scan filter section for accessibility issues as well) - // cy.get('[data-test="filter-toggle"]').click({ multiple: true }); - // - // // Analyze for accessibility issues - // testA11y('ds-search-page'); - // }); - // - // it('should have a working grid view that passes accessibility tests', () => { - // cy.visit('/search?query='.concat(TEST_SEARCH_TERM)); - // - // // Click button in sidebar to display grid view - // cy.get('ds-search-sidebar [data-test="grid-view"]').click(); - // - // // tag must be loaded - // cy.get('ds-search-page').should('be.visible'); - // - // // At least one grid object (card) should be displayed - // cy.get('[data-test="grid-object"]').should('be.visible'); - // - // // Analyze for accessibility issues - // testA11y('ds-search-page', - // { - // rules: { - // // Search filters fail these two "moderate" impact rules - // 'heading-order': { enabled: false }, - // 'landmark-unique': { enabled: false } - // } - // } as Options - // ); - // }); + // CLARIN + // NOTE: accessibility tests are failing because the UI has been changed + // it('should load results and pass accessibility tests', () => { + // cy.visit('/search?query='.concat(query)); + // cy.get('[data-test="search-box"]').should('have.value', query); + // + // // tag must be loaded + // cy.get('ds-search-page').should('be.visible'); + // + // // At least one search result should be displayed + // cy.get('[data-test="list-object"]').should('be.visible'); + // + // // Click each filter toggle to open *every* filter + // // (As we want to scan filter section for accessibility issues as well) + // cy.get('[data-test="filter-toggle"]').click({ multiple: true }); + // + // // Analyze for accessibility issues + // testA11y('ds-search-page'); + // }); + // + // it('should have a working grid view that passes accessibility tests', () => { + // cy.visit('/search?query='.concat(query)); + // + // // Click button in sidebar to display grid view + // cy.get('ds-search-sidebar [data-test="grid-view"]').click(); + // + // // tag must be loaded + // cy.get('ds-search-page').should('be.visible'); + // + // // At least one grid object (card) should be displayed + // cy.get('[data-test="grid-object"]').should('be.visible'); + // + // // Analyze for accessibility issues + // testA11y('ds-search-page', + // { + // rules: { + // // Card titles fail this test currently + // 'heading-order': { enabled: false } + // } + // } as Options + // ); + // }); }); diff --git a/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts index beee544e233..474d7c6cf2b 100644 --- a/cypress/e2e/submission.cy.ts +++ b/cypress/e2e/submission.cy.ts @@ -1,15 +1,15 @@ -import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID } from 'cypress/support/e2e'; +//import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID, TEST_ADMIN_USER, TEST_ADMIN_PASSWORD } from 'cypress/support/e2e'; import { createItemProcess } from '../support/commands'; describe('New Submission page', () => { - // NOTE: We already test that new submissions can be started from MyDSpace in my-dspace.spec.ts + // NOTE: We already test that new Item submissions can be started from MyDSpace in my-dspace.spec.ts it('should create a new submission when using /submit path & pass accessibility', () => { // Test that calling /submit with collection & entityType will create a new submission - cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none')); + cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none')); // This page is restricted, so we will be shown the login form. Fill it out & submit. - cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); // Should redirect to /workspaceitems, as we've started a new submission cy.url().should('include', '/workspaceitems'); @@ -18,7 +18,7 @@ describe('New Submission page', () => { cy.get('ds-submission-edit').should('be.visible'); // A Collection menu button should exist & it's value should be the selected collection - cy.get('#collectionControlsMenuButton span').should('have.text', TEST_SUBMIT_COLLECTION_NAME); + cy.get('#collectionControlsMenuButton span').should('have.text', Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME')); // 4 sections should be visible by default cy.get('div#section_traditionalpageone').should('be.visible'); @@ -26,6 +26,26 @@ describe('New Submission page', () => { cy.get('div#section_upload').should('be.visible'); cy.get('div#section_license').should('be.visible'); + // Test entire page for accessibility + // CLARIN-DSpace still has some accessibility issues, so we will not fail the test + // testA11y('ds-submission-edit', + // { + // rules: { + // // Author & Subject fields have invalid "aria-multiline" attrs. + // // See https://github.com/DSpace/dspace-angular/issues/1272 + // 'aria-allowed-attr': { enabled: false }, + // // All panels are accordians & fail "aria-required-children" and "nested-interactive". + // // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216 + // 'aria-required-children': { enabled: false }, + // 'nested-interactive': { enabled: false }, + // // All select boxes fail to have a name / aria-label. + // // This is a bug in ng-dynamic-forms and may require https://github.com/DSpace/dspace-angular/issues/2216 + // 'select-name': { enabled: false }, + // } + // + // } as Options + // ); + // Discard button should work // Clicking it will display a confirmation, which we will confirm with another click cy.get('button#discard').click(); @@ -34,10 +54,10 @@ describe('New Submission page', () => { it('should block submission & show errors if required fields are missing', () => { // Create a new submission - cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none')); + cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none')); // This page is restricted, so we will be shown the login form. Fill it out & submit. - cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); // Attempt an immediate deposit without filling out any fields cy.get('button#deposit').click(); @@ -95,10 +115,10 @@ describe('New Submission page', () => { it('should allow for deposit if all required fields completed & file uploaded', () => { // Create a new submission - cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none')); + cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none')); // This page is restricted, so we will be shown the login form. Fill it out & submit. - cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); // Fill out all required fields (Title, Date) cy.get('input#dc_title').type('DSpace logo uploaded via e2e tests'); @@ -126,7 +146,7 @@ describe('New Submission page', () => { // Upload our DSpace logo via drag & drop onto submission form // cy.get('div#section_upload') - cy.get('div.ds-document-drop-zone').selectFile('src/assets/images/dspace-logo.png', { + cy.get('div.ds-document-drop-zone').selectFile('src/assets/images/dspace-logo.svg', { action: 'drag-drop' }); diff --git a/cypress/e2e/system-wide-alert.cy.ts b/cypress/e2e/system-wide-alert.cy.ts new file mode 100644 index 00000000000..046bfe619fe --- /dev/null +++ b/cypress/e2e/system-wide-alert.cy.ts @@ -0,0 +1,16 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('System Wide Alert', () => { + beforeEach(() => { + // Must login as an Admin to see the page + cy.visit('/admin/system-wide-alert'); + cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD')); + }); + + it('should pass accessibility tests', () => { + // Page must first be visible + cy.get('ds-system-wide-alert-form').should('be.visible'); + // Analyze for accessibility issues + testA11y('ds-system-wide-alert-form'); + }); +}); diff --git a/cypress/plugins/index.ts b/cypress/plugins/index.ts index ead38afb921..cc3dccba38e 100644 --- a/cypress/plugins/index.ts +++ b/cypress/plugins/index.ts @@ -1,5 +1,11 @@ const fs = require('fs'); +// These two global variables are used to store information about the REST API used +// by these e2e tests. They are filled out prior to running any tests in the before() +// method of e2e.ts. They can then be accessed by any tests via the getters below. +let REST_BASE_URL: string; +let REST_DOMAIN: string; + // Plugins enable you to tap into, modify, or extend the internal behavior of Cypress // For more info, visit https://on.cypress.io/plugins-api module.exports = (on, config) => { @@ -30,6 +36,24 @@ module.exports = (on, config) => { } return null; + }, + // Save value of REST Base URL, looked up before all tests. + // This allows other tests to use it easily via getRestBaseURL() below. + saveRestBaseURL(url: string) { + return (REST_BASE_URL = url); + }, + // Retrieve currently saved value of REST Base URL + getRestBaseURL() { + return REST_BASE_URL ; + }, + // Save value of REST Domain, looked up before all tests. + // This allows other tests to use it easily via getRestBaseDomain() below. + saveRestBaseDomain(domain: string) { + return (REST_DOMAIN = domain); + }, + // Retrieve currently saved value of REST Domain + getRestBaseDomain() { + return REST_DOMAIN ; } }); }; diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index e7fbeecf151..5f9840fbaae 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -5,11 +5,7 @@ import { AuthTokenInfo, TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model'; import { DSPACE_XSRF_COOKIE, XSRF_REQUEST_HEADER } from 'src/app/core/xsrf/xsrf.constants'; - -// NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL -// from the Angular UI's config.json. See 'login()'. -export const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server'; -export const FALLBACK_TEST_REST_DOMAIN = 'localhost'; +import { v4 as uuidv4 } from 'uuid'; // Declare Cypress namespace to help with Intellisense & code completion in IDEs // ALL custom commands MUST be listed here for code completion to work @@ -41,6 +37,13 @@ declare global { * @param dsoType type of DSpace Object (e.g. "item", "collection", "community") */ generateViewEvent(uuid: string, dsoType: string): typeof generateViewEvent; + + /** + * Create a new CSRF token and add to required Cookie. CSRF Token is returned + * in chainable in order to allow it to be sent also in required CSRF header. + * @returns Chainable reference to allow CSRF token to also be sent in header. + */ + createCSRFCookie(): Chainable; } } } @@ -54,59 +57,32 @@ declare global { * @param password password to login as */ function login(email: string, password: string): void { - // Cypress doesn't have access to the running application in Node.js. - // So, it's not possible to inject or load the AppConfig or environment of the Angular UI. - // Instead, we'll read our running application's config.json, which contains the configs & - // is regenerated at runtime each time the Angular UI application starts up. - cy.task('readUIConfig').then((str: string) => { - // Parse config into a JSON object - const config = JSON.parse(str); + // Create a fake CSRF cookie/token to use in POST + cy.createCSRFCookie().then((csrfToken: string) => { + // get our REST API's base URL, also needed for POST + cy.task('getRestBaseURL').then((baseRestUrl: string) => { + // Now, send login POST request including that CSRF token + cy.request({ + method: 'POST', + url: baseRestUrl + '/api/authn/login', + headers: { [XSRF_REQUEST_HEADER]: csrfToken}, + form: true, // indicates the body should be form urlencoded + body: { user: email, password: password } + }).then((resp) => { + // We expect a successful login + expect(resp.status).to.eq(200); + // We expect to have a valid authorization header returned (with our auth token) + expect(resp.headers).to.have.property('authorization'); - // Find the URL of our REST API. Have a fallback ready, just in case 'rest.baseUrl' cannot be found. - let baseRestUrl = FALLBACK_TEST_REST_BASE_URL; - if (!config.rest.baseUrl) { - console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL); - } else { - //console.log("Found 'rest.baseUrl' in config.json. Using this REST API for login: ".concat(config.rest.baseUrl)); - baseRestUrl = config.rest.baseUrl; - } + // Initialize our AuthTokenInfo object from the authorization header. + const authheader = resp.headers.authorization as string; + const authinfo: AuthTokenInfo = new AuthTokenInfo(authheader); - // Now find domain of our REST API, again with a fallback. - let baseDomain = FALLBACK_TEST_REST_DOMAIN; - if (!config.rest.host) { - console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN); - } else { - baseDomain = config.rest.host; - } - - // Create a fake CSRF Token. Set it in the required server-side cookie - const csrfToken = 'fakeLoginCSRFToken'; - cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain }); - - // Now, send login POST request including that CSRF token - cy.request({ - method: 'POST', - url: baseRestUrl + '/api/authn/login', - headers: { [XSRF_REQUEST_HEADER]: csrfToken}, - form: true, // indicates the body should be form urlencoded - body: { user: email, password: password } - }).then((resp) => { - // We expect a successful login - expect(resp.status).to.eq(200); - // We expect to have a valid authorization header returned (with our auth token) - expect(resp.headers).to.have.property('authorization'); - - // Initialize our AuthTokenInfo object from the authorization header. - const authheader = resp.headers.authorization as string; - const authinfo: AuthTokenInfo = new AuthTokenInfo(authheader); - - // Save our AuthTokenInfo object to our dsAuthInfo UI cookie - // This ensures the UI will recognize we are logged in on next "visit()" - cy.setCookie(TOKENITEM, JSON.stringify(authinfo)); + // Save our AuthTokenInfo object to our dsAuthInfo UI cookie + // This ensures the UI will recognize we are logged in on next "visit()" + cy.setCookie(TOKENITEM, JSON.stringify(authinfo)); + }); }); - - // Remove cookie with fake CSRF token, as it's no longer needed - cy.clearCookie(DSPACE_XSRF_COOKIE); }); } // Add as a Cypress command (i.e. assign to 'cy.login') @@ -117,15 +93,22 @@ Cypress.Commands.add('login', login); * @param email email to login as * @param password password to login as */ -function loginViaForm(email: string, password: string): void { - cy.wait(500); - cy.get('.discojuice_close').should('exist').click(); - // Enter email - cy.get('ds-log-in [data-test="email"]').type(email); - // Enter password - cy.get('ds-log-in [data-test="password"]').type(password); - // Click login button - cy.get('ds-log-in [data-test="login-button"]').click(); +// Cypress custom command for form-based login with intercept and redirect assertion +function loginViaForm( + email: string, + password: string +): void { + // Optionally close the DiscoJuice popup if present + cy.wait(500); + cy.get('.discojuice_close').should('exist').click(); + + // Fill in credentials + cy.get('[data-test="email"]').should('be.visible').type(email); + cy.get('[data-test="password"]').type(password); + + // Submit the form + cy.get('[data-test="login-button"]').click(); + } // Add as a Cypress command (i.e. assign to 'cy.loginViaForm') Cypress.Commands.add('loginViaForm', loginViaForm); @@ -134,8 +117,8 @@ Cypress.Commands.add('loginViaForm', loginViaForm); Cypress.on('uncaught:exception', (err, runnable) => { // returning false here prevents Cypress from // failing the test - return false -}) + return false; +}); /** @@ -150,54 +133,28 @@ Cypress.on('uncaught:exception', (err, runnable) => { * @param dsoType type of DSpace Object (e.g. "item", "collection", "community") */ function generateViewEvent(uuid: string, dsoType: string): void { - // Cypress doesn't have access to the running application in Node.js. - // So, it's not possible to inject or load the AppConfig or environment of the Angular UI. - // Instead, we'll read our running application's config.json, which contains the configs & - // is regenerated at runtime each time the Angular UI application starts up. - cy.task('readUIConfig').then((str: string) => { - // Parse config into a JSON object - const config = JSON.parse(str); - - // Find the URL of our REST API. Have a fallback ready, just in case 'rest.baseUrl' cannot be found. - let baseRestUrl = FALLBACK_TEST_REST_BASE_URL; - if (!config.rest.baseUrl) { - console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL); - } else { - baseRestUrl = config.rest.baseUrl; - } - - // Now find domain of our REST API, again with a fallback. - let baseDomain = FALLBACK_TEST_REST_DOMAIN; - if (!config.rest.host) { - console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN); - } else { - baseDomain = config.rest.host; - } - - // Create a fake CSRF Token. Set it in the required server-side cookie - const csrfToken = 'fakeGenerateViewEventCSRFToken'; - cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain }); - - // Now, send 'statistics/viewevents' POST request including that fake CSRF token in required header - cy.request({ - method: 'POST', - url: baseRestUrl + '/api/statistics/viewevents', - headers: { - [XSRF_REQUEST_HEADER] : csrfToken, - // use a known public IP address to avoid being seen as a "bot" - 'X-Forwarded-For': '1.1.1.1', - // Use a user-agent of a Firefox browser on Windows. This again avoids being seen as a "bot" - 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/119.0', - }, - //form: true, // indicates the body should be form urlencoded - body: { targetId: uuid, targetType: dsoType }, - }).then((resp) => { - // We expect a 201 (which means statistics event was created) - expect(resp.status).to.eq(201); + // Create a fake CSRF cookie/token to use in POST + cy.createCSRFCookie().then((csrfToken: string) => { + // get our REST API's base URL, also needed for POST + cy.task('getRestBaseURL').then((baseRestUrl: string) => { + // Now, send 'statistics/viewevents' POST request including that fake CSRF token in required header + cy.request({ + method: 'POST', + url: baseRestUrl + '/api/statistics/viewevents', + headers: { + [XSRF_REQUEST_HEADER] : csrfToken, + // use a known public IP address to avoid being seen as a "bot" + 'X-Forwarded-For': '1.1.1.1', + // Use a user-agent of a Firefox browser on Windows. This again avoids being seen as a "bot" + 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/119.0', + }, + //form: true, // indicates the body should be form urlencoded + body: { targetId: uuid, targetType: dsoType }, + }).then((resp) => { + // We expect a 201 (which means statistics event was created) + expect(resp.status).to.eq(201); + }); }); - - // Remove cookie with fake CSRF token, as it's no longer needed - cy.clearCookie(DSPACE_XSRF_COOKIE); }); } // Add as a Cypress command (i.e. assign to 'cy.generateViewEvent') @@ -369,3 +326,26 @@ export const createItemProcess = { }; + +/** + * Can be used by tests to generate a random XSRF/CSRF token and save it to + * the required XSRF/CSRF cookie for usage when sending POST requests or similar. + * The generated CSRF token is returned in a Chainable to allow it to be also sent + * in the CSRF HTTP Header. + * @returns a Cypress Chainable which can be used to get the generated CSRF Token + */ +function createCSRFCookie(): Cypress.Chainable { + // Generate a new token which is a random UUID + const csrfToken: string = uuidv4(); + + // Save it to our required cookie + cy.task('getRestBaseDomain').then((baseDomain: string) => { + // Create a fake CSRF Token. Set it in the required server-side cookie + cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain }); + }); + + // return the generated token wrapped in a chainable + return cy.wrap(csrfToken); +} +// Add as a Cypress command (i.e. assign to 'cy.createCSRFCookie') +Cypress.Commands.add('createCSRFCookie', createCSRFCookie); diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts index b9c8afa0bbc..10e785e1845 100644 --- a/cypress/support/e2e.ts +++ b/cypress/support/e2e.ts @@ -19,30 +19,54 @@ import './commands'; // Import Cypress Axe tools for all tests // https://github.com/component-driven/cypress-axe import 'cypress-axe'; +import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants'; + + +// Runs once before all tests +before(() => { + // Cypress doesn't have access to the running application in Node.js. + // So, it's not possible to inject or load the AppConfig or environment of the Angular UI. + // Instead, we'll read our running application's config.json, which contains the configs & + // is regenerated at runtime each time the Angular UI application starts up. + cy.task('readUIConfig').then((str: string) => { + // Parse config into a JSON object + const config = JSON.parse(str); + + // Find URL of our REST API & save to global variable via task + let baseRestUrl = FALLBACK_TEST_REST_BASE_URL; + if (!config.rest.baseUrl) { + console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL); + } else { + baseRestUrl = config.rest.baseUrl; + } + cy.task('saveRestBaseURL', baseRestUrl); + + // Find domain of our REST API & save to global variable via task. + let baseDomain = FALLBACK_TEST_REST_DOMAIN; + if (!config.rest.host) { + console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN); + } else { + baseDomain = config.rest.host; + } + cy.task('saveRestBaseDomain', baseDomain); + + }); +}); // Runs once before the first test in each "block" beforeEach(() => { // Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie // This just ensures it doesn't get in the way of matching other objects in the page. cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}'); -}); - -// For better stability between tests, we visit "about:blank" (i.e. blank page) after each test. -// This ensures any remaining/outstanding XHR requests are killed, so they don't affect the next test. -// Borrowed from: https://glebbahmutov.com/blog/visit-blank-page-between-tests/ -/*afterEach(() => { - cy.window().then((win) => { - win.location.href = 'about:blank'; - }); -});*/ + // Remove any CSRF cookies saved from prior tests + cy.clearCookie(DSPACE_XSRF_COOKIE); +}); -// Global constants used in tests -// May be overridden in our cypress.json config file using specified environment variables. -// Default values listed here are all valid for the Demo Entities Data set available at -// https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data -// (This is the data set used in our CI environment) - +// NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL +// from the Angular UI's config.json. See 'before()' above. +const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server'; +const FALLBACK_TEST_REST_DOMAIN = 'localhost'; // Admin account used for administrative tests export const TEST_ADMIN_USER = Cypress.env('DSPACE_TEST_ADMIN_USER') || 'dspacedemo+admin@gmail.com'; export const TEST_ADMIN_PASSWORD = Cypress.env('DSPACE_TEST_ADMIN_PASSWORD') || 'dspace'; diff --git a/docker/cli.assetstore.yml b/docker/cli.assetstore.yml index ef5cf95caf6..c120243a337 100644 --- a/docker/cli.assetstore.yml +++ b/docker/cli.assetstore.yml @@ -18,8 +18,6 @@ networks: services: dspace-cli: - networks: - dspacenet: {} environment: # This assetstore zip is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data - LOADASSETS=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/assetstore.tar.gz @@ -34,5 +32,6 @@ services: tar xvfz /tmp/assetstore.tar.gz fi + /dspace/bin/dspace index-discovery -b /dspace/bin/dspace oai import /dspace/bin/dspace oai clean-cache diff --git a/docker/cli.yml b/docker/cli.yml index 9b2175491a9..6a3c95b090d 100644 --- a/docker/cli.yml +++ b/docker/cli.yml @@ -6,6 +6,19 @@ # http://www.dspace.org/license/ # +# +# This is a copy of the docker-compose-cli.yml that is available in the DSpace/DSpace +# (Backend) at: +# https://github.com/DSpace/DSpace/blob/main/docker-compose-cli.yml +# +# Therefore, it should be kept in sync with that file +networks: + # Default to using network named 'dspacenet' from docker-compose-rest.yml. + # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet") + # If COMPOSITE_PROJECT_NAME is missing, default value will be "docker" (name of folder this file is in) + default: + name: ${COMPOSE_PROJECT_NAME:-docker}_dspacenet + external: true services: dspace-cli: image: "${DOCKER_OWNER:-dataquest}/dspace-cli:${DSPACE_VER:-dspace-7_x}" @@ -45,14 +58,9 @@ services: - ./local.cfg:/dspace/config/local.cfg entrypoint: /dspace/bin/dspace command: help - networks: - - dspacenet tty: true stdin_open: true volumes: assetstore: dspace_cli_logs: - -networks: - dspacenet: diff --git a/docker/db.entities.yml b/docker/db.entities.yml index d927af04df7..cc5620423e2 100644 --- a/docker/db.entities.yml +++ b/docker/db.entities.yml @@ -14,7 +14,7 @@ # # Therefore, it should be kept in sync with that file services: dspacedb: - image: dspace/dspace-postgres-pgcrypto:loadsql + image: ${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}-loadsql environment: # This LOADSQL should be kept in sync with the URL in DSpace/DSpace # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml index 5e930b7ba51..b81366e6861 100644 --- a/docker/docker-compose-ci.yml +++ b/docker/docker-compose-ci.yml @@ -32,11 +32,12 @@ services: # Tell Statistics to commit all views immediately instead of waiting on Solr's autocommit. # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly. solr__D__statistics__P__autoCommit: 'false' + LOGGING_CONFIG: /dspace/config/log4j2-container.xml depends_on: - dspacedb image: ${DSPACE_CI_IMAGE:-dataquest/dspace:dspace-7_x-test} networks: - dspacenet: + - dspacenet ports: - published: 8080 target: 8080 @@ -44,8 +45,6 @@ services: tty: true volumes: - assetstore:/dspace/assetstore - # Mount DSpace's solr configs to a volume, so that we can share to 'dspacesolr' container (see below) - - solr_configs:/dspace/solr # Ensure that the database is ready BEFORE starting tomcat # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep # 2. Then, run database migration to init database tables (including any out-of-order ignored migrations, if any) @@ -62,18 +61,23 @@ services: # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data dspacedb: container_name: dspacedb + image: ${DSPACE_DB_IMAGE:-dspace/dspace-postgres-pgcrypto:loadsql} environment: # This LOADSQL should be kept in sync with the LOADSQL in # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data LOADSQL: https://github.com/dataquest-dev/DSpace/releases/download/data/dspace-test-database-dump_29.1.2024.sql PGDATA: /pgdata - image: ${DSPACE_DB_IMAGE:-dspace/dspace-postgres-pgcrypto:loadsql} + POSTGRES_PASSWORD: dspace networks: - dspacenet: + - dspacenet + ports: + - published: 5432 + target: 5432 stdin_open: true tty: true volumes: + # Keep Postgres data directory between reboots - pgdata:/pgdata # DSpace Solr container dspacesolr: @@ -83,7 +87,7 @@ services: depends_on: - dspace networks: - dspacenet: + - dspacenet ports: - published: 8983 target: 8983 @@ -91,9 +95,6 @@ services: tty: true working_dir: /var/solr/data volumes: - # Mount our "solr_configs" volume available under the Solr's configsets folder (in a 'dspace' subfolder) - # This copies the Solr configs from main 'dspace' container into 'dspacesolr' via that volume - - solr_configs:/opt/solr/server/solr/configsets/dspace # Keep Solr data directory between reboots - solr_data:/var/solr/data # Initialize all DSpace Solr cores using the mounted configsets (see above), then start Solr @@ -102,14 +103,16 @@ services: - '-c' - | init-var-solr - precreate-core authority /opt/solr/server/solr/configsets/dspace/authority - precreate-core oai /opt/solr/server/solr/configsets/dspace/oai - precreate-core search /opt/solr/server/solr/configsets/dspace/search - precreate-core statistics /opt/solr/server/solr/configsets/dspace/statistics + precreate-core authority /opt/solr/server/solr/configsets/authority + cp -r /opt/solr/server/solr/configsets/authority/* authority + precreate-core oai /opt/solr/server/solr/configsets/oai + cp -r /opt/solr/server/solr/configsets/oai/* oai + precreate-core search /opt/solr/server/solr/configsets/search + cp -r /opt/solr/server/solr/configsets/search/* search + precreate-core statistics /opt/solr/server/solr/configsets/statistics + cp -r /opt/solr/server/solr/configsets/statistics/* statistics exec solr -f volumes: assetstore: pgdata: solr_data: - # Special volume used to share Solr configs from 'dspace' to 'dspacesolr' container (see above) - solr_configs: diff --git a/docker/docker-compose-dist.yml b/docker/docker-compose-dist.yml index 1f4d2d7f5e6..88e5be16a5d 100644 --- a/docker/docker-compose-dist.yml +++ b/docker/docker-compose-dist.yml @@ -26,7 +26,7 @@ services: DSPACE_REST_HOST: demo.dspace.org DSPACE_REST_PORT: 443 DSPACE_REST_NAMESPACE: /server - image: dspace/dspace-angular:dspace-7_x-dist + image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-dspace-7_x}-dist" build: context: .. dockerfile: Dockerfile.dist diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml index 4ef37744599..cd4f26c062c 100644 --- a/docker/docker-compose-rest.yml +++ b/docker/docker-compose-rest.yml @@ -42,6 +42,7 @@ services: # proxies.trusted.ipranges: This setting is required for a REST API running in Docker to trust requests # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above. proxies__P__trusted__P__ipranges: '172.2${INSTANCE}.0' + LOGGING_CONFIG: /dspace/config/log4j2-container.xml #S3 config assetstore__P__index__P__primary: ${S3_STORAGE:-0} assetstore__P__s3__P__enabled: ${S3_ENABLED:-false} @@ -57,7 +58,7 @@ services: depends_on: - dspacedb networks: - dspacenet: + - dspacenet ports: # BE server port - published: 808${INSTANCE} @@ -118,7 +119,7 @@ services: POSTGRES_PASSWORD: dspace image: ${DSPACE_DB_IMAGE:-dataquest/dspace-postgres-pgcrypto:dspace-7_x} networks: - dspacenet: + - dspacenet ports: - published: 543${INSTANCE} target: 543${INSTANCE} @@ -126,6 +127,7 @@ services: stdin_open: true tty: true volumes: + # Keep Postgres data directory between reboots - pgdata:/pgdata command: -p 543${INSTANCE} # DSpace Solr container @@ -136,7 +138,7 @@ services: container_name: dspacesolr${INSTANCE} image: ${DSPACE_SOLR_IMAGE:-dataquest/dspace-solr:dspace-7_x} networks: - dspacenet: + - dspacenet ports: - published: 898${INSTANCE} target: 898${INSTANCE} diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 6b5d32efff4..09f23c8a5de 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,6 +6,9 @@ # http://www.dspace.org/license/ # +# Docker Compose for running the DSpace Angular UI for testing/development +# Requires also running a REST API backend (either locally or remotely), +# for example via 'docker-compose-rest.yml' networks: dspacenet: services: diff --git a/package.json b/package.json index 2e863135534..3a9dfb1aceb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dspace-angular", - "version": "7.6.1", + "version": "7.6.5", "scripts": { "ng": "ng", "config:watch": "nodemon", @@ -12,7 +12,6 @@ "preserve": "yarn base-href", "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts", "serve:ssr": "node dist/server/main", - "analyze": "webpack-bundle-analyzer dist/browser/stats.json", "build": "ng build --configuration development", "build:stats": "ng build --stats-json", "build:prod": "cross-env NODE_ENV=production yarn run build:ssr", @@ -49,27 +48,20 @@ "https": false }, "private": true, - "resolutions": { - "minimist": "^1.2.5", - "webdriver-manager": "^12.1.8", - "ts-node": "10.2.1" - }, "dependencies": { - "@angular/animations": "^15.2.8", - "@angular/cdk": "^15.2.8", - "@angular/common": "^15.2.8", - "@angular/compiler": "^15.2.8", - "@angular/core": "^15.2.8", - "@angular/forms": "^15.2.8", - "@angular/localize": "15.2.8", - "@angular/platform-browser": "^15.2.8", - "@angular/platform-browser-dynamic": "^15.2.8", - "@angular/platform-server": "^15.2.8", - "@angular/router": "^15.2.8", - "@babel/runtime": "7.21.0", + "@angular/animations": "^15.2.10", + "@angular/cdk": "^15.2.9", + "@angular/common": "^15.2.10", + "@angular/compiler": "^15.2.10", + "@angular/core": "^15.2.10", + "@angular/forms": "^15.2.10", + "@angular/localize": "15.2.10", + "@angular/platform-browser": "^15.2.10", + "@angular/platform-browser-dynamic": "^15.2.10", + "@angular/platform-server": "^15.2.10", + "@angular/router": "^15.2.10", + "@babel/runtime": "7.27.6", "@kolkov/ngx-gallery": "^2.0.1", - "@material-ui/core": "^4.11.0", - "@material-ui/icons": "^4.11.3", "@ng-bootstrap/ng-bootstrap": "^11.0.0", "@ng-dynamic-forms/core": "^15.0.0", "@ng-dynamic-forms/ui-ng-bootstrap": "^15.0.0", @@ -80,133 +72,132 @@ "@ngx-translate/core": "^14.0.0", "@nth-cloud/ng-toggle": "11.0.0", "@nicky-lenaers/ngx-scroll-to": "^14.0.0", - "@types/grecaptcha": "^3.0.4", "angular-idle-preload": "3.0.0", - "angulartics2": "^12.2.0", - "axios": "^1.6.0", + "angulartics2": "^12.2.1", + "axios": "^1.10.0", "bootstrap": "^4.6.1", "cerialize": "0.1.18", "cli-progress": "^3.12.0", "colors": "^1.4.0", + "compression": "^1.8.1", "ng2-charts": "4.1.1", "chart.js": "4.3.3", - "compression": "^1.7.4", - "cookie-parser": "1.4.6", - "core-js": "^3.30.1", - "date-fns": "^2.29.3", + "cookie-parser": "1.4.7", + "core-js": "^3.42.0", + "date-fns": "^2.30.0", "date-fns-tz": "^1.3.7", "deepmerge": "^4.3.1", - "ejs": "^3.1.9", - "express": "^4.18.2", + "ejs": "^3.1.10", + "express": "^4.21.2", "express-rate-limit": "^5.1.3", "fast-json-patch": "^3.1.1", "filesize": "^6.1.0", - "http-proxy-middleware": "^1.0.5", + "http-proxy-middleware": "^2.0.9", "http-terminator": "^3.2.0", - "isbot": "^3.6.10", + "isbot": "^5.1.28", "js-cookie": "2.2.1", "js-yaml": "^4.1.0", "json5": "^2.2.3", - "jsonschema": "1.4.1", + "jsonschema": "1.5.0", "jwt-decode": "^3.1.2", - "klaro": "^0.7.18", + "klaro": "^0.7.21", "lindat-common": "^1.5.0", "lodash": "^4.17.21", "lru-cache": "^7.14.1", - "markdown-it": "^13.0.1", + "markdown-it": "^13.0.2", "markdown-it-mathjax3": "^4.3.2", - "mirador": "^3.3.0", + "mirador": "^3.4.3", "mirador-dl-plugin": "^0.13.0", - "mirador-share-plugin": "^0.11.0", - "morgan": "^1.10.0", - "ng-mocks": "^14.10.0", + "mirador-share-plugin": "^0.16.0", + "morgan": "^1.10.1", "ng2-file-upload": "1.4.0", "ng2-nouislider": "^2.0.0", "ngx-infinite-scroll": "^15.0.0", "ngx-pagination": "6.0.3", + "ngx-skeleton-loader": "^7.0.0", "ngx-sortablejs": "^11.1.0", - "ngx-ui-switch": "^14.0.3", - "nouislider": "^15.7.1", - "pem": "1.14.7", - "prop-types": "^15.8.1", - "react-copy-to-clipboard": "^5.1.0", - "reflect-metadata": "^0.1.13", - "rxjs": "^7.8.0", - "sanitize-html": "^2.10.0", - "sortablejs": "1.15.0", + "ngx-ui-switch": "^14.1.0", + "nouislider": "^15.8.1", + "pem": "1.14.8", + "reflect-metadata": "^0.2.2", + "rxjs": "^7.8.2", + "sanitize-html": "^2.17.0", + "sortablejs": "1.15.6", "uuid": "^8.3.2", - "webfontloader": "1.6.28", - "zone.js": "~0.11.5" + "zone.js": "~0.13.3" }, "devDependencies": { "@angular-builders/custom-webpack": "~15.0.0", - "@angular-devkit/build-angular": "^15.2.6", + "@angular-devkit/build-angular": "^15.2.11", "@angular-eslint/builder": "15.2.1", "@angular-eslint/eslint-plugin": "15.2.1", "@angular-eslint/eslint-plugin-template": "15.2.1", "@angular-eslint/schematics": "15.2.1", "@angular-eslint/template-parser": "15.2.1", - "@angular/cli": "^15.2.6", - "@angular/compiler-cli": "^15.2.8", - "@angular/language-service": "^15.2.8", + "@angular/cli": "^16.2.16", + "@angular/compiler-cli": "^15.2.10", + "@angular/language-service": "^15.2.10", "@cypress/schematic": "^1.5.0", - "@fortawesome/fontawesome-free": "^6.4.0", + "@fortawesome/fontawesome-free": "^6.7.2", + "@material-ui/core": "^4.12.4", + "@material-ui/icons": "^4.11.3", "@ngrx/store-devtools": "^15.4.0", "@ngtools/webpack": "^15.2.6", "@nguniversal/builders": "^15.2.1", - "@types/deep-freeze": "0.1.2", - "@types/ejs": "^3.1.2", - "@types/express": "^4.17.17", + "@types/deep-freeze": "0.1.5", + "@types/ejs": "^3.1.5", + "@types/express": "^4.17.21", + "@types/grecaptcha": "^3.0.9", "@types/jasmine": "~3.6.0", "@types/js-cookie": "2.2.6", - "@types/lodash": "^4.14.194", - "@types/node": "^14.14.9", - "@types/sanitize-html": "^2.9.0", - "@typescript-eslint/eslint-plugin": "^5.59.1", - "@typescript-eslint/parser": "^5.59.1", - "axe-core": "^4.7.2", + "@types/lodash": "^4.17.17", + "@types/node": "^14.18.63", + "@types/sanitize-html": "^2.16.0", + "@typescript-eslint/eslint-plugin": "^5.62.0", + "@typescript-eslint/parser": "^5.62.0", + "axe-core": "^4.10.3", "compression-webpack-plugin": "^9.2.0", "copy-webpack-plugin": "^6.4.1", "cross-env": "^7.0.3", - "cypress": "12.17.4", - "cypress-axe": "^1.4.0", + "csstype": "^3.1.3", + "cypress": "^13.17.0", + "cypress-axe": "^1.6.0", "deep-freeze": "0.0.1", "eslint": "^8.39.0", - "eslint-plugin-deprecation": "^1.4.1", - "eslint-plugin-import": "^2.27.5", - "eslint-plugin-jsdoc": "^39.6.4", - "eslint-plugin-jsonc": "^2.6.0", + "eslint-plugin-deprecation": "^1.5.0", + "eslint-plugin-import": "^2.32.0", + "eslint-plugin-jsdoc": "^45.0.0", + "eslint-plugin-jsonc": "^2.20.1", "eslint-plugin-lodash": "^7.4.0", "eslint-plugin-unused-imports": "^2.0.0", - "express-static-gzip": "^2.1.7", + "express-static-gzip": "^2.2.0", "jasmine-core": "^3.8.0", "jasmine-marbles": "0.9.2", - "karma": "^6.4.2", + "karma": "^6.4.4", "karma-chrome-launcher": "~3.2.0", "karma-coverage-istanbul-reporter": "~3.0.3", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.5.0", "karma-mocha-reporter": "2.2.5", + "ng-mocks": "^14.13.5", "ngx-mask": "^13.1.7", "nodemon": "^2.0.22", - "postcss": "^8.4", - "postcss-apply": "0.12.0", + "postcss": "^8.5", "postcss-import": "^14.0.0", "postcss-loader": "^4.0.3", "postcss-preset-env": "^7.4.2", - "postcss-responsive-type": "1.0.0", + "prop-types": "^15.8.1", "react": "^16.14.0", + "react-copy-to-clipboard": "^5.1.0", "react-dom": "^16.14.0", "rimraf": "^3.0.2", - "rxjs-spy": "^8.0.2", - "sass": "~1.62.0", + "sass": "~1.89.2", "sass-loader": "^12.6.0", "sass-resources-loader": "^2.2.5", "ts-node": "^8.10.2", "typescript": "~4.8.4", "webpack": "5.76.1", - "webpack-bundle-analyzer": "^4.8.0", "webpack-cli": "^4.2.0", - "webpack-dev-server": "^4.13.3" + "webpack-dev-server": "^4.15.2" } } diff --git a/postcss.config.js b/postcss.config.js index df092d1d39f..f8b9666b312 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,8 +1,6 @@ module.exports = { plugins: [ require('postcss-import')(), - require('postcss-preset-env')(), - require('postcss-apply')(), - require('postcss-responsive-type')() + require('postcss-preset-env')() ] }; diff --git a/server.ts b/server.ts index 93f3e868763..1aee5dc657b 100644 --- a/server.ts +++ b/server.ts @@ -28,7 +28,7 @@ import * as expressStaticGzip from 'express-static-gzip'; /* eslint-enable import/no-namespace */ import axios from 'axios'; import LRU from 'lru-cache'; -import isbot from 'isbot'; +import { isbot } from 'isbot'; import { createCertificate } from 'pem'; import { createServer } from 'https'; import { json } from 'body-parser'; @@ -55,6 +55,7 @@ import { APP_CONFIG, AppConfig } 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 { SsrExcludePatterns } from './src/config/universal-config.interface'; /* @@ -79,6 +80,9 @@ let anonymousCache: LRU; // extend environment with app config for server extendEnvironmentWithAppConfig(environment, appConfig); +// The REST server base URL +const REST_BASE_URL = environment.rest.ssrBaseUrl || environment.rest.baseUrl; + // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -176,7 +180,7 @@ export function app() { * Proxy the sitemaps */ router.use('/sitemap**', createProxyMiddleware({ - target: `${environment.rest.baseUrl}/sitemaps`, + target: `${REST_BASE_URL}/sitemaps`, pathRewrite: path => path.replace(environment.ui.nameSpace, '/'), changeOrigin: true })); @@ -185,7 +189,7 @@ export function app() { * Proxy the linksets */ router.use('/signposting**', createProxyMiddleware({ - target: `${environment.rest.baseUrl}`, + target: `${REST_BASE_URL}`, pathRewrite: path => path.replace(environment.ui.nameSpace, '/'), changeOrigin: true })); @@ -238,7 +242,7 @@ export function app() { * The callback function to serve server side angular */ function ngApp(req, res) { - if (environment.universal.preboot) { + if (environment.universal.preboot && req.method === 'GET' && (req.path === '/' || !isExcludedFromSsr(req.path, environment.universal.excludePathPatterns))) { // Render the page to user via SSR (server side rendering) serverSideRender(req, res); } else { @@ -269,6 +273,11 @@ function serverSideRender(req, res, sendToUser: boolean = true) { requestUrl: req.originalUrl, }, (err, data) => { if (hasNoValue(err) && hasValue(data)) { + // Replace REST URL with UI URL + if (environment.universal.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) { + data = data.replace(new RegExp(REST_BASE_URL, 'g'), environment.rest.baseUrl); + } + // save server side rendered page to cache (if any are enabled) saveToCache(req, data); if (sendToUser) { @@ -617,11 +626,26 @@ function start() { } } +/** + * Check if SSR should be skipped for path + * + * @param path + * @param excludePathPattern + */ +function isExcludedFromSsr(path: string, excludePathPattern: SsrExcludePatterns[]): boolean { + const patterns = excludePathPattern.map(p => + new RegExp(p.pattern, p.flag || '') + ); + return patterns.some((regex) => { + return regex.test(path) + }); +} + /* * The callback function to serve health check requests */ function healthCheck(req, res) { - const baseUrl = `${environment.rest.baseUrl}${environment.actuators.endpointPath}`; + const baseUrl = `${REST_BASE_URL}${environment.actuators.endpointPath}`; axios.get(baseUrl) .then((response) => { res.status(response.status).send(response.data); diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html index c716aedb8b3..131cb49d6be 100644 --- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html +++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html @@ -1,15 +1,15 @@ -
-
-
+
+
@@ -17,51 +17,52 @@
- -
+
+ +
+
diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html index 382caf85f46..cda6b805bcc 100644 --- a/src/app/access-control/bulk-access/bulk-access.component.html +++ b/src/app/access-control/bulk-access/bulk-access.component.html @@ -1,4 +1,5 @@
+

{{ 'admin.access-control.bulk-access.title' | translate }}

@@ -9,7 +10,7 @@ -
diff --git a/src/app/access-control/bulk-access/bulk-access.component.spec.ts b/src/app/access-control/bulk-access/bulk-access.component.spec.ts index e9b253147dc..4a545dc3dd9 100644 --- a/src/app/access-control/bulk-access/bulk-access.component.spec.ts +++ b/src/app/access-control/bulk-access/bulk-access.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { NO_ERRORS_SCHEMA, Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; @@ -57,10 +57,15 @@ describe('BulkAccessComponent', () => { 'file': { } }; - const mockSettings: any = jasmine.createSpyObj('AccessControlFormContainerComponent', { - getValue: jasmine.createSpy('getValue'), - reset: jasmine.createSpy('reset') - }); + @Component({ + selector: 'ds-bulk-access-settings', + template: '' + }) + class MockBulkAccessSettingsComponent { + isFormValid = jasmine.createSpy('isFormValid').and.returnValue(false); + getValue = jasmine.createSpy('getValue'); + reset = jasmine.createSpy('reset'); + } const selection: any[] = [{ indexableObject: { uuid: '1234' } }, { indexableObject: { uuid: '5678' } }]; const selectableListState: SelectableListState = { id: 'test', selection }; const expectedIdList = ['1234', '5678']; @@ -73,7 +78,10 @@ describe('BulkAccessComponent', () => { RouterTestingModule, TranslateModule.forRoot() ], - declarations: [ BulkAccessComponent ], + declarations: [ + BulkAccessComponent, + MockBulkAccessSettingsComponent, + ], providers: [ { provide: BulkAccessControlService, useValue: bulkAccessControlServiceMock }, { provide: NotificationsService, useValue: NotificationsServiceStub }, @@ -102,7 +110,6 @@ describe('BulkAccessComponent', () => { (component as any).selectableListService.getSelectableList.and.returnValue(of(selectableListStateEmpty)); fixture.detectChanges(); - component.settings = mockSettings; }); it('should create', () => { @@ -119,13 +126,12 @@ describe('BulkAccessComponent', () => { }); - describe('when there are elements selected', () => { + describe('when there are elements selected and step two form is invalid', () => { beforeEach(() => { (component as any).selectableListService.getSelectableList.and.returnValue(of(selectableListState)); fixture.detectChanges(); - component.settings = mockSettings; }); it('should create', () => { @@ -136,9 +142,9 @@ describe('BulkAccessComponent', () => { expect(component.objectsSelected$.value).toEqual(expectedIdList); }); - it('should enable the execute button when there are objects selected', () => { + it('should not enable the execute button when there are objects selected and step two form is invalid', () => { component.objectsSelected$.next(['1234']); - expect(component.canExport()).toBe(true); + expect(component.canExport()).toBe(false); }); it('should call the settings reset method when reset is called', () => { @@ -146,6 +152,23 @@ describe('BulkAccessComponent', () => { expect(component.settings.reset).toHaveBeenCalled(); }); + + }); + + describe('when there are elements selectedted and the step two form is valid', () => { + + beforeEach(() => { + + (component as any).selectableListService.getSelectableList.and.returnValue(of(selectableListState)); + fixture.detectChanges(); + (component as any).settings.isFormValid.and.returnValue(true); + }); + + it('should enable the execute button when there are objects selected and step two form is valid', () => { + component.objectsSelected$.next(['1234']); + expect(component.canExport()).toBe(true); + }); + it('should call the bulkAccessControlService executeScript method when submit is called', () => { (component.settings as any).getValue.and.returnValue(mockFormState); bulkAccessControlService.createPayloadFile.and.returnValue(mockFile); diff --git a/src/app/access-control/bulk-access/bulk-access.component.ts b/src/app/access-control/bulk-access/bulk-access.component.ts index 04724614cb6..bdea3d5cbee 100644 --- a/src/app/access-control/bulk-access/bulk-access.component.ts +++ b/src/app/access-control/bulk-access/bulk-access.component.ts @@ -37,7 +37,7 @@ export class BulkAccessComponent implements OnInit { constructor( private bulkAccessControlService: BulkAccessControlService, - private selectableListService: SelectableListService + private selectableListService: SelectableListService, ) { } @@ -51,7 +51,7 @@ export class BulkAccessComponent implements OnInit { } canExport(): boolean { - return this.objectsSelected$.value?.length > 0; + return this.objectsSelected$.value?.length > 0 && this.settings?.isFormValid(); } /** diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html index 01f36ef03f4..c41053874e7 100644 --- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html +++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html @@ -1,13 +1,13 @@ -
- -
-
+
+
@@ -15,7 +15,7 @@
- + diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts index eecc0162451..5d1070893c4 100644 --- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts +++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts @@ -31,4 +31,8 @@ export class BulkAccessSettingsComponent { this.controlForm.reset(); } + isFormValid() { + return this.controlForm.isValid(); + } + } diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html index 4979f858193..540f57032bf 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.html +++ b/src/app/access-control/epeople-registry/epeople-registry.component.html @@ -2,7 +2,7 @@
- +

{{labelPrefix + 'head' | translate}}

- +
+ {{'admin.registries.bitstream-formats.select' | translate}}} {{bitstreamFormat.id}} @@ -45,13 +46,13 @@

{{'admin.registries.bitstream-format

-
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 8a44240b7e2..8041e21206b 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 @@ -15,8 +15,8 @@ import { NotificationsService } from '../../../shared/notifications/notification import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; import { BitstreamFormatSupportLevel } from '../../../core/shared/bitstream-format-support-level'; -import { cold, getTestScheduler, hot } from 'jasmine-marbles'; -import { TestScheduler } from 'rxjs/testing'; +import { XSRFService } from '../../../core/xsrf/xsrf.service'; +import { hot } from 'jasmine-marbles'; import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject, @@ -31,7 +31,6 @@ describe('BitstreamFormatsComponent', () => { let comp: BitstreamFormatsComponent; let fixture: ComponentFixture; let bitstreamFormatService; - let scheduler: TestScheduler; let notificationsServiceStub; let paginationService; @@ -86,8 +85,6 @@ describe('BitstreamFormatsComponent', () => { const initAsync = () => { notificationsServiceStub = new NotificationsServiceStub(); - scheduler = getTestScheduler(); - bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', { findAll: observableOf(mockFormatsRD), find: createSuccessfulRemoteDataObject$(mockFormatsList[0]), @@ -108,7 +105,8 @@ describe('BitstreamFormatsComponent', () => { { provide: BitstreamFormatDataService, useValue: bitstreamFormatService }, { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, { provide: NotificationsService, useValue: notificationsServiceStub }, - { provide: PaginationService, useValue: paginationService } + { provide: PaginationService, useValue: paginationService }, + { provide: XSRFService, useValue: {} }, ] }).compileComponents(); }; @@ -178,17 +176,17 @@ describe('BitstreamFormatsComponent', () => { beforeEach(waitForAsync(initAsync)); beforeEach(initBeforeEach); it('should return an observable of true if the provided bistream is in the list returned by the service', () => { - const result = comp.isSelected(bitstreamFormat1); - - expect(result).toBeObservable(cold('b', { b: true })); + comp.selectedBitstreamFormatIDs().subscribe((selectedBitstreamFormatIDs: string[]) => { + expect(selectedBitstreamFormatIDs).toContain(bitstreamFormat1.id); + }); }); it('should return an observable of false if the provided bistream is not in the list returned by the service', () => { const format = new BitstreamFormat(); format.uuid = 'new'; - const result = comp.isSelected(format); - - expect(result).toBeObservable(cold('b', { b: false })); + comp.selectedBitstreamFormatIDs().subscribe((selectedBitstreamFormatIDs: string[]) => { + expect(selectedBitstreamFormatIDs).not.toContain(format.id); + }); }); }); @@ -214,8 +212,6 @@ describe('BitstreamFormatsComponent', () => { beforeEach(waitForAsync(() => { notificationsServiceStub = new NotificationsServiceStub(); - scheduler = getTestScheduler(); - bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', { findAll: observableOf(mockFormatsRD), find: createSuccessfulRemoteDataObject$(mockFormatsList[0]), @@ -263,8 +259,6 @@ describe('BitstreamFormatsComponent', () => { beforeEach(waitForAsync(() => { notificationsServiceStub = new NotificationsServiceStub(); - scheduler = getTestScheduler(); - bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', { findAll: observableOf(mockFormatsRD), find: createSuccessfulRemoteDataObject$(mockFormatsList[0]), 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 162bf2bdb28..263c1aede2a 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 @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { combineLatest as observableCombineLatest, Observable} from 'rxjs'; +import { Observable} from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { PaginatedList } from '../../../core/data/paginated-list.model'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; @@ -7,7 +7,6 @@ import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service'; import { map, mergeMap, switchMap, take, toArray } from 'rxjs/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { NoContent } from '../../../core/shared/NoContent.model'; import { PaginationService } from '../../../core/pagination/pagination.service'; @@ -26,7 +25,12 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { /** * A paginated list of bitstream formats to be shown on the page */ - bitstreamFormats: Observable>>; + bitstreamFormats$: Observable>>; + + /** + * The currently selected {@link BitstreamFormat} IDs + */ + selectedBitstreamFormatIDs$: Observable; /** * The current pagination configuration for the page @@ -39,7 +43,6 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { }); constructor(private notificationsService: NotificationsService, - private router: Router, private translateService: TranslateService, private bitstreamFormatService: BitstreamFormatDataService, private paginationService: PaginationService, @@ -94,14 +97,11 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { } /** - * Checks whether a given bitstream format is selected in the list (checkbox) - * @param bitstreamFormat + * Returns the list of all the bitstream formats that are selected in the list (checkbox) */ - isSelected(bitstreamFormat: BitstreamFormat): Observable { + selectedBitstreamFormatIDs(): Observable { return this.bitstreamFormatService.getSelectedBitstreamFormats().pipe( - map((bitstreamFormats: BitstreamFormat[]) => { - return bitstreamFormats.find((selectedFormat) => selectedFormat.id === bitstreamFormat.id) != null; - }) + map((bitstreamFormats: BitstreamFormat[]) => bitstreamFormats.map((selectedFormat) => selectedFormat.id)), ); } @@ -125,27 +125,23 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { const prefix = 'admin.registries.bitstream-formats.delete'; const suffix = success ? 'success' : 'failure'; - const messages = observableCombineLatest( - this.translateService.get(`${prefix}.${suffix}.head`), - this.translateService.get(`${prefix}.${suffix}.amount`, {amount: amount}) - ); - messages.subscribe(([head, content]) => { + const head: string = this.translateService.instant(`${prefix}.${suffix}.head`); + const content: string = this.translateService.instant(`${prefix}.${suffix}.amount`, { amount: amount }); - if (success) { - this.notificationsService.success(head, content); - } else { - this.notificationsService.error(head, content); - } - }); + if (success) { + this.notificationsService.success(head, content); + } else { + this.notificationsService.error(head, content); + } } ngOnInit(): void { - - this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe( + this.bitstreamFormats$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe( switchMap((findListOptions: FindListOptions) => { return this.bitstreamFormatService.findAll(findListOptions); }) ); + this.selectedBitstreamFormatIDs$ = this.selectedBitstreamFormatIDs(); } diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html index f57ec9cd382..efcced2a87c 100644 --- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html +++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html @@ -1,11 +1,11 @@
-

{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}

+

{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}

-
\ No newline at end of file +
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html index 35bffad185c..48081328931 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html @@ -2,7 +2,7 @@
- +

{{'admin.registries.metadata.head' | translate}}

{{'admin.registries.metadata.description' | translate}}

@@ -19,7 +19,7 @@ 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 4cd663f0fbc..4ff09154cda 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 @@ -2,7 +2,7 @@ import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; -import { of as observableOf } from 'rxjs'; +import { BehaviorSubject, of as observableOf } from 'rxjs'; import { LinkService } from '../../../../core/cache/builders/link.service'; import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; @@ -28,71 +28,80 @@ import { ConfigurationDataService } from '../../../../core/data/configuration-da import { LinkHeadService } from '../../../../core/services/link-head.service'; import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub'; +import { XSRFService } from '../../../../core/xsrf/xsrf.service'; import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model'; import { Router } from '@angular/router'; import { RouterMock } from '../../../../shared/mocks/router.mock'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; - -let comp: EditRelationshipListComponent; -let fixture: ComponentFixture; -let de: DebugElement; - -let linkService; -let objectUpdatesService; -let relationshipService; -let selectableListService; -let paginationService; -let hostWindowService; -const relationshipTypeService = {}; - -const url = 'http://test-url.com/test-url'; - -let item; -let entityType; -let relatedEntityType; -let author1; -let author2; -let fieldUpdate1; -let fieldUpdate2; -let relationships; -let relationshipType; -let paginationOptions; +import { EditItemRelationshipsServiceStub } from '../../../../shared/testing/edit-item-relationships.service.stub'; +import { EditItemRelationshipsService } from '../edit-item-relationships.service'; +import { cold } from 'jasmine-marbles'; +import { environment } from '../../../../../environments/environment.test'; describe('EditRelationshipListComponent', () => { + let comp: EditRelationshipListComponent; + let fixture: ComponentFixture; + let de: DebugElement; + + let linkService; + let objectUpdatesService; + let relationshipService; + let selectableListService; + let paginationService: PaginationServiceStub; + let hostWindowService: HostWindowServiceStub; + const relationshipTypeService = {}; + let editItemRelationshipsService: EditItemRelationshipsServiceStub; + + const url = 'http://test-url.com/test-url'; + + let itemLeft: Item; + let entityTypeLeft: ItemType; + let entityTypeRight: ItemType; + let itemRight1: Item; + let itemRight2: Item; + let fieldUpdate1; + let fieldUpdate2; + let relationships: Relationship[]; + let relationshipType: RelationshipType; + let paginationOptions: PaginationComponentOptions; + let currentItemIsLeftItem$ = new BehaviorSubject(true); + const resetComponent = () => { fixture = TestBed.createComponent(EditRelationshipListComponent); comp = fixture.componentInstance; de = fixture.debugElement; - comp.item = item; - comp.itemType = entityType; + comp.item = itemLeft; + comp.itemType = entityTypeLeft; comp.url = url; comp.relationshipType = relationshipType; comp.hasChanges = observableOf(false); + comp.currentItemIsLeftItem$ = currentItemIsLeftItem$; fixture.detectChanges(); }; - beforeEach(waitForAsync(() => { - - entityType = Object.assign(new ItemType(), { - id: 'Publication', - uuid: 'Publication', - label: 'Publication', + function init(leftType: string, rightType: string, leftMaxCardinality?: number, rightMaxCardinality?: number): void { + entityTypeLeft = Object.assign(new ItemType(), { + id: leftType, + uuid: leftType, + label: leftType, }); - relatedEntityType = Object.assign(new ItemType(), { - id: 'Author', - uuid: 'Author', - label: 'Author', + entityTypeRight = Object.assign(new ItemType(), { + id: rightType, + uuid: rightType, + label: rightType, }); relationshipType = Object.assign(new RelationshipType(), { id: '1', uuid: '1', - leftType: createSuccessfulRemoteDataObject$(entityType), - rightType: createSuccessfulRemoteDataObject$(relatedEntityType), - leftwardType: 'isAuthorOfPublication', - rightwardType: 'isPublicationOfAuthor', + leftType: createSuccessfulRemoteDataObject$(entityTypeLeft), + rightType: createSuccessfulRemoteDataObject$(entityTypeRight), + leftwardType: `is${rightType}Of${leftType}`, + rightwardType: `is${leftType}Of${rightType}`, + leftMaxCardinality: leftMaxCardinality, + rightMaxCardinality: rightMaxCardinality, }); paginationOptions = Object.assign(new PaginationComponentOptions(), { @@ -101,13 +110,13 @@ describe('EditRelationshipListComponent', () => { currentPage: 1, }); - author1 = Object.assign(new Item(), { - id: 'author1', - uuid: 'author1' + itemRight1 = Object.assign(new Item(), { + id: `${rightType}-1`, + uuid: `${rightType}-1`, }); - author2 = Object.assign(new Item(), { - id: 'author2', - uuid: 'author2' + itemRight2 = Object.assign(new Item(), { + id: `${rightType}-2`, + uuid: `${rightType}-2`, }); relationships = [ @@ -116,25 +125,25 @@ describe('EditRelationshipListComponent', () => { id: '2', uuid: '2', relationshipType: createSuccessfulRemoteDataObject$(relationshipType), - leftItem: createSuccessfulRemoteDataObject$(item), - rightItem: createSuccessfulRemoteDataObject$(author1), + leftItem: createSuccessfulRemoteDataObject$(itemLeft), + rightItem: createSuccessfulRemoteDataObject$(itemRight1), }), Object.assign(new Relationship(), { self: url + '/3', id: '3', uuid: '3', relationshipType: createSuccessfulRemoteDataObject$(relationshipType), - leftItem: createSuccessfulRemoteDataObject$(item), - rightItem: createSuccessfulRemoteDataObject$(author2), + leftItem: createSuccessfulRemoteDataObject$(itemLeft), + rightItem: createSuccessfulRemoteDataObject$(itemRight2), }) ]; - item = Object.assign(new Item(), { + itemLeft = Object.assign(new Item(), { _links: { self: { href: 'fake-item-url/publication' } }, - id: 'publication', - uuid: 'publication', + id: `1-${leftType}`, + uuid: `1-${leftType}`, relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)) }); @@ -160,13 +169,16 @@ describe('EditRelationshipListComponent', () => { getFieldUpdates: observableOf({ [relationships[0].uuid]: fieldUpdate1, [relationships[1].uuid]: fieldUpdate2 - }) + }), + // eslint-disable-next-line @typescript-eslint/no-empty-function + initialize: () => { + }, } ); relationshipService = jasmine.createSpyObj('relationshipService', { - getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList([author1, author2])), + getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList([itemRight1, itemRight2])), getItemRelationshipsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)), isLeftItem: observableOf(true), } @@ -202,11 +214,13 @@ describe('EditRelationshipListComponent', () => { })) }); - const environmentUseThumbs = { + editItemRelationshipsService = new EditItemRelationshipsServiceStub(); + + const environmentUseThumbs = Object.assign({}, environment, { browseBy: { showThumbnails: true } - }; + }); TestBed.configureTestingModule({ imports: [SharedModule, TranslateModule.forRoot()], @@ -224,6 +238,8 @@ describe('EditRelationshipListComponent', () => { { provide: LinkHeadService, useValue: linkHeadService }, { provide: ConfigurationDataService, useValue: configurationDataService }, { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() }, + { provide: EditItemRelationshipsService, useValue: editItemRelationshipsService }, + { provide: XSRFService, useValue: {} }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], schemas: [ NO_ERRORS_SCHEMA @@ -231,114 +247,157 @@ describe('EditRelationshipListComponent', () => { }).compileComponents(); resetComponent(); - })); - - describe('changeType is REMOVE', () => { - beforeEach(() => { - fieldUpdate1.changeType = FieldChangeType.REMOVE; - fixture.detectChanges(); - }); - it('the div should have class alert-danger', () => { - const element = de.queryAll(By.css('.relationship-row'))[1].nativeElement; - expect(element.classList).toContain('alert-danger'); - }); - }); + } - describe('pagination component', () => { - let paginationComp: PaginationComponent; + describe('Publication - Author relationship', () => { + beforeEach(waitForAsync(() => init('Publication', 'Author'))); - beforeEach(() => { - paginationComp = de.query(By.css('ds-pagination')).componentInstance; - }); - - it('should receive the correct pagination config', () => { - expect(paginationComp.paginationOptions).toEqual(paginationOptions); + describe('changeType is REMOVE', () => { + beforeEach(() => { + fieldUpdate1.changeType = FieldChangeType.REMOVE; + fixture.detectChanges(); + }); + it('the div should have class alert-danger', () => { + const element = de.queryAll(By.css('.relationship-row'))[1].nativeElement; + expect(element.classList).toContain('alert-danger'); + }); }); - it('should receive correct collection size', () => { - expect(paginationComp.collectionSize).toEqual(relationships.length); - }); + describe('pagination component', () => { + let paginationComp: PaginationComponent; - }); + beforeEach(() => { + paginationComp = de.query(By.css('ds-pagination')).componentInstance; + }); - describe('relationshipService.getItemRelationshipsByLabel', () => { - it('should receive the correct pagination info', () => { - expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1); + it('should receive the correct pagination config', () => { + expect(paginationComp.paginationOptions).toEqual(paginationOptions); + }); - const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args; - const findListOptions = callArgs[2]; - const linksToFollow = callArgs[5]; - expect(findListOptions.elementsPerPage).toEqual(paginationOptions.pageSize); - expect(findListOptions.currentPage).toEqual(paginationOptions.currentPage); - expect(linksToFollow.linksToFollow[0].name).toEqual('thumbnail'); + it('should receive correct collection size', () => { + expect(paginationComp.collectionSize).toEqual(relationships.length); + }); }); - describe('when the publication is on the left side of the relationship', () => { - beforeEach(() => { - relationshipType = Object.assign(new RelationshipType(), { - id: '1', - uuid: '1', - leftType: createSuccessfulRemoteDataObject$(entityType), // publication - rightType: createSuccessfulRemoteDataObject$(relatedEntityType), // author - leftwardType: 'isAuthorOfPublication', - rightwardType: 'isPublicationOfAuthor', - }); - relationshipService.getItemRelationshipsByLabel.calls.reset(); - resetComponent(); - }); - - it('should fetch isAuthorOfPublication', () => { + describe('relationshipService.getItemRelationshipsByLabel', () => { + it('should receive the correct pagination info', () => { expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1); const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args; - const label = callArgs[1]; + const findListOptions = callArgs[2]; + const linksToFollow = callArgs[5]; + expect(findListOptions.elementsPerPage).toEqual(paginationOptions.pageSize); + expect(findListOptions.currentPage).toEqual(paginationOptions.currentPage); + expect(linksToFollow.linksToFollow[0].name).toEqual('thumbnail'); - expect(label).toEqual('isAuthorOfPublication'); }); - }); - describe('when the publication is on the right side of the relationship', () => { - beforeEach(() => { - relationshipType = Object.assign(new RelationshipType(), { - id: '1', - uuid: '1', - leftType: createSuccessfulRemoteDataObject$(relatedEntityType), // author - rightType: createSuccessfulRemoteDataObject$(entityType), // publication - leftwardType: 'isPublicationOfAuthor', - rightwardType: 'isAuthorOfPublication', + describe('when the publication is on the left side of the relationship', () => { + beforeEach(() => { + relationshipType = Object.assign(new RelationshipType(), { + id: '1', + uuid: '1', + leftType: createSuccessfulRemoteDataObject$(entityTypeLeft), // publication + rightType: createSuccessfulRemoteDataObject$(entityTypeRight), // author + leftwardType: 'isAuthorOfPublication', + rightwardType: 'isPublicationOfAuthor', + }); + currentItemIsLeftItem$ = new BehaviorSubject(true); + relationshipService.getItemRelationshipsByLabel.calls.reset(); + resetComponent(); }); - relationshipService.getItemRelationshipsByLabel.calls.reset(); - resetComponent(); - }); - it('should fetch isAuthorOfPublication', () => { - expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1); + it('should fetch isAuthorOfPublication', () => { + expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1); - const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args; - const label = callArgs[1]; + const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args; + const label = callArgs[1]; - expect(label).toEqual('isAuthorOfPublication'); + expect(label).toEqual('isAuthorOfPublication'); + }); }); - }); + describe('when the publication is on the right side of the relationship', () => { + beforeEach(() => { + relationshipType = Object.assign(new RelationshipType(), { + id: '1', + uuid: '1', + leftType: createSuccessfulRemoteDataObject$(entityTypeRight), // author + rightType: createSuccessfulRemoteDataObject$(entityTypeLeft), // publication + leftwardType: 'isPublicationOfAuthor', + rightwardType: 'isAuthorOfPublication', + }); + currentItemIsLeftItem$ = new BehaviorSubject(false); + relationshipService.getItemRelationshipsByLabel.calls.reset(); + resetComponent(); + }); + it('should fetch isAuthorOfPublication', () => { + expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1); - describe('changes managment for add buttons', () => { + const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args; + const label = callArgs[1]; - it('should show enabled add buttons', () => { - const element = de.query(By.css('.btn-success')); - expect(element.nativeElement?.disabled).toBeFalse(); + expect(label).toEqual('isAuthorOfPublication'); + }); }); - it('after hash changes changed', () => { - comp.hasChanges = observableOf(true); - fixture.detectChanges(); - const element = de.query(By.css('.btn-success')); - expect(element.nativeElement?.disabled).toBeTrue(); + + + describe('changes managment for add buttons', () => { + + it('should show enabled add buttons', () => { + const element = de.query(By.css('.btn-success')); + expect(element.nativeElement?.disabled).toBeFalse(); + }); + + it('after hash changes changed', () => { + comp.hasChanges = observableOf(true); + fixture.detectChanges(); + const element = de.query(By.css('.btn-success')); + expect(element.nativeElement?.getAttribute('aria-disabled')).toBe('true'); + expect(element.nativeElement?.classList.contains('disabled')).toBeTrue(); + }); }); + }); + }); + describe('OrgUnit - OrgUnit relationship', () => { + beforeEach(waitForAsync(() => init('OrgUnit', 'OrgUnit'))); + + it('should emit the relatedEntityType$ even for same entity relationships', () => { + expect(comp.relatedEntityType$).toBeObservable(cold('(a|)', { + a: entityTypeRight, + })); + }); }); + describe('Is repeatable relationship', () => { + beforeEach(waitForAsync(() => { + currentItemIsLeftItem$ = new BehaviorSubject(true); + })); + describe('when max cardinality is 1', () => { + beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 1, undefined))); + it('should return false', () => { + const result = (comp as any).isRepeatable(); + expect(result).toBeFalse(); + }); + }); + describe('when max cardinality is 2', () => { + beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 2, undefined))); + it('should return true', () => { + const result = (comp as any).isRepeatable(); + expect(result).toBeTrue(); + }); + }); + describe('when max cardinality is undefined', () => { + beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', undefined, undefined))); + it('should return true', () => { + const result = (comp as any).isRepeatable(); + expect(result).toBeTrue(); + }); + }); + }); }); 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 b8542f5806f..b8288704f19 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 @@ -5,6 +5,7 @@ import { ObjectUpdatesService } from '../../../../core/data/object-updates/objec import { BehaviorSubject, combineLatest as observableCombineLatest, + EMPTY, from as observableFrom, Observable, Subscription @@ -14,33 +15,57 @@ import { } from '../../../../core/data/object-updates/object-updates.reducer'; import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; import { Item } from '../../../../core/shared/item.model'; -import { defaultIfEmpty, map, mergeMap, startWith, switchMap, take, tap, toArray } from 'rxjs/operators'; -import { hasNoValue, hasValue, hasValueOperator } from '../../../../shared/empty.util'; +import { + defaultIfEmpty, + map, + mergeMap, + startWith, + switchMap, + take, + tap, + toArray, + concatMap +} from 'rxjs/operators'; +import { hasNoValue, hasValue, hasValueOperator, isNotEmpty } from '../../../../shared/empty.util'; import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; -import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; +import { + RelationshipType +} from '../../../../core/shared/item-relationships/relationship-type.model'; import { getAllSucceededRemoteData, + getFirstCompletedRemoteData, getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload, } from '../../../../core/shared/operators'; import { ItemType } from '../../../../core/shared/item-relationships/item-type.model'; -import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component'; -import { RelationshipOptions } from '../../../../shared/form/builder/models/relationship-options.model'; -import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service'; -import { SearchResult } from '../../../../shared/search/models/search-result.model'; +import { + DsDynamicLookupRelationModalComponent +} from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component'; +import { + RelationshipOptions +} from '../../../../shared/form/builder/models/relationship-options.model'; +import { + SelectableListService +} from '../../../../shared/object-list/selectable-list/selectable-list.service'; +import { + ItemSearchResult +} from '../../../../shared/object-collection/shared/item-search-result.model'; import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model'; import { PaginatedList } from '../../../../core/data/paginated-list.model'; import { RemoteData } from '../../../../core/data/remote-data'; import { Collection } from '../../../../core/shared/collection.model'; -import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; +import { + PaginationComponentOptions +} from '../../../../shared/pagination/pagination-component-options.model'; import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service'; import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model'; import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model'; import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model'; import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface'; import { itemLinksToFollow } from '../../../../shared/utils/relation-query.utils'; +import { EditItemRelationshipsService } from '../edit-item-relationships.service'; +import { RequestParam } from '../../../../core/cache/models/request-param.model'; @Component({ selector: 'ds-edit-relationship-list', @@ -79,7 +104,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { /** * The event emmiter to submit the new information */ - @Output() submit: EventEmitter = new EventEmitter(); + @Output() submitModal: EventEmitter = new EventEmitter(); /** * Observable that emits the left and right item type of {@link relationshipType} simultaneously. @@ -90,9 +115,14 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { * Observable that emits true if {@link itemType} is on the left-hand side of {@link relationshipType}, * false if it is on the right-hand side and undefined in the rare case that it is on neither side. */ - private currentItemIsLeftItem$: Observable; + @Input() currentItemIsLeftItem$: BehaviorSubject = new BehaviorSubject(undefined); + + relatedEntityType$: Observable; - private relatedEntityType$: Observable; + /** + * The translation key for the entity type + */ + relationshipMessageKey$: Observable; /** * The list ID to save selected entities under @@ -149,10 +179,10 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { protected objectUpdatesService: ObjectUpdatesService, protected linkService: LinkService, protected relationshipService: RelationshipDataService, - protected relationshipTypeService: RelationshipTypeDataService, protected modalService: NgbModal, protected paginationService: PaginationService, protected selectableListService: SelectableListService, + protected editItemRelationshipsService: EditItemRelationshipsService, @Inject(APP_CONFIG) protected appConfig: AppConfig ) { this.fetchThumbnail = this.appConfig.browseBy.showThumbnails; @@ -162,11 +192,10 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { * Get the i18n message key for this relationship type */ public getRelationshipMessageKey(): Observable { - - return observableCombineLatest( + return observableCombineLatest([ this.getLabel(), this.relatedEntityType$, - ).pipe( + ]).pipe( map(([label, relatedEntityType]) => { if (hasValue(label) && label.indexOf('is') > -1 && label.indexOf('Of') > -1) { const relationshipLabel = `${label.substring(2, label.indexOf('Of'))}`; @@ -186,18 +215,15 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { * Get the relevant label for this relationship type */ private getLabel(): Observable { - return observableCombineLatest([ - this.relationshipType.leftType, - this.relationshipType.rightType, - ].map((itemTypeRD) => itemTypeRD.pipe( - getFirstSucceededRemoteData(), - getRemoteDataPayload(), - ))).pipe( - map((itemTypes: ItemType[]) => [ - this.relationshipType.leftwardType, - this.relationshipType.rightwardType, - ][itemTypes.findIndex((itemType) => itemType.id === this.itemType.id)]), - ); + return this.currentItemIsLeftItem$.pipe( + map((currentItemIsLeftItem) => { + if (currentItemIsLeftItem) { + return this.relationshipType.leftwardType; + } else { + return this.relationshipType.rightwardType; + } + }) + ); } /** @@ -207,11 +233,26 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { return update && update.field ? update.field.uuid : undefined; } + /** + * Check whether the current entity can have multiple relationships of this type + * This is based on the max cardinality of the relationship + * @private + */ + private isRepeatable(): boolean { + const isLeft = this.currentItemIsLeftItem$.getValue(); + if (isLeft) { + const leftMaxCardinality = this.relationshipType.leftMaxCardinality; + return hasNoValue(leftMaxCardinality) || leftMaxCardinality > 1; + } else { + const rightMaxCardinality = this.relationshipType.rightMaxCardinality; + return hasNoValue(rightMaxCardinality) || rightMaxCardinality > 1; + } + } + /** * Open the dynamic lookup modal to search for items to add as relationships */ openLookup() { - this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, { size: 'lg' }); @@ -225,6 +266,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { modalComp.toAdd = []; modalComp.toRemove = []; modalComp.isPending = false; + modalComp.repeatable = this.isRepeatable(); + modalComp.hiddenQuery = '-search.resourceid:' + this.item.uuid; this.item.owningCollection.pipe( getFirstSucceededRemoteDataPayload() @@ -232,11 +275,11 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { modalComp.collection = collection; }); - modalComp.select = (...selectableObjects: SearchResult[]) => { + modalComp.select = (...selectableObjects: ItemSearchResult[]) => { selectableObjects.forEach((searchResult) => { const relatedItem: Item = searchResult.indexableObject; - const foundIndex = modalComp.toRemove.findIndex( el => el.uuid === relatedItem.uuid); + const foundIndex = modalComp.toRemove.findIndex((itemSearchResult: ItemSearchResult) => itemSearchResult.indexableObject.uuid === relatedItem.uuid); if (foundIndex !== -1) { modalComp.toRemove.splice(foundIndex,1); @@ -253,14 +296,14 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { } } - this.loading$.next(true); + this.loading$.next(isNotEmpty(modalComp.toAdd) || isNotEmpty(modalComp.toRemove)); // emit the last page again to trigger a fieldupdates refresh this.relationshipsRd$.next(this.relationshipsRd$.getValue()); }); } }); }; - modalComp.deselect = (...selectableObjects: SearchResult[]) => { + modalComp.deselect = (...selectableObjects: ItemSearchResult[]) => { selectableObjects.forEach((searchResult) => { const relatedItem: Item = searchResult.indexableObject; @@ -271,57 +314,65 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { } else { modalComp.toRemove.push(searchResult); } + this.loading$.next(isNotEmpty(modalComp.toAdd) || isNotEmpty(modalComp.toRemove)); }); }; modalComp.submitEv = () => { - - const subscriptions = []; - - modalComp.toAdd.forEach((searchResult: SearchResult) => { - const relatedItem = searchResult.indexableObject; - subscriptions.push(this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe( - map((nameVariant) => { - const update = { - uuid: this.relationshipType.id + '-' + searchResult.indexableObject.uuid, - nameVariant, - type: this.relationshipType, - relatedItem, - } as RelationshipIdentifiable; - this.objectUpdatesService.saveAddFieldUpdate(this.url, update); - return update; - }) - )); - }); - - modalComp.toRemove.forEach( (searchResult) => { - subscriptions.push(this.relationshipService.getNameVariant(this.listId, searchResult.indexableObjectuuid).pipe( - switchMap((nameVariant) => { - return this.getRelationFromId(searchResult.indexableObject).pipe( - map( (relationship: Relationship) => { + modalComp.isPending = true; + const isLeft = this.currentItemIsLeftItem$.getValue(); + const addOperations = modalComp.toAdd.map((searchResult: ItemSearchResult) => ({ type: 'add', searchResult })); + const removeOperations = modalComp.toRemove.map((searchResult: ItemSearchResult) => ({ type: 'remove', searchResult })); + observableFrom([...addOperations, ...removeOperations]).pipe( + concatMap(({ type, searchResult }: { type: string, searchResult: ItemSearchResult }) => { + const relatedItem: Item = searchResult.indexableObject; + if (type === 'add') { + return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe( + switchMap((nameVariant) => { const update = { - uuid: relationship.id, + uuid: `${this.relationshipType.id}-${relatedItem.uuid}`, nameVariant, type: this.relationshipType, - relationship, + originalIsLeft: isLeft, + originalItem: this.item, + relatedItem, } as RelationshipIdentifiable; - this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update); - return update; - }) + return this.objectUpdatesService.saveAddFieldUpdate(this.url, update); + }), + take(1) ); - }) - )); - }); - - observableCombineLatest(subscriptions).subscribe( (res) => { - // Wait until the states changes since there are multiple items - setTimeout( () => { - this.submit.emit(); - },1000); - - modalComp.isPending = true; + } else if (type === 'remove') { + return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe( + switchMap((nameVariant) => { + return this.getRelationFromId(searchResult.indexableObject).pipe( + map( (relationship: Relationship) => { + const update = { + uuid: relationship.id, + nameVariant, + type: this.relationshipType, + originalIsLeft: isLeft, + originalItem: this.item, + relatedItem, + relationship, + } as RelationshipIdentifiable; + return this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update); + }), + ); + }), + take(1) + ); + } else { + return EMPTY; + } + }), + toArray(), + ).subscribe({ + complete: () => { + this.editItemRelationshipsService.submit(this.item, this.url); + this.submitModal.emit(); + } }); }; @@ -337,6 +388,11 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { modalComp.toAdd = []; modalComp.toRemove = []; + this.loading$.next(false); + }; + + modalComp.closeEv = () => { + this.loading$.next(false); }; this.relatedEntityType$ @@ -355,92 +411,15 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { } getRelationFromId(relatedItem) { - return this.currentItemIsLeftItem$.pipe( - take(1), - switchMap( isLeft => { - let apiCall; - if (isLeft) { - apiCall = this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, this.relationshipType.leftwardType ,[relatedItem.id] ).pipe( - getFirstSucceededRemoteData(), - getRemoteDataPayload(), - ); - } else { - apiCall = this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, this.relationshipType.rightwardType ,[relatedItem.id] ).pipe( - getFirstSucceededRemoteData(), - getRemoteDataPayload(), - ); - } - - return apiCall.pipe( - map( (res: PaginatedList) => res.page[0]) - ); - } - )); - } - - - - /** - * Get the existing field updates regarding a relationship with a given item - * @param relatedItem The item for which to get the existing field updates - */ - private getFieldUpdatesForRelatedItem(relatedItem: Item): Observable { - return this.updates$.pipe( - take(1), - map((updates) => Object.values(updates) - .map((update) => update.field as RelationshipIdentifiable) - .filter((field) => field.relationship) - ), - mergeMap((identifiables) => - observableCombineLatest( - identifiables.map((identifiable) => this.getRelatedItem(identifiable.relationship)) - ).pipe( - defaultIfEmpty([]), - map((relatedItems) => { - return identifiables.filter( (identifiable, index) => { - return relatedItems[index].uuid === relatedItem.uuid; - }); - } - ), - ) - ) - ); - } - - /** - * Check if the given item is related with the item we are editing relationships - * @param relatedItem The item for which to get the existing field updates - */ - private getIsRelatedItem(relatedItem: Item): Observable { - - return this.currentItemIsLeftItem$.pipe( - take(1), - map( isLeft => { - if (isLeft) { - const listOfRelatedItems = this.item.allMetadataValues( 'relation.' + this.relationshipType.leftwardType ); - return !!listOfRelatedItems.find( (uuid) => uuid === relatedItem.uuid ); - } else { - const listOfRelatedItems = this.item.allMetadataValues( 'relation.' + this.relationshipType.rightwardType ); - return !!listOfRelatedItems.find( (uuid) => uuid === relatedItem.uuid ); - } - }) - ); - } - - /** - * Get the related item for a given relationship - * @param relationship The relationship for which to get the related item - */ - private getRelatedItem(relationship: Relationship): Observable { - return this.relationshipService.isLeftItem(relationship, this.item).pipe( - switchMap((isLeftItem) => isLeftItem ? relationship.rightItem : relationship.leftItem), + const relationshipLabel = this.currentItemIsLeftItem$.getValue() ? this.relationshipType.leftwardType : this.relationshipType.rightwardType; + return this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, relationshipLabel ,[relatedItem.id] ).pipe( getFirstSucceededRemoteData(), getRemoteDataPayload(), - ) as Observable; + map( (res: PaginatedList) => res.page[0]) + ); } ngOnInit(): void { - // store the left and right type of the relationship in a single observable this.relationshipLeftAndRightType$ = observableCombineLatest([ this.relationshipType.leftType, @@ -451,8 +430,14 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { ))) as Observable<[ItemType, ItemType]>; this.relatedEntityType$ = this.relationshipLeftAndRightType$.pipe( - map((relatedTypes: ItemType[]) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)), - hasValueOperator() + map(([leftType, rightType]: [ItemType, ItemType]) => { + if (leftType.uuid !== this.itemType.uuid) { + return leftType; + } else { + return rightType; + } + }), + hasValueOperator(), ); this.relatedEntityType$.pipe( @@ -461,21 +446,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}` ); - this.currentItemIsLeftItem$ = this.relationshipLeftAndRightType$.pipe( - map(([leftType, rightType]: [ItemType, ItemType]) => { - if (leftType.id === this.itemType.id) { - return true; - } - - if (rightType.id === this.itemType.id) { - return false; - } - - // should never happen... - console.warn(`The item ${this.item.uuid} is not on the right or the left side of relationship type ${this.relationshipType.uuid}`); - return undefined; - }) - ); + this.relationshipMessageKey$ = this.getRelationshipMessageKey(); // initialize the pagination options @@ -493,29 +464,39 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { ); // this adds thumbnail images when required by configuration - let linksToFollow: FollowLinkConfig[] = itemLinksToFollow(this.fetchThumbnail); + let linksToFollow: FollowLinkConfig[] = itemLinksToFollow(this.fetchThumbnail, this.appConfig.item.showAccessStatuses); this.subs.push( observableCombineLatest([ currentPagination$, this.currentItemIsLeftItem$, + this.relatedEntityType$, ]).pipe( - switchMap(([currentPagination, currentItemIsLeftItem]: [PaginationComponentOptions, boolean]) => - // get the relationships for the current item, relationshiptype and page - this.relationshipService.getItemRelationshipsByLabel( + switchMap(([currentPagination, currentItemIsLeftItem, relatedEntityType]: [PaginationComponentOptions, boolean, ItemType]) => { + // get the relationships for the current page, item, relationship type and related entity type + return this.relationshipService.getItemRelationshipsByLabel( this.item, currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType, { elementsPerPage: currentPagination.pageSize, - currentPage: currentPagination.currentPage + currentPage: currentPagination.currentPage, + searchParams: [ + new RequestParam('relatedEntityType', relatedEntityType.label), + ], }, - false, + true, true, ...linksToFollow - )), - ).subscribe((rd: RemoteData>) => { - this.relationshipsRd$.next(rd); - }) + ); + }), + tap((rd: RemoteData>) => { + this.relationshipsRd$.next(rd); + }), + getAllSucceededRemoteData(), + getRemoteDataPayload(), + ).subscribe((relationshipPaginatedList: PaginatedList) => { + this.objectUpdatesService.initialize(this.url, relationshipPaginatedList.page, new Date()); + }), ); // keep isLastPage$ up to date based on relationshipsRd$ @@ -537,10 +518,24 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { this.relationshipService.isLeftItem(relationship, this.item).pipe( // emit an array containing both the relationship and whether it's the left item, // as we'll need both - map((isLeftItem: boolean) => [relationship, isLeftItem]) - ) + switchMap((isLeftItem: boolean) => { + if (isLeftItem) { + return relationship.rightItem.pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload(), + map((relatedItem: Item) => [relationship, isLeftItem, relatedItem]), + ); + } else { + return relationship.leftItem.pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload(), + map((relatedItem: Item) => [relationship, isLeftItem, relatedItem]), + ); + } + }), + ), ), - map(([relationship, isLeftItem]: [Relationship, boolean]) => { + map(([relationship, isLeftItem, relatedItem]: [Relationship, boolean, Item]) => { // turn it into a RelationshipIdentifiable, an const nameVariant = isLeftItem ? relationship.rightwardValue : relationship.leftwardValue; @@ -548,6 +543,9 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { uuid: relationship.id, type: this.relationshipType, relationship, + originalIsLeft: isLeftItem, + originalItem: this.item, + relatedItem: relatedItem, nameVariant, } as RelationshipIdentifiable; }), diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html index e65cd237a34..8cd86d597b8 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html @@ -9,12 +9,12 @@
- - - - + +
+ +
+
+
+
- - -
- -
- - - -
-
- - - -
+
+
+
+
- -
+ + + + {{ 'item.edit.relationships.no-entity-type' | translate }} + + + + + + + + +
+ + + +
+ 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 aa711c8ea31..4f7f1a86c6d 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 @@ -2,9 +2,7 @@ import { ChangeDetectorRef, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { getTestScheduler } from 'jasmine-marbles'; import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs'; -import { TestScheduler } from 'rxjs/testing'; import { ObjectCacheService } from '../../../core/cache/object-cache.service'; import { RestResponse } from '../../../core/cache/response.models'; import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; @@ -29,6 +27,8 @@ import { RelationshipTypeDataService } from '../../../core/data/relationship-typ import { relationshipTypes } from '../../../shared/testing/relationship-types.mock'; import { ThemeService } from '../../../shared/theme-support/theme.service'; import { getMockThemeService } from '../../../shared/mocks/theme-service.mock'; +import { ItemDataServiceStub } from '../../../shared/testing/item-data.service.stub'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; let comp: any; let fixture: ComponentFixture; @@ -52,12 +52,11 @@ const notificationsService = jasmine.createSpyObj('notificationsService', const router = new RouterStub(); let relationshipTypeService; let routeStub; -let itemService; +let itemService: ItemDataServiceStub; const url = 'http://test-url.com/test-url'; router.url = url; -let scheduler: TestScheduler; let item; let author1; let author2; @@ -137,10 +136,7 @@ describe('ItemRelationshipsComponent', () => { changeType: FieldChangeType.REMOVE }; - itemService = jasmine.createSpyObj('itemService', { - findByHref: createSuccessfulRemoteDataObject$(item), - findById: createSuccessfulRemoteDataObject$(item) - }); + itemService = new ItemDataServiceStub(); routeStub = { data: observableOf({}), parent: { @@ -208,9 +204,8 @@ describe('ItemRelationshipsComponent', () => { } ); - scheduler = getTestScheduler(); TestBed.configureTestingModule({ - imports: [SharedModule, TranslateModule.forRoot()], + imports: [NoopAnimationsModule, SharedModule, TranslateModule.forRoot()], declarations: [ItemRelationshipsComponent], providers: [ { provide: ThemeService, useValue: getMockThemeService() }, @@ -232,6 +227,8 @@ describe('ItemRelationshipsComponent', () => { })); beforeEach(() => { + spyOn(itemService, 'findByHref').and.returnValue(item); + spyOn(itemService, 'findById').and.returnValue(item); fixture = TestBed.createComponent(ItemRelationshipsComponent); comp = fixture.componentInstance; de = fixture.debugElement; @@ -266,7 +263,7 @@ describe('ItemRelationshipsComponent', () => { }); it('it should delete the correct relationship', () => { - expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationships[1].uuid, 'left'); + expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationships[1].uuid, 'left', false); }); }); 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 8f7c43e79ff..b893e42bd39 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 @@ -1,11 +1,14 @@ import { ChangeDetectorRef, Component } from '@angular/core'; -import { Item } from '../../../core/shared/item.model'; + + +import { + map, + distinctUntilChanged +} from 'rxjs/operators'; import { - DeleteRelationship, - RelationshipIdentifiable, -} from '../../../core/data/object-updates/object-updates.reducer'; -import { map, startWith, switchMap, take } from 'rxjs/operators'; -import { combineLatest as observableCombineLatest, of as observableOf, zip as observableZip, Observable } from 'rxjs'; + Observable, + BehaviorSubject +} from 'rxjs'; import { followLink } from '../../../shared/utils/follow-link-config.model'; import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component'; import { ItemDataService } from '../../../core/data/item-data.service'; @@ -14,22 +17,18 @@ import { ActivatedRoute, Router } from '@angular/router'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; import { RelationshipDataService } from '../../../core/data/relationship-data.service'; -import { RemoteData } from '../../../core/data/remote-data'; import { ObjectCacheService } from '../../../core/cache/object-cache.service'; import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators'; import { RequestService } from '../../../core/data/request.service'; import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model'; import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; import { EntityTypeDataService } from '../../../core/data/entity-type-data.service'; -import { Relationship } from '../../../core/shared/item-relationships/relationship.model'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { hasValue } from '../../../shared/empty.util'; -import { FieldUpdate } from '../../../core/data/object-updates/field-update.model'; -import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model'; -import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model'; import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service'; import { PaginatedList } from '../../../core/data/paginated-list.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { EditItemRelationshipsService } from './edit-item-relationships.service'; +import { compareArraysUsingIds } from '../../simple/item-types/shared/item-relationships-utils'; +import { AlertType } from '../../../shared/alert/alert-type'; @Component({ selector: 'ds-item-relationships', @@ -50,7 +49,13 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent { /** * The item's entity type as an observable */ - entityType$: Observable; + entityType$: BehaviorSubject = new BehaviorSubject(undefined); + + get isSaving$(): BehaviorSubject { + return this.editItemRelationshipsService.isSaving$; + } + + readonly AlertType = AlertType; constructor( public itemService: ItemDataService, @@ -66,6 +71,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent { protected relationshipTypeService: RelationshipTypeDataService, public cdr: ChangeDetectorRef, protected modalService: NgbModal, + protected editItemRelationshipsService: EditItemRelationshipsService, ) { super(itemService, objectUpdatesService, router, notificationsService, translateService, route); } @@ -79,16 +85,17 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent { if (label !== undefined) { this.relationshipTypes$ = this.relationshipTypeService.searchByEntityType(label, true, true, ...this.getRelationshipTypeFollowLinks()) .pipe( - map((relationshipTypes: PaginatedList) => relationshipTypes.page) + map((relationshipTypes: PaginatedList) => relationshipTypes.page), + distinctUntilChanged(compareArraysUsingIds()) ); - this.entityType$ = this.entityTypeService.getEntityTypeByLabel(label).pipe( + this.entityTypeService.getEntityTypeByLabel(label).pipe( getFirstSucceededRemoteData(), getRemoteDataPayload(), - ); + ).subscribe((type) => this.entityType$.next(type)); } else { - this.entityType$ = observableOf(undefined); + this.entityType$.next(undefined); } } @@ -104,127 +111,24 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent { * Make sure the lists are refreshed afterwards and notifications are sent for success and errors */ public submit(): void { - - // Get all the relationships that should be removed - const removedRelationshipIDs$: Observable = this.relationshipService.getItemRelationshipsArray(this.item).pipe( - startWith([]), - map((relationships: Relationship[]) => relationships.map((relationship) => - Object.assign(new Relationship(), relationship, { uuid: relationship.id }) - )), - switchMap((relationships: Relationship[]) => { - return this.objectUpdatesService.getFieldUpdatesExclusive(this.url, relationships) as Observable; - }), - map((fieldUpdates: FieldUpdates) => - Object.values(fieldUpdates) - .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE) - .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as DeleteRelationship) - ), - ); - - const addRelatedItems$: Observable = this.objectUpdatesService.getFieldUpdates(this.url, []).pipe( - map((fieldUpdates: FieldUpdates) => - Object.values(fieldUpdates) - .filter((fieldUpdate: FieldUpdate) => hasValue(fieldUpdate)) - .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.ADD) - .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as RelationshipIdentifiable) - ), - ); - - observableCombineLatest( - removedRelationshipIDs$, - addRelatedItems$, - ).pipe( - take(1), - ).subscribe(([removeRelationshipIDs, addRelatedItems]) => { - const actions = [ - this.deleteRelationships(removeRelationshipIDs), - this.addRelationships(addRelatedItems), - ]; - actions.forEach((action) => - action.subscribe((response) => { - if (response.length > 0) { - this.initializeOriginalFields(); - this.cdr.detectChanges(); - this.displayNotifications(response); - this.modalService.dismissAll(); - } - }) - ); - }); - } - - deleteRelationships(deleteRelationshipIDs: DeleteRelationship[]): Observable[]> { - return observableZip(...deleteRelationshipIDs.map((deleteRelationship) => { - let copyVirtualMetadata: string; - if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) { - copyVirtualMetadata = 'all'; - } else if (deleteRelationship.keepLeftVirtualMetadata) { - copyVirtualMetadata = 'left'; - } else if (deleteRelationship.keepRightVirtualMetadata) { - copyVirtualMetadata = 'right'; - } else { - copyVirtualMetadata = 'none'; - } - return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata); - } - )); + this.editItemRelationshipsService.submit(this.item, this.url); } - addRelationships(addRelatedItems: RelationshipIdentifiable[]): Observable[]> { - return observableZip(...addRelatedItems.map((addRelationship) => - this.entityType$.pipe( - switchMap((entityType) => this.entityTypeService.isLeftType(addRelationship.type, entityType)), - switchMap((isLeftType) => { - let leftItem: Item; - let rightItem: Item; - let leftwardValue: string; - let rightwardValue: string; - if (isLeftType) { - leftItem = this.item; - rightItem = addRelationship.relatedItem; - leftwardValue = null; - rightwardValue = addRelationship.nameVariant; - } else { - leftItem = addRelationship.relatedItem; - rightItem = this.item; - leftwardValue = addRelationship.nameVariant; - rightwardValue = null; - } - return this.relationshipService.addRelationship(addRelationship.type.id, leftItem, rightItem, leftwardValue, rightwardValue); - }), - ) - )); - } - - /** - * Display notifications - * - Error notification for each failed response with their message - * - Success notification in case there's at least one successful response - * @param responses - */ - displayNotifications(responses: RemoteData[]) { - const failedResponses = responses.filter((response: RemoteData) => response.hasFailed); - const successfulResponses = responses.filter((response: RemoteData) => response.hasSucceeded); - - failedResponses.forEach((response: RemoteData) => { - this.notificationsService.error(this.getNotificationTitle('failed'), response.errorMessage); - }); - if (successfulResponses.length > 0) { - this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved')); - } - } /** * Sends all initial values of this item to the object updates service */ public initializeOriginalFields() { - return this.relationshipService.getRelatedItems(this.item).pipe( - take(1), - ).subscribe((items: Item[]) => { - this.objectUpdatesService.initialize(this.url, items, this.item.lastModified); - }); + return this.editItemRelationshipsService.initializeOriginalFields(this.item, this.url); } + /** + * Method to prevent unnecessary for loop re-rendering + */ + trackById(index: number, relationshipType: RelationshipType): string { + return relationshipType.id; + } + getRelationshipTypeFollowLinks() { return [ followLink('leftType'), diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html index 155b9478043..766e61aa068 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.html +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html @@ -1,28 +1,28 @@

{{'item.edit.tabs.status.description' | translate}}

-
-
+
+
{{'item.edit.tabs.status.labels.' + statusKey | translate}}:
-
+
{{statusData[statusKey]}}
-
+
-
+
{{identifier.identifierType.toLocaleUpperCase()}}
-
{{identifier.value}} +
{{identifier.value}} ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
-
+
{{'item.edit.tabs.status.labels.itemPage' | translate}}:
-
+ 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 3397742f5b0..1b7bff30e8b 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 @@ -74,7 +74,7 @@ describe('ItemWithdrawComponent', () => { }); it('should render a page with messages based on the \'withdraw\' messageKey', () => { - const header = fixture.debugElement.query(By.css('h2')).nativeElement; + const header = fixture.debugElement.query(By.css('h1')).nativeElement; expect(header.innerHTML).toContain('item.edit.withdraw.header'); const description = fixture.debugElement.query(By.css('p')).nativeElement; expect(description.innerHTML).toContain('item.edit.withdraw.description'); diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html index b5757d1859a..67249b085ad 100644 --- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html +++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html @@ -1,7 +1,7 @@
-

{{headerMessage | translate: {id: item.handle} }}

+

{{headerMessage | translate: {id: item.handle} }}

{{descriptionMessage | translate}}

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 9a19837665c..b7d64787264 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 @@ -111,7 +111,7 @@ describe('AbstractSimpleItemActionComponent', () => { }); it('should render a page with messages based on the provided messageKey', () => { - const header = fixture.debugElement.query(By.css('h2')).nativeElement; + const header = fixture.debugElement.query(By.css('h1')).nativeElement; expect(header.innerHTML).toContain('item.edit.myEditAction.header'); const description = fixture.debugElement.query(By.css('p')).nativeElement; diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html index b83b93d8f10..927f7dbb48d 100644 --- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html +++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html @@ -5,9 +5,9 @@
- -
+
- + -
+
{{metadata.metadataField}}
@@ -31,7 +31,7 @@
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 9391df4755c..b835031e30e 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 @@ -61,6 +61,7 @@ describe('VirtualMetadataComponent', () => { comp.url = url; comp.leftItem = item; comp.rightItem = relatedItem; + comp.ngOnChanges(); comp.relationshipId = relationshipId; fixture.detectChanges(); 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 6f8991dc732..7b66f400103 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 @@ -1,9 +1,18 @@ -import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core'; -import {Observable} from 'rxjs'; +import { Component, EventEmitter, Inject, Input, OnInit, Output, OnChanges, OnDestroy } from '@angular/core'; +import { Observable, Subscription, BehaviorSubject } from 'rxjs'; import {Item} from '../../../core/shared/item.model'; import {MetadataValue} from '../../../core/shared/metadata.models'; import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service'; import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface'; +import { hasValue } from '../../../shared/empty.util'; + +interface ItemDTO { + + item: Item; + + isSelectedVirtualMetadataItem$: Observable; + +} @Component({ selector: 'ds-virtual-metadata', @@ -14,7 +23,7 @@ import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface'; * The component is shown when a relationship is marked to be deleted. * Each item has a checkbox to indicate whether its virtual metadata should be saved as real metadata. */ -export class VirtualMetadataComponent implements OnInit { +export class VirtualMetadataComponent implements OnInit, OnChanges, OnDestroy { /** * The current url of this page @@ -55,9 +64,9 @@ export class VirtualMetadataComponent implements OnInit { /** * Get an array of the left and the right item of the relationship to be deleted. */ - get items() { - return [this.leftItem, this.rightItem]; - } + itemDTOs$: BehaviorSubject = new BehaviorSubject([]); + + subs: Subscription[] = []; public virtualMetadata: Map = new Map(); @@ -109,14 +118,33 @@ export class VirtualMetadataComponent implements OnInit { /** * Prevent unnecessary rerendering so fields don't lose focus */ - trackItem(index, item: Item) { - return item && item.uuid; + trackItemDTO(index, itemDTO: ItemDTO): string { + return itemDTO?.item?.uuid; } ngOnInit(): void { - this.items.forEach((item) => { - this.virtualMetadata.set(item.uuid, this.getVirtualMetadata(item)); - }); + this.subs.push(this.itemDTOs$.subscribe((itemDTOs: ItemDTO[]) => { + itemDTOs.forEach((itemDTO: ItemDTO) => this.virtualMetadata.set(itemDTO.item.uuid, this.getVirtualMetadata(itemDTO.item))); + })); + } + + ngOnChanges(): void { + if (hasValue(this.leftItem) && hasValue(this.rightItem)) { + this.itemDTOs$.next([ + { + item: this.leftItem, + isSelectedVirtualMetadataItem$: this.isSelectedVirtualMetadataItem(this.leftItem), + }, + { + item: this.rightItem, + isSelectedVirtualMetadataItem$: this.isSelectedVirtualMetadataItem(this.rightItem), + }, + ]); + } + } + + ngOnDestroy(): void { + this.subs.forEach((sub: Subscription) => sub.unsubscribe()); } } diff --git a/src/app/item-page/field-components/collections/collections.component.html b/src/app/item-page/field-components/collections/collections.component.html index 27ebb41d611..dfa22237ae7 100644 --- a/src/app/item-page/field-components/collections/collections.component.html +++ b/src/app/item-page/field-components/collections/collections.component.html @@ -1,6 +1,6 @@
- + {{ dsoNameService.getName(collection) }}
@@ -15,6 +15,7 @@ class="load-more-btn btn btn-sm btn-outline-secondary" role="button" href="javascript:void(0);" + tabindex="0" > {{'item.page.collections.load-more' | translate}} diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html index 9091beb6c7d..5e575e63b5f 100644 --- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html +++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html @@ -1,5 +1,5 @@ - + {{ linktext || mdValue.value }} 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 f869ab8aaf8..56a51b01fe2 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 @@ -73,6 +73,13 @@ describe('MetadataUriValuesComponent', () => { expect(separators.length).toBe(mockMetadata.length - 1); }); + it('should contain the correct target attribute for metadata links', () => { + const links = fixture.debugElement.queryAll(By.css('a')); + for (const link of links) { + expect(link.nativeElement.getAttribute('target')).toBe('_blank'); + } + }); + describe('when linktext is defined', () => { beforeEach(() => { 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 e070eccf2d5..5a024bfb306 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 @@ -37,4 +37,10 @@ export class MetadataUriValuesComponent extends MetadataValuesComponent { * The label for this iteration of metadata values */ @Input() label: string; + + /** + * The target attribute for the metadata links. + * Defaults to '_blank' to open links in a new window/tab. + */ + @Input() linkTarget = '_blank'; } diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html index 61088edd164..de6f4139941 100644 --- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html +++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html @@ -18,7 +18,12 @@ - + {{value}} @@ -32,7 +37,5 @@ - {{value}} - + [queryParams]="getQueryParams(value)" role="link" tabindex="0">{{value}} 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 23f80982077..de46cd9e4c8 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 @@ -73,4 +73,20 @@ describe('MetadataValuesComponent', () => { expect(comp.hasLink(mdValue)).toBe(true); }); + it('should return correct target and rel for internal links', () => { + spyOn(comp, 'hasInternalLink').and.returnValue(true); + const urlValue = '/internal-link'; + const result = comp.getLinkAttributes(urlValue); + expect(result.target).toBe('_self'); + expect(result.rel).toBe(''); + }); + + it('should return correct target and rel for external links', () => { + spyOn(comp, 'hasInternalLink').and.returnValue(false); + const urlValue = 'https://www.dspace.org'; + const result = comp.getLinkAttributes(urlValue); + expect(result.target).toBe('_blank'); + expect(result.rel).toBe('noopener noreferrer'); + }); + }); 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 cbbae9006da..a902e48ed1d 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 @@ -4,6 +4,7 @@ import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface'; import { BrowseDefinition } from '../../../core/shared/browse-definition.model'; import { hasValue } from '../../../shared/empty.util'; import { VALUE_LIST_BROWSE_DEFINITION } from '../../../core/shared/value-list-browse-definition.resource-type'; +import { environment } from '../../../../environments/environment'; /** * This component renders the configured 'values' into the ds-metadata-field-wrapper component. @@ -90,4 +91,25 @@ export class MetadataValuesComponent implements OnChanges { } return queryParams; } + + /** + * Checks if the given link value is an internal link. + * @param linkValue - The link value to check. + * @returns True if the link value starts with the base URL defined in the environment configuration, false otherwise. + */ + hasInternalLink(linkValue: string): boolean { + return linkValue.startsWith(environment.ui.baseUrl); + } + + /** + * This method performs a validation and determines the target of the url. + * @returns - Returns the target url. + */ + getLinkAttributes(urlValue: string): { target: string, rel: string } { + if (this.hasInternalLink(urlValue)) { + return { target: '_self', rel: '' }; + } else { + return { target: '_blank', rel: 'noopener noreferrer' }; + } + } } diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.html b/src/app/item-page/full/field-components/file-section/full-file-section.component.html index 8b8603011d5..d4b58742c4f 100644 --- a/src/app/item-page/full/field-components/file-section/full-file-section.component.html +++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.html @@ -1,12 +1,11 @@
-
{{"item.page.filesection.original.bundle" | translate}}
+

{{"item.page.filesection.original.bundle" | translate}}

@@ -44,12 +43,11 @@
{{"item.page.filesection.original.bundle"
-
{{"item.page.filesection.license.bundle" | translate}}
+

{{"item.page.filesection.license.bundle" | translate}}

diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html index f92724a8028..d7a11fab6d6 100644 --- a/src/app/item-page/full/full-item-page.component.html +++ b/src/app/item-page/full/full-item-page.component.html @@ -11,7 +11,6 @@
-
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 bf41bd5d807..9d6b7010af5 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 @@ -15,7 +15,6 @@ import { BehaviorSubject, of, of as observableOf } from 'rxjs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { By } from '@angular/platform-browser'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; -import { AuthService } from '../../core/auth/auth.service'; import { createPaginatedList } from '../../shared/testing/utils.test'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec'; @@ -66,7 +65,6 @@ describe('FullItemPageComponent', () => { let fixture: ComponentFixture; let registryService: RegistryService; let translateService: TranslateService; - let authService: AuthService; let routeStub: ActivatedRouteStub; let routeData; let authorizationDataService: AuthorizationDataService; @@ -87,11 +85,6 @@ describe('FullItemPageComponent', () => { }; beforeEach(waitForAsync(() => { - authService = jasmine.createSpyObj('authService', { - isAuthenticated: observableOf(true), - setRedirectUrl: {} - }); - routeData = { dso: createSuccessfulRemoteDataObject(mockItem), }; @@ -150,7 +143,6 @@ describe('FullItemPageComponent', () => { { provide: ActivatedRoute, useValue: routeStub }, { provide: ItemDataService, useValue: {} }, { provide: MetadataService, useValue: metadataServiceStub }, - { provide: AuthService, useValue: authService }, { provide: AuthorizationDataService, useValue: authorizationDataService }, { provide: ServerResponseService, useValue: serverResponseService }, { provide: SignpostingDataService, useValue: signpostingDataService }, 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 464081d37b8..f4313a06285 100644 --- a/src/app/item-page/full/full-item-page.component.ts +++ b/src/app/item-page/full/full-item-page.component.ts @@ -13,7 +13,6 @@ import { Item } from '../../core/shared/item.model'; import { fadeInOut } from '../../shared/animations/fade'; import { hasValue } from '../../shared/empty.util'; -import { AuthService } from '../../core/auth/auth.service'; import { Location } from '@angular/common'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { ServerResponseService } from '../../core/services/server-response.service'; @@ -55,7 +54,6 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit, protected route: ActivatedRoute, protected router: Router, protected items: ItemDataService, - protected authService: AuthService, protected authorizationService: AuthorizationDataService, protected _location: Location, protected responseService: ServerResponseService, @@ -65,7 +63,7 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit, protected halService: HALEndpointService, protected registryService: RegistryService ) { - super(route, router, items, authService, authorizationService, responseService, signpostingDataService, linkHeadService, platformId, registryService, halService); + super(route, router, items, authorizationService, responseService, signpostingDataService, linkHeadService, platformId, registryService, halService); } /*** AoT inheritance fix, will hopefully be resolved in the near future **/ diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts index c0e1c76036a..c18ec60b3e8 100644 --- a/src/app/item-page/item-page-routing.module.ts +++ b/src/app/item-page/item-page-routing.module.ts @@ -26,6 +26,7 @@ import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths'; import { OrcidPageComponent } from './orcid-page/orcid-page.component'; import { OrcidPageGuard } from './orcid-page/orcid-page.guard'; import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; +import { ViewTrackerResolverService } from '../statistics/angulartics/dspace/view-tracker-resolver.service'; import { ClarinZipDownloadPageComponent } from '../bitstream-page/clarin-zip-download-page/clarin-zip-download-page.component'; @@ -38,7 +39,6 @@ import { resolve: { dso: ItemPageResolver, breadcrumb: ItemBreadcrumbResolver, - menu: DSOEditMenuResolver }, runGuardsAndResolvers: 'always', children: [ @@ -46,10 +46,18 @@ import { path: '', component: ThemedItemPageComponent, pathMatch: 'full', + resolve: { + menu: DSOEditMenuResolver, + tracking: ViewTrackerResolverService, + }, }, { path: 'full', component: ThemedFullItemPageComponent, + resolve: { + menu: DSOEditMenuResolver, + tracking: ViewTrackerResolverService, + }, }, { path: ITEM_EDIT_PATH, @@ -149,7 +157,8 @@ import { LinkService, ItemPageAdministratorGuard, VersionResolver, - OrcidPageGuard + OrcidPageGuard, + ViewTrackerResolverService, ] }) diff --git a/src/app/item-page/item-page.resolver.spec.ts b/src/app/item-page/item-page.resolver.spec.ts index 533f97d0c0e..f22eba57328 100644 --- a/src/app/item-page/item-page.resolver.spec.ts +++ b/src/app/item-page/item-page.resolver.spec.ts @@ -3,14 +3,15 @@ import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { DSpaceObject } from '../core/shared/dspace-object.model'; import { MetadataValueFilter } from '../core/shared/metadata.models'; import { first } from 'rxjs/operators'; -import { Router } from '@angular/router'; +import { Router, RouterModule } from '@angular/router'; import { TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; +import { AuthServiceStub } from '../shared/testing/auth-service.stub'; +import { AuthService } from '../core/auth/auth.service'; describe('ItemPageResolver', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([{ + imports: [RouterModule.forRoot([{ path: 'entities/:entity-type/:id', component: {} as any }])] @@ -21,7 +22,8 @@ describe('ItemPageResolver', () => { let resolver: ItemPageResolver; let itemService: any; let store: any; - let router: any; + let router: Router; + let authService: AuthServiceStub; const uuid = '1234-65487-12354-1235'; let item: DSpaceObject; @@ -41,7 +43,8 @@ describe('ItemPageResolver', () => { store = jasmine.createSpyObj('store', { dispatch: {}, }); - resolver = new ItemPageResolver(itemService, store, router); + authService = new AuthServiceStub(); + resolver = new ItemPageResolver(itemService, store, router, authService as unknown as AuthService); }); it('should redirect to the correct route for the entity type', (done) => { diff --git a/src/app/item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts index e9b287406e0..e3c1703e065 100644 --- a/src/app/item-page/item-page.resolver.ts +++ b/src/app/item-page/item-page.resolver.ts @@ -9,6 +9,8 @@ import { map } from 'rxjs/operators'; import { hasValue } from '../shared/empty.util'; import { getItemPageRoute } from './item-page-routing-paths'; import { ItemResolver } from './item.resolver'; +import { redirectOn4xx } from '../core/shared/authorized.operators'; +import { AuthService } from '../core/auth/auth.service'; /** * This class represents a resolver that requests a specific item before the route is activated and will redirect to the @@ -19,7 +21,8 @@ export class ItemPageResolver extends ItemResolver { constructor( protected itemService: ItemDataService, protected store: Store, - protected router: Router + protected router: Router, + protected authService: AuthService, ) { super(itemService, store, router); } @@ -33,6 +36,7 @@ export class ItemPageResolver extends ItemResolver { */ resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> { return super.resolve(route, state).pipe( + redirectOn4xx(this.router, this.authService), map((rd: RemoteData) => { if (rd.hasSucceeded && hasValue(rd.payload)) { const thisRoute = state.url; diff --git a/src/app/item-page/item.resolver.ts b/src/app/item-page/item.resolver.ts index ca6a6c5958c..ffeef57ecb0 100644 --- a/src/app/item-page/item.resolver.ts +++ b/src/app/item-page/item.resolver.ts @@ -8,20 +8,27 @@ import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { Store } from '@ngrx/store'; import { ResolvedAction } from '../core/resolving/resolver.actions'; +import { environment } from '../../environments/environment'; /** * The self links defined in this list are expected to be requested somewhere in the near future * Requesting them as embeds will limit the number of requests */ -export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig[] = [ - followLink('owningCollection', {}, - followLink('parentCommunity', {}, - followLink('parentCommunity')) - ), - followLink('relationships'), - followLink('version', {}, followLink('versionhistory')), - followLink('thumbnail') -]; +export function getItemPageLinksToFollow(): FollowLinkConfig[] { + const followLinks: FollowLinkConfig[] = [ + followLink('owningCollection', {}, + followLink('parentCommunity', {}, + followLink('parentCommunity')) + ), + followLink('relationships'), + followLink('version', {}, followLink('versionhistory')), + followLink('thumbnail'), + ]; + if (environment.item.showAccessStatuses) { + followLinks.push(followLink('accessStatus')); + } + return followLinks; +} /** * This class represents a resolver that requests a specific item before the route is activated @@ -46,7 +53,7 @@ export class ItemResolver implements Resolve> { const itemRD$ = this.itemService.findById(route.params.id, true, false, - ...ITEM_PAGE_LINKS_TO_FOLLOW + ...getItemPageLinksToFollow(), ).pipe( getFirstCompletedRemoteData(), ); diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html index 32176808153..a64b4ce5489 100644 --- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html +++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html @@ -19,7 +19,7 @@
- - - + + 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 0c170ac8cf2..6de0d82595b 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 @@ -139,9 +139,9 @@ describe('MediaViewerComponent', () => { expect(mediaItem.thumbnail).toBe(null); }); - it('should display a default, thumbnail', () => { + it('should display a default thumbnail', () => { const defaultThumbnail = fixture.debugElement.query( - By.css('ds-themed-media-viewer-image') + By.css('ds-themed-thumbnail') ); expect(defaultThumbnail.nativeElement).toBeDefined(); }); 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 242e50646e3..5a17c4f01b4 100644 --- a/src/app/item-page/media-viewer/media-viewer.component.ts +++ b/src/app/item-page/media-viewer/media-viewer.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; import { filter, take } from 'rxjs/operators'; import { BitstreamDataService } from '../../core/data/bitstream-data.service'; @@ -42,6 +42,7 @@ export class MediaViewerComponent implements OnDestroy, OnInit { constructor( protected bitstreamDataService: BitstreamDataService, + protected changeDetectorRef: ChangeDetectorRef ) { } @@ -85,6 +86,7 @@ export class MediaViewerComponent implements OnDestroy, OnInit { })); } this.isLoading = false; + this.changeDetectorRef.detectChanges(); })); } })); diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html index e57ce330089..0ba2c87011c 100644 --- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html +++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html @@ -1,18 +1,18 @@
-

{{'person.orcid.registry.auth' | translate}}

- +

{{'person.orcid.registry.auth' | translate}}

+
-
+
{{ 'person.page.orcid.granted-authorizations'| translate }}
    -
  • +
  • {{getAuthorizationDescription(auth) | translate}}
@@ -25,13 +25,13 @@

{{'person.orcid.registry.auth' | translate}}

{{ 'person.page.orcid.missing-authorizations'| translate }}
- + {{'person.page.orcid.no-missing-authorizations-message' | translate}} - + {{'person.page.orcid.missing-authorizations-message' | translate}}
    -
  • +
  • {{getAuthorizationDescription(auth) | translate }}
@@ -41,20 +41,20 @@

{{'person.orcid.registry.auth' | translate}}

- + {{ 'person.page.orcid.remove-orcid-message' | translate}} -
+
- @@ -68,7 +68,7 @@

{{'person.orcid.registry.auth' | translate}}

orcid-logo
- {{ getOrcidNotLinkedMessage() | async }} + {{ getOrcidNotLinkedMessage() }}
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 ea970e7d315..59da0d4fe61 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 @@ -1,8 +1,8 @@ import { Component, EventEmitter, Inject, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { BehaviorSubject, Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { BehaviorSubject, Observable, of } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service'; import { Item } from '../../../core/shared/item.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; @@ -10,6 +10,9 @@ import { RemoteData } from '../../../core/data/remote-data'; import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service'; +import { createFailedRemoteDataObject } from '../../../shared/remote-data.utils'; +import { HttpErrorResponse } from '@angular/common/http'; +import { AlertType } from '../../../shared/alert/alert-type'; @Component({ selector: 'ds-orcid-auth', @@ -26,43 +29,49 @@ export class OrcidAuthComponent implements OnInit, OnChanges { /** * The list of exposed orcid authorization scopes for the orcid profile */ - profileAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]); + profileAuthorizationScopes$: BehaviorSubject = new BehaviorSubject([]); + + hasOrcidAuthorizations$: Observable; /** * The list of all orcid authorization scopes missing in the orcid profile */ - missingAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]); + missingAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]); + + hasMissingOrcidAuthorizations$: Observable; /** * The list of all orcid authorization scopes available */ - orcidAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]); + orcidAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]); /** * A boolean representing if unlink operation is processing */ - unlinkProcessing: BehaviorSubject = new BehaviorSubject(false); + unlinkProcessing: BehaviorSubject = new BehaviorSubject(false); /** * A boolean representing if orcid profile is linked */ - private isOrcidLinked$: BehaviorSubject = new BehaviorSubject(false); + isOrcidLinked$: BehaviorSubject = new BehaviorSubject(false); /** * A boolean representing if only admin can disconnect orcid profile */ - private onlyAdminCanDisconnectProfileFromOrcid$: BehaviorSubject = new BehaviorSubject(false); + onlyAdminCanDisconnectProfileFromOrcid$: BehaviorSubject = new BehaviorSubject(false); /** * A boolean representing if owner can disconnect orcid profile */ - private ownerCanDisconnectProfileFromOrcid$: BehaviorSubject = new BehaviorSubject(false); + ownerCanDisconnectProfileFromOrcid$: BehaviorSubject = new BehaviorSubject(false); /** * An event emitted when orcid profile is unliked successfully */ @Output() unlink: EventEmitter = new EventEmitter(); + readonly AlertType = AlertType; + constructor( private orcidAuthService: OrcidAuthService, private translateService: TranslateService, @@ -76,6 +85,8 @@ export class OrcidAuthComponent implements OnInit, OnChanges { this.orcidAuthorizationScopes.next(scopes); this.initOrcidAuthSettings(); }); + this.hasOrcidAuthorizations$ = this.hasOrcidAuthorizations(); + this.hasMissingOrcidAuthorizations$ = this.hasMissingOrcidAuthorizations(); } ngOnChanges(changes: SimpleChanges): void { @@ -88,18 +99,11 @@ export class OrcidAuthComponent implements OnInit, OnChanges { * Check if the list of exposed orcid authorization scopes for the orcid profile has values */ hasOrcidAuthorizations(): Observable { - return this.profileAuthorizationScopes.asObservable().pipe( + return this.profileAuthorizationScopes$.pipe( map((scopes: string[]) => scopes.length > 0) ); } - /** - * Return the list of exposed orcid authorization scopes for the orcid profile - */ - getOrcidAuthorizations(): Observable { - return this.profileAuthorizationScopes.asObservable(); - } - /** * Check if the list of exposed orcid authorization scopes for the orcid profile has values */ @@ -109,26 +113,12 @@ export class OrcidAuthComponent implements OnInit, OnChanges { ); } - /** - * Return the list of exposed orcid authorization scopes for the orcid profile - */ - getMissingOrcidAuthorizations(): Observable { - return this.profileAuthorizationScopes.asObservable(); - } - - /** - * Return a boolean representing if orcid profile is linked - */ - isLinkedToOrcid(): Observable { - return this.isOrcidLinked$.asObservable(); - } - - getOrcidNotLinkedMessage(): Observable { + getOrcidNotLinkedMessage(): string { const orcid = this.item.firstMetadataValue('person.identifier.orcid'); if (orcid) { - return this.translateService.get('person.page.orcid.orcid-not-linked-message', { 'orcid': orcid }); + return this.translateService.instant('person.page.orcid.orcid-not-linked-message', { 'orcid': orcid }); } else { - return this.translateService.get('person.page.orcid.no-orcid-message'); + return this.translateService.instant('person.page.orcid.no-orcid-message'); } } @@ -141,13 +131,6 @@ export class OrcidAuthComponent implements OnInit, OnChanges { return 'person.page.orcid.scope.' + scope.substring(1).replace('/', '-'); } - /** - * Return a boolean representing if only admin can disconnect orcid profile - */ - onlyAdminCanDisconnectProfileFromOrcid(): Observable { - return this.onlyAdminCanDisconnectProfileFromOrcid$.asObservable(); - } - /** * Return a boolean representing if owner can disconnect orcid profile */ @@ -170,14 +153,15 @@ export class OrcidAuthComponent implements OnInit, OnChanges { unlinkOrcid(): void { this.unlinkProcessing.next(true); this.orcidAuthService.unlinkOrcidByItem(this.item).pipe( - getFirstCompletedRemoteData() + getFirstCompletedRemoteData(), + catchError((err: HttpErrorResponse) => of(createFailedRemoteDataObject(err.message, err.status))) ).subscribe((remoteData: RemoteData) => { this.unlinkProcessing.next(false); - if (remoteData.isSuccess) { + if (remoteData.hasFailed) { + this.notificationsService.error(this.translateService.get('person.page.orcid.unlink.error')); + } else { this.notificationsService.success(this.translateService.get('person.page.orcid.unlink.success')); this.unlink.emit(); - } else { - this.notificationsService.error(this.translateService.get('person.page.orcid.unlink.error')); } }); } @@ -212,7 +196,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges { } private setOrcidAuthorizationsFromItem(): void { - this.profileAuthorizationScopes.next(this.orcidAuthService.getOrcidAuthorizationScopesByItem(this.item)); + this.profileAuthorizationScopes$.next(this.orcidAuthService.getOrcidAuthorizationScopesByItem(this.item)); } } diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html index 33c3125d676..6c30fbe1114 100644 --- a/src/app/item-page/orcid-page/orcid-page.component.html +++ b/src/app/item-page/orcid-page/orcid-page.component.html @@ -1,13 +1,3 @@ -
-
-
- - {{'item.orcid.return' | translate}} - -
-
-
-
{{'person.page.orcid.link.error.message' | translate}} @@ -17,3 +7,13 @@ + +
+
+
+ + {{'item.orcid.return' | translate}} + +
+
+
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 f3dbb569d9d..1d62c9691c1 100644 --- a/src/app/item-page/orcid-page/orcid-page.component.ts +++ b/src/app/item-page/orcid-page/orcid-page.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { isPlatformBrowser } from '@angular/common'; import { BehaviorSubject, combineLatest } from 'rxjs'; -import { map, take } from 'rxjs/operators'; +import { filter, map, take } from 'rxjs/operators'; import { OrcidAuthService } from '../../core/orcid/orcid-auth.service'; import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; @@ -147,7 +147,19 @@ export class OrcidPageComponent implements OnInit { */ private clearRouteParams(): void { // update route removing the code from query params - const redirectUrl = this.router.url.split('?')[0]; - this.router.navigate([redirectUrl]); + this.route.queryParamMap + .pipe( + filter((paramMap: ParamMap) => isNotEmpty(paramMap.keys)), + map(_ => Object.assign({})), + take(1), + ).subscribe(queryParams => + this.router.navigate( + [], + { + relativeTo: this.route, + queryParams + } + ) + ); } } diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html index 6ba318f7fd5..9b3e470fc1d 100644 --- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html +++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html @@ -3,13 +3,13 @@

{{ 'person.orcid.registry.queue' | translate }}

- {{ 'person.page.orcid.sync-queue.empty-message' | translate}} -
@@ -22,7 +22,7 @@

{{ 'person.orcid.registry.queue' | translate }}

- + 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 3e88826952e..7df84864c6f 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 @@ -47,13 +47,12 @@ export class OrcidQueueComponent implements OnInit, OnDestroy { /** * A list of orcid queue records */ - private list$: BehaviorSubject>> = new BehaviorSubject>>({} as any); + list$: BehaviorSubject>> = new BehaviorSubject>>({} as any); /** * The AlertType enumeration - * @type {AlertType} */ - AlertTypeEnum = AlertType; + readonly AlertTypeEnum = AlertType; /** * Array to track all subscriptions and unsubscribe them onDestroy @@ -99,13 +98,6 @@ export class OrcidQueueComponent implements OnInit, OnDestroy { ); } - /** - * Return the list of orcid queue records - */ - getList(): Observable>> { - return this.list$.asObservable(); - } - /** * Return the icon class for the queue object type * 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 f2fa9d2440b..38a6df909eb 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 @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { By } from '@angular/platform-browser'; @@ -24,8 +24,8 @@ describe('OrcidSyncSettingsComponent test suite', () => { let comp: OrcidSyncSettingsComponent; let fixture: ComponentFixture; let scheduler: TestScheduler; - let researcherProfileService: jasmine.SpyObj; let notificationsService; + let researcherProfileService: jasmine.SpyObj; let formGroup: UntypedFormGroup; const mockResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), { @@ -161,6 +161,7 @@ describe('OrcidSyncSettingsComponent test suite', () => { scheduler = getTestScheduler(); fixture = TestBed.createComponent(OrcidSyncSettingsComponent); comp = fixture.componentInstance; + researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile)); comp.item = mockItemLinkedToOrcid; fixture.detectChanges(); })); @@ -197,7 +198,6 @@ describe('OrcidSyncSettingsComponent test suite', () => { }); it('should call updateByOrcidOperations properly', () => { - researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile)); researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile)); const expectedOps: Operation[] = [ { @@ -226,7 +226,6 @@ describe('OrcidSyncSettingsComponent test suite', () => { }); it('should show notification on success', () => { - researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile)); researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile)); scheduler.schedule(() => comp.onSubmit(formGroup)); @@ -238,6 +237,8 @@ describe('OrcidSyncSettingsComponent test suite', () => { it('should show notification on error', () => { researcherProfileService.findByRelatedItem.and.returnValue(createFailedRemoteDataObject$()); + comp.item = mockItemLinkedToOrcid; + fixture.detectChanges(); scheduler.schedule(() => comp.onSubmit(formGroup)); scheduler.flush(); @@ -247,7 +248,6 @@ describe('OrcidSyncSettingsComponent test suite', () => { }); it('should show notification on error', () => { - researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile)); researcherProfileService.patch.and.returnValue(createFailedRemoteDataObject$()); scheduler.schedule(() => comp.onSubmit(formGroup)); 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 0bcbc295ac0..422041d340f 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 @@ -1,80 +1,97 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; import { Operation } from 'fast-json-patch'; -import { of } from 'rxjs'; -import { switchMap } from 'rxjs/operators'; +import { BehaviorSubject, Observable, of } from 'rxjs'; +import { catchError, filter, map, switchMap, take, takeUntil } from 'rxjs/operators'; import { RemoteData } from '../../../core/data/remote-data'; import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service'; import { Item } from '../../../core/shared/item.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../core/shared/operators'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model'; +import { hasValue } from '../../../shared/empty.util'; +import { HttpErrorResponse } from '@angular/common/http'; +import { createFailedRemoteDataObject } from '../../../shared/remote-data.utils'; @Component({ selector: 'ds-orcid-sync-setting', templateUrl: './orcid-sync-settings.component.html', styleUrls: ['./orcid-sync-settings.component.scss'] }) -export class OrcidSyncSettingsComponent implements OnInit { - - /** - * The item for which showing the orcid settings - */ - @Input() item: Item; +export class OrcidSyncSettingsComponent implements OnInit, OnDestroy { /** * The prefix used for i18n keys */ messagePrefix = 'person.page.orcid'; - /** * The current synchronization mode */ currentSyncMode: string; - /** * The current synchronization mode for publications */ currentSyncPublications: string; - /** * The current synchronization mode for funding */ currentSyncFunding: string; - /** * The synchronization options */ syncModes: { value: string, label: string }[]; - /** * The synchronization options for publications */ syncPublicationOptions: { value: string, label: string }[]; - /** * The synchronization options for funding */ syncFundingOptions: { value: string, label: string }[]; - /** * The profile synchronization options */ syncProfileOptions: { value: string, label: string, checked: boolean }[]; - /** * An event emitted when settings are updated */ @Output() settingsUpdated: EventEmitter = new EventEmitter(); + /** + * Emitter that triggers onDestroy lifecycle + * @private + */ + readonly #destroy$ = new EventEmitter(); + /** + * {@link BehaviorSubject} that reflects {@link item} input changes + * @private + */ + readonly #item$ = new BehaviorSubject(null); + /** + * {@link Observable} that contains {@link ResearcherProfile} linked to the {@link #item$} + * @private + */ + #researcherProfile$: Observable; constructor(private researcherProfileService: ResearcherProfileDataService, private notificationsService: NotificationsService, private translateService: TranslateService) { } + /** + * The item for which showing the orcid settings + */ + @Input() + set item(item: Item) { + this.#item$.next(item); + } + + ngOnDestroy(): void { + this.#destroy$.next(); + } + /** * Init orcid settings form */ @@ -106,20 +123,21 @@ export class OrcidSyncSettingsComponent implements OnInit { }; }); - const syncProfilePreferences = this.item.allMetadataValues('dspace.orcid.sync-profile'); + this.updateSyncProfileOptions(this.#item$.asObservable()); + this.updateSyncPreferences(this.#item$.asObservable()); - this.syncProfileOptions = ['BIOGRAPHICAL', 'IDENTIFIERS'] - .map((value) => { - return { - label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(), - value: value, - checked: syncProfilePreferences.includes(value) - }; - }); - - this.currentSyncMode = this.getCurrentPreference('dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL'); - this.currentSyncPublications = this.getCurrentPreference('dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED'); - this.currentSyncFunding = this.getCurrentPreference('dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED'); + this.#researcherProfile$ = + this.#item$.pipe( + switchMap(item => + this.researcherProfileService.findByRelatedItem(item) + .pipe( + getFirstCompletedRemoteData(), + catchError((err: HttpErrorResponse) => of(createFailedRemoteDataObject(err.message, err.status))), + getRemoteDataPayload(), + ) + ), + takeUntil(this.#destroy$) + ); } /** @@ -144,37 +162,84 @@ export class OrcidSyncSettingsComponent implements OnInit { return; } - this.researcherProfileService.findByRelatedItem(this.item).pipe( - getFirstCompletedRemoteData(), - switchMap((profileRD: RemoteData) => { - if (profileRD.hasSucceeded) { - return this.researcherProfileService.patch(profileRD.payload, operations).pipe( - getFirstCompletedRemoteData(), - ); + this.#researcherProfile$ + .pipe( + switchMap(researcherProfile => this.researcherProfileService.patch(researcherProfile, operations)), + getFirstCompletedRemoteData(), + catchError((err: HttpErrorResponse) => of(createFailedRemoteDataObject(err.message, err.status))), + take(1) + ) + .subscribe((remoteData: RemoteData) => { + if (remoteData.hasFailed) { + this.notificationsService.error(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.error')); } else { - return of(profileRD); + this.notificationsService.success(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.success')); + this.settingsUpdated.emit(); } - }), - ).subscribe((remoteData: RemoteData) => { - if (remoteData.isSuccess) { - this.notificationsService.success(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.success')); - this.settingsUpdated.emit(); - } else { - this.notificationsService.error(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.error')); - } - }); + }); + } + + /** + * + * Handles subscriptions to populate sync preferences + * + * @param item observable that emits update on item changes + * @private + */ + private updateSyncPreferences(item: Observable) { + item.pipe( + filter(hasValue), + map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL')), + takeUntil(this.#destroy$) + ).subscribe(val => this.currentSyncMode = val); + item.pipe( + filter(hasValue), + map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED')), + takeUntil(this.#destroy$) + ).subscribe(val => this.currentSyncPublications = val); + item.pipe( + filter(hasValue), + map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED')), + takeUntil(this.#destroy$) + ).subscribe(val => this.currentSyncFunding = val); + } + + /** + * Handles subscription to populate the {@link syncProfileOptions} field + * + * @param item observable that emits update on item changes + * @private + */ + private updateSyncProfileOptions(item: Observable) { + item.pipe( + filter(hasValue), + map(i => i.allMetadataValues('dspace.orcid.sync-profile')), + map(metadata => + ['BIOGRAPHICAL', 'IDENTIFIERS'] + .map((value) => { + return { + label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(), + value: value, + checked: metadata.includes(value) + }; + }) + ), + takeUntil(this.#destroy$) + ) + .subscribe(value => this.syncProfileOptions = value); } /** * Retrieve setting saved in the item's metadata * + * @param item The item from which retrieve settings * @param metadataField The metadata name that contains setting * @param allowedValues The allowed values * @param defaultValue The default value * @private */ - private getCurrentPreference(metadataField: string, allowedValues: string[], defaultValue: string): string { - const currentPreference = this.item.firstMetadataValue(metadataField); + private getCurrentPreference(item: Item, metadataField: string, allowedValues: string[], defaultValue: string): string { + const currentPreference = item.firstMetadataValue(metadataField); return (currentPreference && allowedValues.includes(currentPreference)) ? currentPreference : defaultValue; } 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 8acf405b55f..02579b7900e 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 @@ -13,6 +13,7 @@ import { of as observableOf } from 'rxjs'; import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock'; import { FileSizePipe } from '../../../../shared/utils/file-size-pipe'; 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 { createPaginatedList } from '../../../../shared/testing/utils.test'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; @@ -66,6 +67,7 @@ describe('FileSectionComponent', () => { }), BrowserAnimationsModule], declarations: [FileSectionComponent, VarDirective, FileSizePipe, MetadataFieldWrapperComponent], providers: [ + { provide: XSRFService, useValue: {} }, { provide: BitstreamDataService, useValue: bitstreamDataService }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, { provide: APP_CONFIG, useValue: environment } 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 4fb88894401..6bbee909457 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 @@ -6,6 +6,8 @@ import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loa import { SharedModule } from '../../../../../shared/shared.module'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; +import { BrowseService } from '../../../../../core/browse/browse.service'; +import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub'; import { By } from '@angular/platform-browser'; import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; @@ -27,7 +29,8 @@ describe('ItemPageAbstractFieldComponent', () => { ], providers: [ { provide: APP_CONFIG, useValue: environment }, - { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub } + { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, + { provide: BrowseService, useValue: BrowseServiceStub }, ], declarations: [ItemPageAbstractFieldComponent], schemas: [NO_ERRORS_SCHEMA] 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 855a9951426..d45261b85bc 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 @@ -7,6 +7,8 @@ import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component import { ItemPageAuthorFieldComponent } from './item-page-author-field.component'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; +import { BrowseService } from '../../../../../core/browse/browse.service'; +import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub'; import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; @@ -27,7 +29,8 @@ describe('ItemPageAuthorFieldComponent', () => { })], providers: [ { provide: APP_CONFIG, useValue: environment }, - { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub } + { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, + { provide: BrowseService, useValue: BrowseServiceStub }, ], declarations: [ItemPageAuthorFieldComponent, MetadataValuesComponent], schemas: [NO_ERRORS_SCHEMA] 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 be124dab829..a88e9f74a7c 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 @@ -7,6 +7,8 @@ import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component import { ItemPageDateFieldComponent } from './item-page-date-field.component'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; +import { BrowseService } from '../../../../../core/browse/browse.service'; +import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub'; import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; @@ -27,7 +29,8 @@ describe('ItemPageDateFieldComponent', () => { })], providers: [ { provide: APP_CONFIG, useValue: environment }, - { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub } + { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, + { provide: BrowseService, useValue: BrowseServiceStub }, ], declarations: [ItemPageDateFieldComponent, MetadataValuesComponent], schemas: [NO_ERRORS_SCHEMA] 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 fdf5ac1bb54..606f43ed9a0 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 @@ -7,6 +7,8 @@ import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component import { GenericItemPageFieldComponent } from './generic-item-page-field.component'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { environment } from '../../../../../../environments/environment'; +import { BrowseService } from '../../../../../core/browse/browse.service'; +import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub'; import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; @@ -29,7 +31,8 @@ describe('GenericItemPageFieldComponent', () => { })], providers: [ { provide: APP_CONFIG, useValue: environment }, - { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub } + { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, + { provide: BrowseService, useValue: BrowseServiceStub }, ], declarations: [GenericItemPageFieldComponent, MetadataValuesComponent], schemas: [NO_ERRORS_SCHEMA] 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 15b7a9df212..f0bddbc6954 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 @@ -13,6 +13,8 @@ import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe'; import { SharedModule } from '../../../../shared/shared.module'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { By } from '@angular/platform-browser'; +import { BrowseService } from '../../../../core/browse/browse.service'; +import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub'; import { RouterTestingModule } from '@angular/router/testing'; @@ -51,7 +53,8 @@ describe('ItemPageFieldComponent', () => { ], providers: [ { provide: APP_CONFIG, useValue: appConfig }, - { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub } + { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, + { provide: BrowseService, useValue: BrowseServiceStub }, ], declarations: [ItemPageFieldComponent, MetadataValuesComponent], schemas: [NO_ERRORS_SCHEMA] 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 fc526dabcc5..aa1e78f2292 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 @@ -1,10 +1,20 @@ import { Component, Input } from '@angular/core'; import { Item } from '../../../../core/shared/item.model'; -import { map } from 'rxjs/operators'; +import intersectionWith from 'lodash/intersectionWith'; +import { + filter, + mergeAll, + take, +} from 'rxjs/operators'; import { Observable } from 'rxjs'; +import { BrowseService } from '../../../../core/browse/browse.service'; import { BrowseDefinition } from '../../../../core/shared/browse-definition.model'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; -import { getRemoteDataPayload } from '../../../../core/shared/operators'; +import { + getFirstCompletedRemoteData, + getPaginatedListPayload, + getRemoteDataPayload, +} from '../../../../core/shared/operators'; /** * This component can be used to represent metadata on a simple item page. @@ -17,7 +27,8 @@ import { getRemoteDataPayload } from '../../../../core/shared/operators'; }) export class ItemPageFieldComponent { - constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) { + constructor(protected browseDefinitionDataService: BrowseDefinitionDataService, + protected browseService: BrowseService) { } /** @@ -56,9 +67,26 @@ export class ItemPageFieldComponent { * link in dspace.cfg (webui.browse.link.) */ get browseDefinition(): Observable { - return this.browseDefinitionDataService.findByFields(this.fields).pipe( + return this.browseService.getBrowseDefinitions().pipe( + getFirstCompletedRemoteData(), getRemoteDataPayload(), - map((def) => def) + getPaginatedListPayload(), + mergeAll(), + filter((def: BrowseDefinition) => + intersectionWith(def.metadataKeys, this.fields, ItemPageFieldComponent.fieldMatch).length > 0, + ), + take(1), ); } + + /** + * Returns true iff the spec and field match. + * @param spec Specification of a metadata field name: either a metadata field, or a prefix ending in ".*". + * @param field A metadata field name. + * @private + */ + private static fieldMatch(spec: string, field: string): boolean { + return field === spec + || (spec.endsWith('.*') && field.substring(0, spec.length - 1) === spec.substring(0, spec.length - 1)); + } } 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 4116296b960..239afca2057 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 { ItemPageUriFieldComponent } from './item-page-uri-field.component'; import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component'; import { environment } from '../../../../../../environments/environment'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; +import { BrowseService } from '../../../../../core/browse/browse.service'; +import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub'; import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub'; import { ConfigurationDataService } from '../../../../../core/data/configuration-data.service'; @@ -43,6 +45,7 @@ describe('ItemPageUriFieldComponent', () => { providers: [ { provide: APP_CONFIG, useValue: environment }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, + { provide: BrowseService, useValue: BrowseServiceStub }, { provide: ConfigurationDataService, useValue: mockConfigurationDataService } ], declarations: [ItemPageUriFieldComponent, MetadataUriValuesComponent], 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 772eb337b4d..9d2da88f7fe 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 @@ -7,6 +7,7 @@ import { MetadataValue } from '../../../../../core/shared/metadata.models'; import _ from 'lodash'; import { ConfigurationDataService } from '../../../../../core/data/configuration-data.service'; import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service'; +import {BrowseService} from '../../../../../core/browse/browse.service'; @Component({ selector: 'ds-item-page-uri-field', @@ -20,8 +21,9 @@ export class ItemPageUriFieldComponent extends ItemPageFieldComponent implements doiResolver: string; constructor(protected browseDefinitionDataService: BrowseDefinitionDataService, + protected browseService: BrowseService, private configService: ConfigurationDataService) { - super(browseDefinitionDataService); + super(browseDefinitionDataService, browseService); } /** diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html index 5af5cd4da2f..176270a0275 100644 --- a/src/app/item-page/simple/item-page.component.html +++ b/src/app/item-page/simple/item-page.component.html @@ -7,7 +7,6 @@
-
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 6718bc20b46..12e3c580e9c 100644 --- a/src/app/item-page/simple/item-page.component.spec.ts +++ b/src/app/item-page/simple/item-page.component.spec.ts @@ -19,7 +19,6 @@ import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; -import { AuthService } from '../../core/auth/auth.service'; import { createPaginatedList } from '../../shared/testing/utils.test'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { ServerResponseService } from '../../core/services/server-response.service'; @@ -72,7 +71,7 @@ const mockSignpostingLinks: SignpostingLink[] = [mocklink, mocklink2]; describe('ItemPageComponent', () => { let comp: ItemPageComponent; let fixture: ComponentFixture; - let authService: AuthService; + let authorizationDataService: AuthorizationDataService; let serverResponseService: jasmine.SpyObj; let signpostingDataService: jasmine.SpyObj; let linkHeadService: jasmine.SpyObj; @@ -82,7 +81,6 @@ describe('ItemPageComponent', () => { const authorizationService = jasmine.createSpyObj('authorizationService', [ 'isAuthorized', ]); - let authorizationDataService: AuthorizationDataService; const mockMetadataService = { /* eslint-disable no-empty,@typescript-eslint/no-empty-function */ @@ -99,10 +97,6 @@ describe('ItemPageComponent', () => { }; beforeEach(waitForAsync(() => { - authService = jasmine.createSpyObj('authService', { - isAuthenticated: observableOf(true), - setRedirectUrl: {} - }); authorizationDataService = jasmine.createSpyObj('authorizationDataService', { isAuthorized: observableOf(false), }); @@ -150,7 +144,6 @@ describe('ItemPageComponent', () => { { provide: ItemDataService, useValue: {} }, { provide: MetadataService, useValue: mockMetadataService }, { provide: Router, useValue: {} }, - { provide: AuthService, useValue: authService }, { provide: AuthorizationDataService, useValue: authorizationDataService }, { provide: ServerResponseService, useValue: serverResponseService }, { provide: SignpostingDataService, useValue: signpostingDataService }, diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts index c355c75ff6c..0aae5a6eb38 100644 --- a/src/app/item-page/simple/item-page.component.ts +++ b/src/app/item-page/simple/item-page.component.ts @@ -11,9 +11,7 @@ import { Item } from '../../core/shared/item.model'; import { fadeInOut } from '../../shared/animations/fade'; import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators'; import { ViewMode } from '../../core/shared/view-mode.model'; -import { AuthService } from '../../core/auth/auth.service'; import { getItemPageRoute } from '../item-page-routing-paths'; -import { redirectOn4xx } from '../../core/shared/authorized.operators'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { ServerResponseService } from '../../core/services/server-response.service'; @@ -99,7 +97,6 @@ export class ItemPageComponent implements OnInit, OnDestroy { protected route: ActivatedRoute, protected router: Router, protected items: ItemDataService, - protected authService: AuthService, protected authorizationService: AuthorizationDataService, protected responseService: ServerResponseService, protected signpostingDataService: SignpostingDataService, @@ -117,7 +114,6 @@ export class ItemPageComponent implements OnInit, OnDestroy { ngOnInit(): void { this.itemRD$ = this.route.data.pipe( map((data) => data.dso as RemoteData), - redirectOn4xx(this.router, this.authService) ); this.itemPageRoute$ = this.itemRD$.pipe( getAllSucceededRemoteDataPayload(), diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html index d4b63a93790..ef32bd9c880 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.html +++ b/src/app/item-page/simple/item-types/publication/publication.component.html @@ -112,9 +112,5 @@ {{"item.page.link.full" | translate}}
- - - -
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 f590c4fbd93..2d591e828e3 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 @@ -40,6 +40,8 @@ import { BrowseDefinitionDataService } from '../../../../core/browse/browse-defi import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub'; +import { BrowseService } from '../../../../core/browse/browse.service'; +import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub'; const noMetadata = new MetadataMap(); @@ -93,6 +95,7 @@ describe('PublicationComponent', () => { { provide: SearchService, useValue: {} }, { provide: RouteService, useValue: mockRouteService }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, + { provide: BrowseService, useValue: BrowseServiceStub }, ], schemas: [NO_ERRORS_SCHEMA] 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 0c4e82178f5..d9f3a303696 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,4 @@ -import { combineLatest as observableCombineLatest, Observable, zip as observableZip } from 'rxjs'; +import { combineLatest as observableCombineLatest, Observable, of as observableOf, zip as observableZip } from 'rxjs'; import { distinctUntilChanged, map, mergeMap, switchMap } from 'rxjs/operators'; import { PaginatedList } from '../../../../core/data/paginated-list.model'; import { RemoteData } from '../../../../core/data/remote-data'; @@ -45,17 +45,19 @@ export const compareArraysUsingIds = () => /** * Operator for turning a list of relationships into a list of the relevant items * @param {string} thisId The item's id of which the relations belong to - * @returns {(source: Observable) => Observable} */ -export const relationsToItems = (thisId: string) => +export const relationsToItems = (thisId: string): (source: Observable) => Observable => (source: Observable): Observable => source.pipe( - mergeMap((rels: Relationship[]) => - observableZip( - ...rels.map((rel: Relationship) => observableCombineLatest(rel.leftItem, rel.rightItem)) - ) - ), - map((arr) => + mergeMap((relationships: Relationship[]) => { + if (relationships.length === 0) { + return observableOf([]); + } + return observableZip( + ...relationships.map((rel: Relationship) => observableCombineLatest([rel.leftItem, rel.rightItem])), + ); + }), + map((arr: [RemoteData, RemoteData][]) => arr .filter(([leftItem, rightItem]) => leftItem.hasSucceeded && rightItem.hasSucceeded) .map(([leftItem, rightItem]) => { @@ -74,9 +76,9 @@ export const relationsToItems = (thisId: string) => * Operator for turning a paginated list of relationships into a paginated list of the relevant items * The result is wrapped in the original RemoteData and PaginatedList * @param {string} thisId The item's id of which the relations belong to - * @returns {(source: Observable) => Observable} */ -export const paginatedRelationsToItems = (thisId: string) => (source: Observable>>): Observable>> => +export const paginatedRelationsToItems = (thisId: string): (source: Observable>>) => Observable>> => + (source: Observable>>): Observable>> => source.pipe( getFirstCompletedRemoteData(), switchMap((relationshipsRD: RemoteData>) => { 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 5bf08fc0047..558cd6d379b 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 @@ -44,6 +44,8 @@ import { BrowseDefinitionDataService } from '../../../../core/browse/browse-defi import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub'; +import { BrowseService } from '../../../../core/browse/browse.service'; +import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub'; import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; import { PageInfo } from '../../../../core/shared/page-info.model'; @@ -133,6 +135,7 @@ export function getItemPageFieldsTest(mockItem: Item, component) { { provide: AuthorizationDataService, useValue: authorizationService }, { provide: ResearcherProfileDataService, useValue: {} }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, + { provide: BrowseService, useValue: BrowseServiceStub }, ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html index cd283108f14..7ce77f678f4 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html @@ -119,9 +119,5 @@ {{"item.page.link.full" | translate}}
- - - -
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 d9e9a87c150..5b8cd124506 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 @@ -41,6 +41,8 @@ import { BrowseDefinitionDataService } from '../../../../core/browse/browse-defi import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub'; +import { BrowseService } from '../../../../core/browse/browse.service'; +import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub'; const noMetadata = new MetadataMap(); @@ -96,6 +98,7 @@ describe('UntypedItemComponent', () => { { provide: ItemVersionsSharedService, useValue: {} }, { provide: RouteService, useValue: mockRouteService }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, + { provide: BrowseService, useValue: BrowseServiceStub }, ], schemas: [NO_ERRORS_SCHEMA] }).overrideComponent(UntypedItemComponent, { 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 59a5377f772..30ec064e68b 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 @@ -9,7 +9,7 @@ import { MetadataValue } from '../../../core/shared/metadata.models'; import { Item } from '../../../core/shared/item.model'; import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component'; import { map } from 'rxjs/operators'; -import { getRemoteDataPayload } from '../../../core/shared/operators'; +import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model'; @@ -96,8 +96,8 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(field)); }); return this.browseDefinitionDataService.findByFields(this.metadataFields).pipe( - getRemoteDataPayload(), - map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def), metadatum)) + getFirstCompletedRemoteData(), + map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def.payload), metadatum)) ); } }), diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html index 223d4a6ed0c..3ce96b2ce34 100644 --- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html +++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html @@ -1,7 +1,9 @@ -
    -
  • - {{'item.page.relationships.' + relationType.label | translate}} +
      +
    • + + {{'item.page.relationships.' + relationType.label | translate}} +
      - +
      - +
      diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html index 7ee02cd5616..09e8f21e72d 100644 --- a/src/app/item-page/versions/item-versions.component.html +++ b/src/app/item-page/versions/item-versions.component.html @@ -1,145 +1,149 @@ -
      -
      -
      -

      {{"item.version.history.head" | translate}}

      - - {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }} - - - - - - - - - - - - - - + + +
      {{"item.version.history.table.version" | translate}}{{"item.version.history.table.editor" | translate}}{{"item.version.history.table.date" | translate}}{{"item.version.history.table.summary" | translate}}
      - - - +
      +
      +

      {{ "item.version.history.head" | translate }}

      + + {{ "item.version.history.selected.alert" | translate : { version: itemVersion.version } }} + + + + + + + + + + + + + + - - - + + + - - -
      {{ "item.version.history.table.version" | translate }}{{ "item.version.history.table.editor" | translate }}{{ "item.version.history.table.date" | translate }}{{ "item.version.history.table.summary" | translate }}
      + + + -
      +
      - - - {{version.version}} - - - {{version.version}} - - * + + + {{ versionDTO.version.version }} + + + {{ versionDTO.version.version }} + + * - + {{ "item.version.history.table.workspaceItem" | translate }} - + {{ "item.version.history.table.workflowItem" | translate }} -
      +
      -
      +
      -
      - - + + + - - - - - - - - -
      - + + + + +
      - - -
      		- {{version?.submitterName}} - - {{version?.created | date : 'yyyy-MM-dd HH:mm:ss'}} - -
      - - {{version?.summary}} - - - -
      - -
      - - - - - - - - - -
      + + + +       		+ {{ versionDTO.version.submitterName }} + + {{ versionDTO.version.created | date : 'yyyy-MM-dd HH:mm:ss' }} + +
      + + {{ versionDTO.version.summary }} + + + +
      -
      -
      * {{"item.version.history.selected" | translate}}
      -       - -
      +
      + + + + + + + + + +
      +
      +
      * {{ "item.version.history.selected" | translate }}
      +
      + + + + 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 719fe818b45..4f6237def53 100644 --- a/src/app/item-page/versions/item-versions.component.spec.ts +++ b/src/app/item-page/versions/item-versions.component.spec.ts @@ -29,6 +29,7 @@ import { ConfigurationDataService } from '../../core/data/configuration-data.ser import { Router } from '@angular/router'; import { CommonModule } from '@angular/common'; import { ItemSharedModule } from '../item-shared.module'; +import {BtnDisabledDirective} from '../../shared/btn-disabled.directive'; describe('ItemVersionsComponent', () => { let component: ItemVersionsComponent; @@ -136,7 +137,7 @@ describe('ItemVersionsComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ItemVersionsComponent, VarDirective], + declarations: [ItemVersionsComponent, VarDirective, BtnDisabledDirective], imports: [TranslateModule.forRoot(), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemSharedModule], providers: [ {provide: PaginationService, useValue: new PaginationServiceStub()}, @@ -224,17 +225,20 @@ describe('ItemVersionsComponent', () => { it('should not disable the delete button', () => { const deleteButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-delete`)); deleteButtons.forEach((btn) => { - expect(btn.nativeElement.disabled).toBe(false); + expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('false'); + expect(btn.nativeElement.classList.contains('disabled')).toBeFalse(); }); }); it('should disable other buttons', () => { const createButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-create`)); createButtons.forEach((btn) => { - expect(btn.nativeElement.disabled).toBe(true); + expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true'); + expect(btn.nativeElement.classList.contains('disabled')).toBeTrue(); }); const editButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-create`)); editButtons.forEach((btn) => { - expect(btn.nativeElement.disabled).toBe(true); + expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true'); + expect(btn.nativeElement.classList.contains('disabled')).toBeTrue(); }); }); }); diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts index 0701eacf50a..500cd69ffc4 100644 --- a/src/app/item-page/versions/item-versions.component.ts +++ b/src/app/item-page/versions/item-versions.component.ts @@ -53,6 +53,17 @@ import {WorkspaceitemDataService} from '../../core/submission/workspaceitem-data import {WorkflowItemDataService} from '../../core/submission/workflowitem-data.service'; import {ConfigurationDataService} from '../../core/data/configuration-data.service'; +interface VersionsDTO { + totalElements: number; + versionDTOs: VersionDTO[]; +} + +interface VersionDTO { + version: Version; + canEditVersion: Observable; + canDeleteVersion: Observable; +} + @Component({ selector: 'ds-item-versions', templateUrl: './item-versions.component.html', @@ -113,16 +124,15 @@ export class ItemVersionsComponent implements OnDestroy, OnInit { versionHistory$: Observable; /** - * The version history's list of versions + * The version history information that is used to render the HTML */ - versionsRD$: BehaviorSubject>> = new BehaviorSubject>>(null); + versionsDTO$: Observable; /** * Verify if the list of versions has at least one e-person to display * Used to hide the "Editor" column when no e-persons are present to display */ hasEpersons$: Observable; - /** * Verify if there is an inprogress submission in the version history * Used to disable the "Create version" button @@ -423,19 +433,12 @@ export class ItemVersionsComponent implements OnDestroy, OnInit { take(1), ); - const result$ = combineLatest([includeSubmitter$, isAdmin$]).pipe( + return combineLatest([includeSubmitter$, isAdmin$]).pipe( map(([includeSubmitter, isAdmin]) => { return includeSubmitter && isAdmin; }) ); - if (isNotNull(this.showSubmitter$.value)) { - return; - } - - result$.subscribe(res => { - this.showSubmitter$.next(res); - }); } /** @@ -452,16 +455,23 @@ export class ItemVersionsComponent implements OnDestroy, OnInit { */ getAllVersions(versionHistory$: Observable): void { const currentPagination = this.paginationService.getCurrentPagination(this.options.id, this.options); - combineLatest([versionHistory$, currentPagination]).pipe( + this.versionsDTO$ = combineLatest([versionHistory$, currentPagination]).pipe( switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => { return this.versionHistoryService.getVersions(versionHistory.id, new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}), false, true, followLink('item'), followLink('eperson')); }), getFirstCompletedRemoteData(), - ).subscribe((res: RemoteData>) => { - this.versionsRD$.next(res); - }); + getRemoteDataPayload(), + map((versions: PaginatedList) => ({ + totalElements: versions.totalElements, + versionDTOs: (versions?.page ?? []).map((version: Version) => ({ + version: version, + canEditVersion: this.canEditVersion$(version), + canDeleteVersion: this.canDeleteVersion$(version), + })), + })), + ); } /** @@ -540,16 +550,12 @@ export class ItemVersionsComponent implements OnDestroy, OnInit { ); this.getAllVersions(this.versionHistory$); - this.hasEpersons$ = this.versionsRD$.pipe( - getAllSucceededRemoteData(), - getRemoteDataPayload(), - hasValueOperator(), - map((versions: PaginatedList) => versions.page.filter((version: Version) => version.eperson !== undefined).length > 0), + this.hasEpersons$ = this.versionsDTO$.pipe( + map((versionsDTO: VersionsDTO) => versionsDTO.versionDTOs.filter((versionDTO: VersionDTO) => versionDTO.version.eperson !== undefined).length > 0), startWith(false) ); - this.itemPageRoutes$ = this.versionsRD$.pipe( - getAllSucceededRemoteDataPayload(), - switchMap((versions) => combineLatest(versions.page.map((version) => version.item.pipe(getAllSucceededRemoteDataPayload())))), + this.itemPageRoutes$ = this.versionsDTO$.pipe( + switchMap((versionsDTO: VersionsDTO) => combineLatest(versionsDTO.versionDTOs.map((versionDTO: VersionDTO) => versionDTO.version.item.pipe(getAllSucceededRemoteDataPayload())))), map((versions) => { const itemPageRoutes = {}; versions.forEach((item) => itemPageRoutes[item.uuid] = getItemPageRoute(item)); diff --git a/src/app/login-page/login-page.component.spec.ts b/src/app/login-page/login-page.component.spec.ts index baaa3430ac9..7f5f3a70806 100644 --- a/src/app/login-page/login-page.component.spec.ts +++ b/src/app/login-page/login-page.component.spec.ts @@ -6,6 +6,7 @@ import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; +import { XSRFService } from '../core/xsrf/xsrf.service'; import { LoginPageComponent } from './login-page.component'; import { ActivatedRouteStub } from '../shared/testing/active-router.stub'; @@ -31,7 +32,8 @@ describe('LoginPageComponent', () => { declarations: [LoginPageComponent], providers: [ { provide: ActivatedRoute, useValue: activatedRouteStub }, - { provide: Store, useValue: store } + { provide: Store, useValue: store }, + { provide: XSRFService, useValue: {} }, ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.html b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.html index e1cf58b5b2f..8b3e2ebded5 100644 --- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.html +++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.html @@ -3,6 +3,6 @@

      {{"error.identifier" | translate}}

      {{missingItem}}


      - {{"404.link.home-page" | translate}} + {{"404.link.home-page" | translate}}

      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 f0139e92514..b293ead1027 100644 --- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts +++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts @@ -6,6 +6,7 @@ import { ObjectNotFoundComponent } from './objectnotfound.component'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { of as observableOf } from 'rxjs'; import { ActivatedRoute } from '@angular/router'; +import { ServerResponseService } from 'src/app/core/services/server-response.service'; describe('ObjectNotFoundComponent', () => { let comp: ObjectNotFoundComponent; @@ -17,6 +18,10 @@ describe('ObjectNotFoundComponent', () => { const activatedRouteStub = Object.assign(new ActivatedRouteStub(), { params: observableOf({id: testUUID, idType: uuidType}) }); + const serverResponseServiceStub = jasmine.createSpyObj('ServerResponseService', { + setNotFound: jasmine.createSpy('setNotFound') + }); + const activatedRouteStubHandle = Object.assign(new ActivatedRouteStub(), { params: observableOf({id: handleId, idType: handlePrefix}) }); @@ -26,6 +31,7 @@ describe('ObjectNotFoundComponent', () => { imports: [ TranslateModule.forRoot() ], providers: [ + {provide: ServerResponseService, useValue: serverResponseServiceStub}, {provide: ActivatedRoute, useValue: activatedRouteStub} ], declarations: [ObjectNotFoundComponent], @@ -48,6 +54,10 @@ describe('ObjectNotFoundComponent', () => { expect(comp.idType).toEqual(uuidType); expect(comp.missingItem).toEqual('uuid: ' + testUUID); }); + + it('should call serverResponseService.setNotFound', () => { + expect(serverResponseServiceStub.setNotFound).toHaveBeenCalled(); + }); }); describe( 'legacy handle request', () => { @@ -56,6 +66,7 @@ describe('ObjectNotFoundComponent', () => { imports: [ TranslateModule.forRoot() ], providers: [ + {provide: ServerResponseService, useValue: serverResponseServiceStub}, {provide: ActivatedRoute, useValue: activatedRouteStubHandle} ], declarations: [ObjectNotFoundComponent], @@ -74,6 +85,9 @@ describe('ObjectNotFoundComponent', () => { expect(comp.idType).toEqual(handlePrefix); expect(comp.missingItem).toEqual('handle: ' + handlePrefix + '/' + handleId); }); - }); + it('should call serverResponseService.setNotFound', () => { + expect(serverResponseServiceStub.setNotFound).toHaveBeenCalled(); + }); + }); }); diff --git a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts index bbab90f39dd..cad78f8555c 100644 --- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts +++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts @@ -1,6 +1,7 @@ import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { ServerResponseService } from 'src/app/core/services/server-response.service'; /** * This component representing the `PageNotFound` DSpace page. @@ -25,7 +26,7 @@ export class ObjectNotFoundComponent implements OnInit { * @param {AuthService} authservice * @param {ServerResponseService} responseService */ - constructor(private route: ActivatedRoute) { + constructor(private route: ActivatedRoute, private serverResponseService: ServerResponseService) { route.params.subscribe((params) => { this.idType = params.idType; this.id = params.id; @@ -38,6 +39,7 @@ export class ObjectNotFoundComponent implements OnInit { } else { this.missingItem = 'handle: ' + this.idType + '/' + this.id; } + this.serverResponseService.setNotFound(); } } diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts index 838d5a53c5b..12d5efa24e1 100644 --- a/src/app/menu.resolver.spec.ts +++ b/src/app/menu.resolver.spec.ts @@ -16,9 +16,11 @@ import { MenuServiceStub } from './shared/testing/menu-service.stub'; import { MenuID } from './shared/menu/menu-id.model'; import { BrowseService } from './core/browse/browse.service'; import { cold } from 'jasmine-marbles'; -import createSpy = jasmine.createSpy; import { createSuccessfulRemoteDataObject$ } from './shared/remote-data.utils'; import { createPaginatedList } from './shared/testing/utils.test'; +import createSpy = jasmine.createSpy; +import { AuthService } from './core/auth/auth.service'; +import { AuthServiceStub } from './shared/testing/auth-service.stub'; const BOOLEAN = { t: true, f: false }; const MENU_STATE = { @@ -61,6 +63,7 @@ describe('MenuResolver', () => { { provide: BrowseService, useValue: browseService }, { provide: AuthorizationDataService, useValue: authorizationService }, { provide: ScriptDataService, useValue: scriptService }, + { provide: AuthService, useValue: AuthServiceStub }, { provide: NgbModal, useValue: { open: () => {/*comment*/ @@ -80,19 +83,19 @@ describe('MenuResolver', () => { describe('resolve', () => { it('should create all menus', (done) => { spyOn(resolver, 'createPublicMenu$').and.returnValue(observableOf(true)); - spyOn(resolver, 'createAdminMenu$').and.returnValue(observableOf(true)); + spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(observableOf(true)); resolver.resolve(null, null).subscribe(resolved => { expect(resolved).toBeTrue(); expect(resolver.createPublicMenu$).toHaveBeenCalled(); - expect(resolver.createAdminMenu$).toHaveBeenCalled(); + expect(resolver.createAdminMenuIfLoggedIn$).toHaveBeenCalled(); done(); }); }); it('should return an Observable that emits true as soon as all menus are created', () => { spyOn(resolver, 'createPublicMenu$').and.returnValue(cold('--(t|)', BOOLEAN)); - spyOn(resolver, 'createAdminMenu$').and.returnValue(cold('----(t|)', BOOLEAN)); + spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(cold('----(t|)', BOOLEAN)); expect(resolver.resolve(null, null)).toBeObservable(cold('----(t|)', BOOLEAN)); }); diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts index 8afe4166ba3..4a56dda0401 100644 --- a/src/app/menu.resolver.ts +++ b/src/app/menu.resolver.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { combineLatest as observableCombineLatest, combineLatest, Observable } from 'rxjs'; +import { combineLatest as observableCombineLatest, combineLatest, Observable, of as observableOf } from 'rxjs'; import { MenuID } from './shared/menu/menu-id.model'; import { MenuState } from './shared/menu/menu-state.model'; import { MenuItemType } from './shared/menu/menu-item-type.model'; @@ -12,7 +12,7 @@ import { RemoteData } from './core/data/remote-data'; import { TextMenuItemModel } from './shared/menu/menu-item/models/text.model'; import { BrowseService } from './core/browse/browse.service'; import { MenuService } from './shared/menu/menu.service'; -import { filter, find, map, take } from 'rxjs/operators'; +import { filter, find, map, mergeMap, take } from 'rxjs/operators'; import { hasValue } from './shared/empty.util'; import { FeatureID } from './core/data/feature-authorization/feature-id'; import { @@ -48,6 +48,7 @@ import { ExportBatchSelectorComponent } from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component'; import {getLicensesManageTablePath, getLicensesModulePath} from './app-routing-paths'; +import { AuthService } from './core/auth/auth.service'; /** * Creates all of the app's menus @@ -62,6 +63,7 @@ export class MenuResolver implements Resolve { protected authorizationService: AuthorizationDataService, protected modalService: NgbModal, protected scriptDataService: ScriptDataService, + protected authService: AuthService, ) { } @@ -71,7 +73,7 @@ export class MenuResolver implements Resolve { resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { return combineLatest([ this.createPublicMenu$(), - this.createAdminMenu$(), + this.createAdminMenuIfLoggedIn$(), ]).pipe( map((menusDone: boolean[]) => menusDone.every(Boolean)), ); @@ -147,6 +149,15 @@ export class MenuResolver implements Resolve { return this.waitForMenu$(MenuID.PUBLIC); } + /** + * Initialize all menu sections and items for {@link MenuID.ADMIN}, only if the user is logged in. + */ + createAdminMenuIfLoggedIn$() { + return this.authService.isAuthenticated().pipe( + mergeMap((isAuthenticated) => isAuthenticated ? this.createAdminMenu$() : observableOf(true)), + ); + } + /** * Initialize all menu sections and items for {@link MenuID.ADMIN} */ diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html index 7db6db9a8da..dacf36b940f 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html @@ -1,5 +1,6 @@
      -