From 132e1f95240edbc7d6f24cbb089304c54b7670d6 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Tue, 9 Apr 2024 19:34:00 +0100 Subject: [PATCH 1/6] Minor UI improvements - Fixed DSO edit menu sometimes displaying underneath header based on header z-index - Fixed accessibility issue on request a copy page --- .../request-a-copy/bitstream-request-a-copy-page.component.html | 2 +- .../dso-edit-menu-expandable-section.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html index 1fae737fdb9..2d4ac89fcc3 100644 --- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html +++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html @@ -1,5 +1,5 @@
-

{{'bitstream-request-a-copy.header' | translate}}

+

{{'bitstream-request-a-copy.header' | translate}}

{{'bitstream-request-a-copy.alert.canDownload1' | translate}} {{'bitstream-request-a-copy.alert.canDownload2'| translate}} diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html index cb725e7d700..6e427400eec 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html @@ -1,6 +1,6 @@
+ [ngbTooltip]="itemModel.text | translate" container="body"> From 83bbb98e4f9157a0b5a4f5adf869809303be7288 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Mon, 22 Apr 2024 22:27:00 +0200 Subject: [PATCH 2/6] Fix COAR notify link on the info component --- src/app/footer/footer.component.html | 2 +- .../notify-info/notify-info.component.html | 23 ++++++---------- .../notify-info/notify-info.component.spec.ts | 7 +++-- .../info/notify-info/notify-info.component.ts | 26 ++++++------------ src/assets/i18n/en.json5 | 4 +-- src/assets/images/n-coar.png | Bin 5564 -> 0 bytes src/assets/images/n-coar.svg | 6 ++++ 7 files changed, 30 insertions(+), 38 deletions(-) delete mode 100644 src/assets/images/n-coar.png create mode 100644 src/assets/images/n-coar.svg diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index 35487f91ae2..4841674852b 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -84,7 +84,7 @@
Footer Content
- + {{ 'footer.link.coar-notify-support' | translate }}
diff --git a/src/app/info/notify-info/notify-info.component.html b/src/app/info/notify-info/notify-info.component.html index 3370f83d03c..d54a86b5684 100644 --- a/src/app/info/notify-info/notify-info.component.html +++ b/src/app/info/notify-info/notify-info.component.html @@ -1,18 +1,13 @@
- - {{ 'coar-notify-support.title' | translate }} - - -

{{ 'coar-notify-support.title' | translate }}

-

+

{{ 'coar-notify-support.title' | translate }}

+

-

{{ 'coar-notify-support.ldn-inbox.title' | translate }}

-

+

{{ 'coar-notify-support.ldn-inbox.title' | translate }}

+

-

{{ 'coar-notify-support.message-moderation.title' | translate }}

-

- {{ 'coar-notify-support.message-moderation.content' | translate }} - {{ 'coar-notify-support.message-moderation.feedback-form' | translate }} -

- +

{{ 'coar-notify-support.message-moderation.title' | translate }}

+

+ {{ 'coar-notify-support.message-moderation.content' | translate }} + {{ 'coar-notify-support.message-moderation.feedback-form' | translate }} +

