diff --git a/cypress/e2e/header.cy.ts b/cypress/e2e/header.cy.ts index 1471e5ae6c..aa65aee570 100644 --- a/cypress/e2e/header.cy.ts +++ b/cypress/e2e/header.cy.ts @@ -15,24 +15,24 @@ describe('Header', () => { cy.visit('/'); // Click the language switcher (globe) in header - cy.get('a[data-test="lang-switch"]').click(); + cy.get('button[data-test="lang-switch"]').click(); // Click on the "Deusch" language in dropdown - cy.get('#language-menu-list li').contains('Deutsch').click(); + cy.get('#language-menu-list div[role="option"]').contains('Deutsch').click(); // HTML "lang" attribute should switch to "de" cy.get('html').invoke('attr', 'lang').should('eq', 'de'); // Login menu should now be in German - cy.get('a[data-test="login-menu"]').contains('Anmelden'); + cy.get('[data-test="login-menu"]').contains('Anmelden'); // Change back to English from language switcher - cy.get('a[data-test="lang-switch"]').click(); - cy.get('#language-menu-list li').contains('English').click(); + cy.get('button[data-test="lang-switch"]').click(); + cy.get('#language-menu-list div[role="option"]').contains('English').click(); // HTML "lang" attribute should switch to "en" cy.get('html').invoke('attr', 'lang').should('eq', 'en'); // Login menu should now be in English - cy.get('a[data-test="login-menu"]').contains('Log In'); + cy.get('[data-test="login-menu"]').contains('Log In'); }); }); diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html index 82242676be..bc688e9092 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html @@ -7,7 +7,7 @@ + class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html index da5bc8bd68..3207942ec2 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html @@ -7,7 +7,7 @@ + class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html index d0e95ab142..f9b0a923b3 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html @@ -7,7 +7,7 @@ + class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html index a78edc2765..baca36538b 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html @@ -4,7 +4,7 @@ @if (linkType !== linkTypes.None) { + [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" tabindex="-1"> diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html index df94f0d253..115c1af449 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html @@ -4,7 +4,7 @@ @if (linkType !== linkTypes.None) { + [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" tabindex="-1"> diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html index fcf9935e41..535e516b58 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html @@ -3,7 +3,7 @@
@if (linkType !== linkTypes.None) { + [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" tabindex="-1"> diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html index 28efef8fd3..883995cbe9 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html @@ -7,7 +7,7 @@ + class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html index 6e1b78a81e..9a0faaff15 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html @@ -7,7 +7,7 @@ + class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html index 46f9566272..416495f164 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html @@ -7,7 +7,7 @@ + class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" tabindex="-1">
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html index 328c73db64..51c5c42b5b 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html @@ -4,7 +4,7 @@ @if (linkType !== linkTypes.None) { + [routerLink]="[itemPageRoute]" class="dont-break-out" tabindex="-1"> + [routerLink]="[itemPageRoute]" class="dont-break-out" tabindex="-1"> + [routerLink]="[itemPageRoute]" class="dont-break-out" tabindex="-1"> - +
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index e002e0c347..b709198e38 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -23,7 +23,7 @@ } } - .navbar { + .navbar, div[role="toolbar"] { display: flex; gap: calc(var(--bs-spacer) / 3); align-items: center; diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html index 1a7fc342ed..877fb85b8b 100644 --- a/src/app/home-page/recent-item-list/recent-item-list.component.html +++ b/src/app/home-page/recent-item-list/recent-item-list.component.html @@ -2,14 +2,18 @@ @if (itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0) {
-

{{'home.recent-submissions.head' | translate}}

- @for (item of itemRD?.payload?.page; track item) { -
- - -
- } - +

{{ 'home.recent-submissions.head' | translate }}

+
    + @for (item of itemRD?.payload?.page; track item) { +
  • + + +
    • + } +
+
} @if (itemRD?.hasFailed) { diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html index f7d48dc050..c77bd76cba 100644 --- a/src/app/navbar/navbar.component.html +++ b/src/app/navbar/navbar.component.html @@ -9,7 +9,7 @@ @if ((isMobile$ | async) && (isAuthenticated$ | async)) { } -
+ } diff --git a/src/app/shared/lang-switch/lang-switch.component.spec.ts b/src/app/shared/lang-switch/lang-switch.component.spec.ts index 80d9c83d91..48d7413014 100644 --- a/src/app/shared/lang-switch/lang-switch.component.spec.ts +++ b/src/app/shared/lang-switch/lang-switch.component.spec.ts @@ -128,7 +128,7 @@ describe('LangSwitchComponent', () => { })); it('should define the main A HREF in the UI', (() => { - expect(langSwitchElement.querySelector('a')).not.toBeNull(); + expect(langSwitchElement.querySelector('button.dropdown-toggle')).not.toBeNull(); })); describe('when selecting a language', () => { diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html index 5eb2088a81..b85752110f 100644 --- a/src/app/shared/log-in/methods/password/log-in-password.component.html +++ b/src/app/shared/log-in/methods/password/log-in-password.component.html @@ -35,11 +35,11 @@
@if (canRegister$ | async) { {{"login.form.new-user" | translate}} + [attr.data-test]="'register' | dsBrowserOnly" tabindex="0">{{"login.form.new-user" | translate}} } @if (canForgot$ | async) { {{"login.form.forgot-password" | translate}} + [attr.data-test]="'forgot' | dsBrowserOnly" tabindex="0">{{"login.form.forgot-password" | translate}} }
} diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html index 4a4b198d11..7b1f411782 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html @@ -1,5 +1,10 @@ @if (showAccessStatus) { - @if ({ status: accessStatus$ | async, date: embargoDate$ | async }; as accessStatus) { - {{ accessStatus.status | translate: {date: accessStatus.date} }} + @if ((accessStatus$ | async); as status) { + @let date = embargoDate$ | async; + + {{ 'listelement.badge.access-status' | translate }} + {{ status | translate: { date: date } }} + , + } } diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts index 6107796d62..7d8db40b81 100644 --- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts +++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts @@ -19,7 +19,7 @@ import { TruncatePipe } from '../../../../utils/truncate.pipe'; import { AccessStatusObject } from './access-status.model'; import { AccessStatusBadgeComponent } from './access-status-badge.component'; -describe('ItemAccessStatusBadgeComponent', () => { +describe('AccessStatusBadgeComponent', () => { let component: AccessStatusBadgeComponent; let fixture: ComponentFixture; @@ -100,17 +100,17 @@ describe('ItemAccessStatusBadgeComponent', () => { function lookForAccessStatusBadgeForItem(status: string) { const badge = fixture.debugElement.query(By.css('span.badge')); - expect(badge.nativeElement.textContent).toEqual(`access-status.${status.toLowerCase()}.listelement.badge`); + expect(badge.nativeElement.textContent).toContain(`access-status.${status.toLowerCase()}.listelement.badge`); } function lookForAccessStatusBadgeForBitstream() { const badge = fixture.debugElement.query(By.css('span.badge')); - expect(badge.nativeElement.textContent).toEqual(`embargo.listelement.badge`); + expect(badge.nativeElement.textContent).toContain('embargo.listelement.badge'); } function lookForNoAccessStatusBadgeForBitstream() { const badge = fixture.debugElement.query(By.css('span.badge')); - expect(badge.nativeElement.textContent).toEqual(``); + expect(badge).toBeNull(); } describe('init with item', () => { diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html index 4cf93cbd1d..be85e8d2f3 100644 --- a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html @@ -1,5 +1,7 @@
+ {{ 'mydspace.status' | translate }} {{('mydspace.status.' + badgeContent) | translate}} + ,
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html index 8eb3cc0bf3..458447a217 100644 --- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html @@ -1,10 +1,16 @@ @if (privateBadge) {
- {{ "item.badge.private" | translate }} + + {{ 'item.badge.status' | translate }} + {{ "item.badge.private" | translate }} + , +
} @if (withdrawnBadge) {
+ {{ 'item.badge.status' | translate }} {{ "item.badge.withdrawn" | translate }} + ,
} diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html index 78fc9ba832..9c6e44f949 100644 --- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html +++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html @@ -1,5 +1,7 @@ @if (typeMessage) { + {{ 'listelement.badge.dso-type' | translate }} {{ typeMessage | translate }} + , } diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html index cb24748133..0b12ff7c9e 100644 --- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html @@ -1,6 +1,6 @@
@if (linkType !== linkTypes.None) { - + diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html index d98b8a6052..807b2ec8ff 100644 --- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html @@ -1,6 +1,6 @@
@if (linkType !== linkTypes.None) { - + diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html index ca001c348c..6acfa839f0 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html @@ -4,7 +4,7 @@
@if (linkType !== linkTypes.None) { + class="card-img-top full-width" tabindex="-1" [attr.title]="'search.results.view-result' | translate">
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html index cceb69e1ed..53ef93bc54 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html @@ -3,7 +3,7 @@
@if (linkType !== linkTypes.None) { + [routerLink]="[itemPageRoute]" class="dont-break-out" tabindex="-1"> diff --git a/src/app/submission/import-external/submission-import-external.component.html b/src/app/submission/import-external/submission-import-external.component.html index 3d0580f37e..79c9253ea0 100644 --- a/src/app/submission/import-external/submission-import-external.component.html +++ b/src/app/submission/import-external/submission-import-external.component.html @@ -32,7 +32,7 @@ } - @if ((isLoading$ | async) !== true && entriesRD?.payload?.page?.length === 0) { + @if ((isLoading$ | async) !== true && entriesRD?.payload?.page?.length === 0 && routeData?.query?.length > 0) {
{{ 'search.results.empty' | translate }}
diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts index 0364040c51..02450ee7f8 100644 --- a/src/app/submission/import-external/submission-import-external.component.spec.ts +++ b/src/app/submission/import-external/submission-import-external.component.spec.ts @@ -503,6 +503,12 @@ describe('SubmissionImportExternalComponent test suite', () => { if (param === 'entity') { return observableOf('Publication'); } + if (param === 'query') { + return observableOf('test'); + } + if (param === 'sourceId') { + return observableOf('pubmed'); + } return observableOf({}); }); fixture.detectChanges(); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 2121cecab4..bd5b6d3e3e 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -33,6 +33,8 @@ "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator", + "listelement.badge.access-status": "Access status:", + "access-status.embargo.listelement.badge": "Embargo", "access-status.metadata.only.listelement.badge": "Metadata only", @@ -2251,6 +2253,8 @@ "item.edit.authorizations.title": "Edit item's Policies", + "item.badge.status": "Item status:", + "item.badge.private": "Non-discoverable", "item.badge.withdrawn": "Withdrawn", @@ -3591,6 +3595,8 @@ "mydspace.show.supervisedWorkspace": "Supervised items", + "mydspace.status": "My DSpace status:", + "mydspace.status.mydspaceArchived": "Archived", "mydspace.status.mydspaceValidation": "Validation", @@ -3655,6 +3661,8 @@ "nav.user.description": "User profile bar", + "listelement.badge.dso-type": "Item type:", + "none.listelement.badge": "Item", "publication-claim.title": "Publication claim", diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html index a975f54263..caf5e8fc5a 100644 --- a/src/themes/dspace/app/header/header.component.html +++ b/src/themes/dspace/app/header/header.component.html @@ -17,7 +17,7 @@
-