diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts index b13d5a4695..60e1b924ee 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/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts index 7123d84134..0ac7003a8b 100644 --- a/cypress/e2e/submission.cy.ts +++ b/cypress/e2e/submission.cy.ts @@ -137,7 +137,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/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index 35487f91ae..4841674852 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -84,7 +84,7 @@
- + {{ '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 3370f83d03..d54a86b568 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 010227b326..ecd584cfb0 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 38bbf44595..a9b4661fad 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) {} + constructor( + protected notifyInfoService: NotifyInfoService, + ) { + } ngOnInit() { - this.coarRestApiUrl = this.notifyInfoService.getCoarLdnLocalInboxUrls(); - } - - /** - * 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(','); - }), + this.coarRestApiUrls$ = this.notifyInfoService.getCoarLdnLocalInboxUrls().pipe( + map((urls: string[]) => urls.map((url: string) => `${url}`).join(', ')), ); } + } diff --git a/src/app/login-page/login-page.component.html b/src/app/login-page/login-page.component.html index 2a95e0ce1c..e32840ead8 100644 --- a/src/app/login-page/login-page.component.html +++ b/src/app/login-page/login-page.component.html @@ -1,7 +1,7 @@
- +

{{"login.form.header" | translate}}

diff --git a/src/app/logout-page/logout-page.component.html b/src/app/logout-page/logout-page.component.html index b5012ed53b..edb86583fd 100644 --- a/src/app/logout-page/logout-page.component.html +++ b/src/app/logout-page/logout-page.component.html @@ -1,7 +1,7 @@
- +

{{"logout.form.header" | translate}}

diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss index 2a62342b7c..d159e4b977 100644 --- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss +++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss @@ -1,5 +1,7 @@ .source-logo { max-height: var(--ds-header-logo-height); + max-width: 100%; + margin: auto; } .source-logo-container { 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 a8ca674c26..7797ba13c9 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 @@
-