diff --git a/src/app/info/notify-info/notify-info.component.spec.ts b/src/app/info/notify-info/notify-info.component.spec.ts index 010227b326a..ecd584cfb0d 100644 --- a/src/app/info/notify-info/notify-info.component.spec.ts +++ b/src/app/info/notify-info/notify-info.component.spec.ts @@ -16,7 +16,9 @@ describe('NotifyInfoComponent', () => { let notifyInfoServiceSpy: any; beforeEach(async () => { - notifyInfoServiceSpy = jasmine.createSpyObj('NotifyInfoService', ['getCoarLdnLocalInboxUrls']); + notifyInfoServiceSpy = jasmine.createSpyObj('NotifyInfoService', { + getCoarLdnLocalInboxUrls: of([]), + }); await TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), NotifyInfoComponent], @@ -31,8 +33,7 @@ describe('NotifyInfoComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(NotifyInfoComponent); component = fixture.componentInstance; - component.coarRestApiUrl = of([]); - spyOn(component, 'generateCoarRestApiLinksHTML').and.returnValue(of('')); + component.coarRestApiUrls$ = of(''); fixture.detectChanges(); }); diff --git a/src/app/info/notify-info/notify-info.component.ts b/src/app/info/notify-info/notify-info.component.ts index 38bbf445951..a9b4661fada 100644 --- a/src/app/info/notify-info/notify-info.component.ts +++ b/src/app/info/notify-info/notify-info.component.ts @@ -8,7 +8,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { map, Observable, - of, } from 'rxjs'; import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service'; @@ -31,26 +30,17 @@ export class NotifyInfoComponent implements OnInit { /** * Observable containing the COAR REST INBOX API URLs. */ - coarRestApiUrl: Observable = of([]); + coarRestApiUrls$: Observable; - constructor(private notifyInfoService: NotifyInfoService) {} - - ngOnInit() { - this.coarRestApiUrl = this.notifyInfoService.getCoarLdnLocalInboxUrls(); + constructor( + protected notifyInfoService: NotifyInfoService, + ) { } - /** - * Generates HTML code for COAR REST API links. - * @returns An Observable that emits the generated HTML code. - */ - generateCoarRestApiLinksHTML() { - return this.coarRestApiUrl.pipe( - // transform the data into HTML - map((urls) => { - return urls.map(url => ` - ${url} - `).join(','); - }), + ngOnInit() { + this.coarRestApiUrls$ = this.notifyInfoService.getCoarLdnLocalInboxUrls().pipe( + map((urls: string[]) => urls.map((url: string) => `${url}`).join(', ')), ); } + } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 5f313c391d7..867ee009dc1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -6092,11 +6092,11 @@ "coar-notify-support.title": "COAR Notify Protocol", - "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the COAR Notify website.", + "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the COAR Notify website.", "coar-notify-support.ldn-inbox.title": "LDN InBox", - "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.", + "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.", "coar-notify-support.message-moderation.title": "Message Moderation", diff --git a/src/assets/images/n-coar.png b/src/assets/images/n-coar.png deleted file mode 100644 index 5c4c7415724392bb1c7bca439afbf0c6f5c006e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5564 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 diff --git a/src/assets/images/n-coar.svg b/src/assets/images/n-coar.svg new file mode 100644 index 00000000000..bcc92ae30ea --- /dev/null +++ b/src/assets/images/n-coar.svg @@ -0,0 +1,6 @@ + + + + From c2684d30789e4d2782915cff963af196b75a4169 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Tue, 23 Apr 2024 23:02:21 +0200 Subject: [PATCH 3/6] Aligned communities search results like collections on md screens --- .../community-search-result-list-element.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html index 8b5b2e88c3c..f5d68031599 100644 --- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html +++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html @@ -1,5 +1,5 @@
-
+
From 77d0f9cd605c2c0afe1bbf4682e9cb79228d6afa Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Wed, 24 Apr 2024 00:37:07 +0200 Subject: [PATCH 4/6] Fixed item-edit.cy.ts regularly failing because of aria-required-children for role="row" & added missing roles to edit comcol tabs --- cypress/e2e/item-edit.cy.ts | 5 +++++ .../edit-comcol-page/edit-comcol-page.component.html | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts index b13d5a46958..60e1b924eed 100644 --- a/cypress/e2e/item-edit.cy.ts +++ b/cypress/e2e/item-edit.cy.ts @@ -18,6 +18,11 @@ describe('Edit Item > Edit Metadata tab', () => { // 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'); }); diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html index a8ca674c263..7797ba13c91 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html @@ -11,9 +11,10 @@

{{ type + '.edit.head' | translate }}

-