Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hmcts/ccd-case-ui-toolkit",
"version": "7.2.32",
"version": "7.2.32-javascript-void-removal",
"engines": {
"node": ">=18.19.0"
},
Expand Down
2 changes: 1 addition & 1 deletion projects/ccd-case-ui-toolkit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hmcts/ccd-case-ui-toolkit",
"version": "7.2.32",
"version": "7.2.32-javascript-void-removal",
"engines": {
"node": ">=18.19.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title
href="{{notificationBannerConfig.linkUrl}}">{{notificationBannerConfig.linkText}}</a>
<a *ngIf="notificationBannerConfig.showLink && notificationBannerConfig.triggerOutputEvent"
class="govuk-notification-banner__link"
href="javascript:void(0)"
(click)="onLinkClick(notificationBannerConfig.triggerOutputEventText)">{{notificationBannerConfig.linkText}}</a>
href="#"
(click)="onLinkClick(notificationBannerConfig.triggerOutputEventText); $event.preventDefault()">{{notificationBannerConfig.linkText}}</a>
</p>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<div class="proposition-right">
<span id="user-name">{{username}}</span>
<a (click)="signOut()" id="sign-out" href="javascript:void(0)">{{'Sign Out' | rpxTranslate}}</a>
<button type="button" class="govuk-js-link" (click)="signOut()" id="sign-out">{{'Sign Out' | rpxTranslate}}</button>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
<button class="button" type="submit" [disabled]="submitting()">{{triggerText | rpxTranslate}}</button>
</div>

<p class="cancel"><a (click)="cancel()" href="javascript:void(0)">{{getCancelText() | rpxTranslate}}</a></p>
<p class="cancel"><button type="button" (click)="cancel()" class="govuk-js-link">{{getCancelText() | rpxTranslate}}</button></p>
</form>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ <h2 class="heading-h2">{{pageTitle | rpxTranslate }}</h2>
</td>
<ng-container *ngIf="!caseEdit.isCaseFlagSubmission">
<td class="valign-top check-your-answers__change case-field-change">
<a *ngIf="isChangeAllowed(field)" (click)="navigateToPage(page.id)"
href="javascript:void(0)">
<a *ngIf="isChangeAllowed(field)" (click)="navigateToPage(page.id); $event.preventDefault()"
href="#">
<span class="text-16" attr.aria-label="{{'Change' | rpxTranslate}} {{ field.label | rpxTranslate }}">
{{'Change' | rpxTranslate}}
</span>
Expand Down Expand Up @@ -119,7 +119,7 @@ <h2 class="heading-h2">{{pageTitle | rpxTranslate }}</h2>
</button>
</div>
<p class="cancel">
<a (click)="cancel()" href="javascript:void(0)" [class.disabled]="caseEdit.isSubmitting">{{getCancelText() | rpxTranslate}}</a>
<a (click)="cancel(); $event.preventDefault()" href="#" [class.disabled]="caseEdit.isSubmitting">{{getCancelText() | rpxTranslate}}</a>
</p>
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="govuk-breadcrumbs">
<ol class="govuk-breadcrumbs__list">
<li class="govuk-breadcrumbs__list-item">
<a href="javascript:void(0)" (click)="goToCaseTimeline()" class="govuk-back-link">
<a href="#" (click)="goToCaseTimeline(); $event.preventDefault()" class="govuk-back-link">
{{'Back to case timeline' | rpxTranslate}}
</a>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h2 class="govuk-heading-m">{{'Case details' | rpxTranslate}}</h2>
</button>
<div class="govuk-grid-column-full govuk-!-padding-left-0">
<p>
<a class="govuk-body" (click)="onCancel()" href="javascript:void(0)">
<a class="govuk-body" (click)="onCancel(); $event.preventDefault()" href="#">
{{'Cancel' | rpxTranslate}}
</a>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ <h1 class="govuk-fieldset__heading">
</button>
<div class="govuk-grid-column-full govuk-!-padding-left-0">
<p>
<a class='govuk-body' (click)="onCancel()" href="javascript:void(0)">
<a class='govuk-body' (click)="onCancel(); $event.preventDefault()" href="#">
{{'Cancel' | rpxTranslate}}
</a>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ <h1 class="govuk-fieldset__heading">
</button>
<div class="govuk-grid-column-full govuk-!-padding-left-0">
<p>
<a class="govuk-body" (click)="onCancel()" href="javascript:void(0)">
<a class="govuk-body" (click)="onCancel(); $event.preventDefault()" href="#">
{{'Cancel' | rpxTranslate}}
</a>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ <h1 class="govuk-fieldset__heading">
</button>
<div class="govuk-grid-column-full govuk-!-padding-left-0">
<p>
<a class="govuk-body" (click)="onCancel()" href="javascript:void(0)">
<a class="govuk-body" (click)="onCancel(); $event.preventDefault()" href="#">
{{'Cancel' | rpxTranslate}}
</a>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ <h2 class="govuk-heading-m">
</h2>
<p>{{"You're starting work which could complete more than one of the active tasks for this case." | rpxTranslate}}</p>
<p>{{'Return to tasks tab and start the event from there.' | rpxTranslate}}</p>
<a href="javascript:void(0)" [routerLink]="['/', 'cases', 'case-details', caseId, 'tasks']">{{'Return to tasks tab' | rpxTranslate}}</a>
<a [routerLink]="['/', 'cases', 'case-details', caseId, 'tasks']">{{'Return to tasks tab' | rpxTranslate}}</a>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
<div class="govuk-form-group govuk-form-group--error">
<h2 class="govuk-heading-m">{{'No task available' | rpxTranslate}}</h2>
<p>{{'You should have an assigned task for this event, but something has gone wrong.' | rpxTranslate}}</p>
<a href="javascript:void(0)" [routerLink]="['/', 'cases', 'case-details', caseId, 'tasks']">{{'Return to tasks tab' | rpxTranslate}}</a>
<a [routerLink]="['/', 'cases', 'case-details', caseId, 'tasks']">{{'Return to tasks tab' | rpxTranslate}}</a>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2 class="govuk-heading-m">{{'Task assignment required' | rpxTranslate}}</h2>

<p>{{'This task is assigned to' | rpxTranslate}} {{assignedUserName}}. {{'You must assign it to yourself to continue.' | rpxTranslate}}</p>

<a href="javascript:void(0)" [routerLink]="['/', 'cases', 'case-details', caseId, 'tasks']">
<a [routerLink]="['/', 'cases', 'case-details', caseId, 'tasks']">
{{'Return to tasks tab' | rpxTranslate}}
</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
<h2 class="govuk-heading-m">{{'Task conflict' | rpxTranslate}}</h2>
<p>{{'This task cannot be completed due to conflict with another task or tasks for this case.' | rpxTranslate}}</p>
<p>{{'If the problem persists, contact William Priest' | rpxTranslate}}</p>
<a href="javascript:void(0)" [routerLink]="['/', 'cases', 'case-details', caseId, 'tasks']">{{'Return to tasks tab' | rpxTranslate}}</a>
<a [routerLink]="['/', 'cases', 'case-details', caseId, 'tasks']">{{'Return to tasks tab' | rpxTranslate}}</a>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h2 class="govuk-heading-m">{{'Task assignment required' | rpxTranslate}}</h2>

<p>{{'You must assign one of the available tasks from the task tab to continue with your work.' | rpxTranslate}}</p>

<a href="javascript:void(0)" [routerLink]="['/', 'cases', 'case-details', caseId, 'tasks']">
<a [routerLink]="['/', 'cases', 'case-details', caseId, 'tasks']">
{{'Return to tasks tab to assign a task' | rpxTranslate}}
</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h2 class="heading-h2">{{caseField | ccdFieldLabel}}</h2>
</select>
</div>

<a class="manual-link bottom-30" *ngIf="!shouldShowDetailFields()" (click)="blankAddress()" href="javascript:void(0)">
<a class="manual-link bottom-30" *ngIf="!shouldShowDetailFields()" (click)="blankAddress(); $event.preventDefault()" href="#">
{{"I can't enter a UK postcode" | rpxTranslate}}
</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h2 class="govuk-error-summary__title">There is a problem</h2>
<div class="govuk-error-summary__body">
<ul class="govuk-list govuk-error-summary__list">
<li *ngFor="let errorMessage of errorMessages">
<a href="javascript:void(0);">{{ errorMessage }}</a>
<button type="button" class="govuk-js-link">{{ errorMessage }}</button>
</li>
</ul>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h2 class="govuk-heading-l">Move File</h2>
</div>
<div class="govuk-button-group">
<button class="button button-primary" type="button" (click)="save()">Save</button>
<a (click)="cancel()" class="cancel" href="javascript:void(0)">Cancel</a>
<a (click)="cancel(); $event.preventDefault()" class="cancel" href="#">Cancel</a>
</div>

<ng-template #folder let-cat="cat" let-level="level">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
{{flagForSummaryDisplay.partyName || caseFlagCheckYourAnswersPageStep.CASE_LEVEL_LOCATION }}
</dd>
<dd class="govuk-summary-list__actions">
<a class="govuk-link" href="javascript:void(0)"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_MANAGE_CASE_FLAGS : caseFlagFieldState.FLAG_LOCATION)">
<a class="govuk-link" href="#"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_MANAGE_CASE_FLAGS : caseFlagFieldState.FLAG_LOCATION); $event.preventDefault()">
{{'Change' | rpxTranslate}}<span class="govuk-visually-hidden"> {{'party name' | rpxTranslate}}</span>
</a>
</dd>
Expand All @@ -21,8 +21,8 @@
{{flagDescription}}
</dd>
<dd class="govuk-summary-list__actions">
<a class="govuk-link" href="javascript:void(0)"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_UPDATE : caseFlagFieldState.FLAG_TYPE)">
<a class="govuk-link" href="#"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_UPDATE : caseFlagFieldState.FLAG_TYPE); $event.preventDefault()">
{{'Change' | rpxTranslate}}<span class="govuk-visually-hidden"> {{'flag type' | rpxTranslate}}</span>
</a>
</dd>
Expand All @@ -35,8 +35,8 @@
{{flagDescriptionWelsh}}
</dd>
<dd class="govuk-summary-list__actions">
<a class="govuk-link" href="javascript:void(0)"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_UPDATE_WELSH_TRANSLATION : caseFlagFieldState.FLAG_TYPE)">
<a class="govuk-link" href="#"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_UPDATE_WELSH_TRANSLATION : caseFlagFieldState.FLAG_TYPE); $event.preventDefault()">
{{'Change' | rpxTranslate}}<span class="govuk-visually-hidden"> {{'other description (Welsh)' | rpxTranslate}}</span>
</a>
</dd>
Expand All @@ -49,8 +49,8 @@
{{externalUserUpdate ? flagUpdateComments : flagComments}}
</dd>
<dd class="govuk-summary-list__actions">
<a class="govuk-link" href="javascript:void(0)"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_UPDATE : caseFlagFieldState.FLAG_COMMENTS)">
<a class="govuk-link" href="#"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_UPDATE : caseFlagFieldState.FLAG_COMMENTS); $event.preventDefault()">
{{'Change' | rpxTranslate}}<span class="govuk-visually-hidden"> {{'comments' | rpxTranslate}}</span>
</a>
</dd>
Expand All @@ -63,8 +63,8 @@
{{flagCommentsWelsh}}
</dd>
<dd class="govuk-summary-list__actions">
<a class="govuk-link" href="javascript:void(0)"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_UPDATE_WELSH_TRANSLATION : caseFlagFieldState.FLAG_COMMENTS)">
<a class="govuk-link" href="#"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_UPDATE_WELSH_TRANSLATION : caseFlagFieldState.FLAG_COMMENTS); $event.preventDefault()">
{{'Change' | rpxTranslate}}<span class="govuk-visually-hidden"> {{'comments (Welsh)' | rpxTranslate}}</span>
</a>
</dd>
Expand All @@ -77,8 +77,8 @@
{{flagStatus | rpxTranslate}}
</dd>
<dd class="govuk-summary-list__actions">
<a *ngIf="is2Point1Enabled" class="govuk-link" href="javascript:void(0)"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_UPDATE : caseFlagFieldState.FLAG_STATUS)">
<a *ngIf="is2Point1Enabled" class="govuk-link" href="#"
(click)="changeButtonEmitter.emit(this.summaryListDisplayMode === displayMode.MANAGE ? caseFlagFieldState.FLAG_UPDATE : caseFlagFieldState.FLAG_STATUS); $event.preventDefault()">
{{'Change' | rpxTranslate}}<span class="govuk-visually-hidden"> {{'status' | rpxTranslate}}</span>
</a>
</dd>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<tr>
<th *ngFor="let heading of columns" scope="col">
<span class="text-16">{{columnsAllLabels[heading].label | rpxTranslate}}</span>
<a href="javascript:void(0)"
(click)="sortRowsByColumns(heading)"
<a href="#"
(click)="sortRowsByColumns(heading); $event.preventDefault()"
(keyup.enter)="sortRowsByColumns(heading)"
class="sort-widget"
[attr.aria-label]="'Sort ' + columnsAllLabels[heading].label | rpxTranslate"
Expand All @@ -37,7 +37,7 @@
</ng-container>
<td>
<div style="float: right;">
<a href="javascript:void(0)"> <img src="{{ getImage(i) }}" alt="accordion-img" class="accordion-image"/></a>
<a href="#" (click)="$event.preventDefault()"> <img src="{{ getImage(i) }}" alt="accordion-img" class="accordion-image"/></a>
</div>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ describe('ReadDocumentFieldComponent', () => {
}) as CaseField;
const GATEWAY_DOCUMENT_URL = 'http://localhost:1234/documents';
const GATEWAY_HRS_URL = 'http://localhost:1234/hearing-recordings';
const DOCUMENT_CLICKABLE_HREF = 'javascript:void(0)';

