Skip to content

TD-5170: Fixed console errors on Notifications page. #1031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Merge Release v1.3.1 englishl ivy to RC
merged 1 commit into from
Mar 18, 2025
Merged

TD-5170: Fixed console errors on Notifications page. #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
<i :class="['fal fa-envelope' + (notification.readOnDate != null ? '-open text-success' : '')]">&nbsp;</i>
<a href="#" @click="showNotification(notification)">{{ notification.title }}</a>
</div>

<a href="#deleteModalButton" data-toggle="modal" @click="deleteNotification()" aria-label="Delete" v-if="notification.userDismissable">
<a href="#deleteModalButton" data-toggle="modal" @click="selectNotification(notification)" aria-label="Delete" v-if="notification.userDismissable">
<i class="fas fa-ellipsis-h fa-lg" style="color: #435563;"></i>
</a>
</div>
Expand Down Expand Up @@ -173,7 +173,7 @@
.catch(e => console.log(e));
}
},
async deleteNotification() {
async deleteNotification() {
await axios.delete(
'/api/notification/' + this.selectedNotification.notificationId + '?userNotificationId=' + this.selectedNotification.id)
.catch(e => console.log(e));
Expand Down
13 changes: 10 additions & 3 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header pr-0 pt-0">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" @click="closeConfirmation" aria-label="Close">
<i class="fa-solid fa-xmark"></i>
</button>
</div>
Expand All @@ -98,7 +98,7 @@
</p>
</div>
<div class="modal-footer justify-content-center">
<button type="button" class="nhsuk-button nhsuk-button--secondary mr-4" data-dismiss="modal">Cancel</button>
<button type="button" class="nhsuk-button nhsuk-button--secondary mr-4" @click="closeConfirmation">Cancel</button>
<button type="button" class="nhsuk-button" @click="deleteNotification">Delete</button>
</div>
</div>
Expand Down Expand Up @@ -143,6 +143,13 @@
$('#deleteModalButton').modal('hide');
$('#deleteModal').modal();
},
closeConfirmation() {
if (document.activeElement instanceof HTMLElement) {
document.activeElement.blur();
}
document.body.focus();
setTimeout(() => { $('#deleteModal').modal('hide'); }, 10);
},
showNotification(notification: NotificationModel) {
this.selectedNotification = notification;
this.showMessage = true;
Expand All @@ -155,7 +162,7 @@
},
async deleteNotification() {
await this.getSelectedComponent().deleteNotification();
$('#deleteModal').modal('hide');
this.closeConfirmation();
this.showMessage = false;
},
notificationTypeContent() {
Expand Down
Loading