let fixture: ComponentFixture<ReadDocumentFieldComponent>;
let component: ReadDocumentFieldComponent;
Expand Down Expand Up @@ -96,16 +95,15 @@ describe('ReadDocumentFieldComponent', () => {
fixture.detectChanges();

expect(text(de)).toEqual(VALUE.document_filename.toString());
const linkElement = de.query(By.css('a'));
const linkElement = de.query(By.css('button'));
expect(linkElement).toBeTruthy();
expect(attr(linkElement, 'href')).toEqual(DOCUMENT_CLICKABLE_HREF);
});

it('should call Media Viewer when the document link is clicked', () => {
component.caseField.value = VALUE;
fixture.detectChanges();
spyOn(component, 'showMediaViewer');
const linkElement = de.query(By.css('a'));
const linkElement = de.query(By.css('button'));
expect(linkElement).toBeTruthy();
linkElement.triggerEventHandler('click', null);
fixture.detectChanges();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a *ngIf="caseField.value" href="javascript:void(0)"
<button type="button" *ngIf="caseField.value" class="govuk-js-link"
(click)="showMediaViewer()">
{{ caseField.value.document_filename }}
</a>
</button>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h1 class="govuk-heading-xl">There is a problem</h1>
<span class="govuk-visually-hidden">Error:</span> {{serverLinkedApiError.message}}
</p>
<p class="govuk-body">
<a class="govuk-link" href="javascript:void(0)" (click)="onBack()">Go back to the Linked cases tab</a>
<button type="button" class="govuk-js-link" (click)="onBack()">Go back to the Linked cases tab</button>
</p>
</div>
<div *ngIf="!serverLinkedApiError">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1 class="govuk-heading-xl">Check your answers</h1>
{{case.caseName}} <br> {{case.caseReference | ccdCaseReference}}
</td>
<td class="govuk-table__cell">
<a href="javascript:void(0)" class="govuk-link govuk-link--no-visited-state float-right" (click)="onChange()">Change</a>
<a href="#" class="govuk-link govuk-link--no-visited-state float-right" (click)="onChange(); $event.preventDefault()">Change</a>
</td>
</tr>
<tr class="govuk-table__row" *ngIf="!casesToUnlink.length">
Expand Down Expand Up @@ -55,7 +55,7 @@ <h1 class="govuk-heading-xl">Check your answers</h1>
</td>
<td class="govuk-table__cell"></td>
<td class="govuk-table__cell" *ngIf="isLinkCasesJourney">
<a href="javascript:void(0)" class="govuk-link govuk-link--no-visited-state float-right" (click)="onChange()">Change</a>
<a href="#" class="govuk-link govuk-link--no-visited-state float-right" (click)="onChange(); $event.preventDefault()">Change</a>
</td>
</tr>
<tr class="govuk-table__row" *ngIf="!linkedCases.length">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a *ngIf="!noLinkedCases && !isServerError" id="show-hide-link" class="govuk-link" href="javascript:void(0)"
(click)="onClick()">{{showHideLinkText}}</a>
<button type="button" *ngIf="!noLinkedCases && !isServerError" id="show-hide-link" class="govuk-js-link"
(click)="onClick()">{{showHideLinkText}}</button>
<table *ngIf="(getLinkedCasesResponse && showHideLinkText === 'Hide') || noLinkedCases"
aria-describedby="table to display cases linked from">
<thead class="govuk-table__head">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h1 class="govuk-heading-xl" *ngIf="serverLinkedApiError">There is a problem</h1
<p class="govuk-body">There are no cases linked to this one.</p>
</ng-template>
<p class="govuk-body">
<a class="govuk-link" href="javascript:void(0)" (click)="onBack()">Go back to the Linked cases tab</a>
<button type="button" class="govuk-js-link" (click)="onBack()">Go back to the Linked cases tab</button>
</p>
<div class="govuk-button-group">
<button class="button button-primary" type="button" id="back-button" (click)="onBack()">Back</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h1 class="heading-h1">Linked cases</h1>
<div class="govuk-main-wrapper">
<p class="govuk-body">{{serverLinkedApiError.message}}</p>
<span class="govuk-body align-left">
<a href="javascript:void(0)" (click)="reloadCurrentRoute()" id="reload-linked-cases-tab" class="govuk-link">Reload
<a href="#" (click)="reloadCurrentRoute(); $event.preventDefault()" id="reload-linked-cases-tab" class="govuk-link">Reload
the Linked cases tab</a>
</span>
</div>
Expand All @@ -38,7 +38,7 @@ <h1 class="heading-h1">Linked cases</h1>
<div class="govuk-main-wrapper">
<p class="govuk-body">{{serverError.message}}</p>
<span class="govuk-body align-left">
<a href="javascript:void(0)" (click)="reloadCurrentRoute()" id="reload-linked-cases-tab" class="govuk-link">Reload
<a href="#" (click)="reloadCurrentRoute(); $event.preventDefault()" id="reload-linked-cases-tab" class="govuk-link">Reload
the Linked cases tab</a>
</span>
</div>
Expand Down
Loading