- Evergreen-commits - example.com

[GIT] Evergreen ILS branch rel_3_15 updated. 31b6a8447d3f95b182500079707ab12b72ea3b39
by Git User 31 Mar '25

31 Mar '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via 31b6a8447d3f95b182500079707ab12b72ea3b39 (commit) from a0ad8bbddebd304c37ff19ef18832c08f0415c2a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 31b6a8447d3f95b182500079707ab12b72ea3b39 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Wed Mar 19 05:25:07 2025 +0000 LP2103619 Stack toasts Allows multiple toast messages to appear in a vertical stack. Release-note: Allows multiple toast messages to appear at once. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off by: Shula Link <slink(a)gchrl.org> Signed-off by: Gina Monti <gmonti(a)biblio.org> Signed-off by: Dan Guarracino <dguarracino(a)owwl.org> Signed-off by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.css b/Open-ILS/src/eg2/src/app/share/toast/toast.component.css index 901938313e..da6217df1f 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.css +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.css @@ -9,3 +9,11 @@ bottom: 5px; } +#eg-toast-container ol { + display: flex; + flex-direction: column; +} + +li.alert:not(:last-child) { + filter: brightness(0.85); +} \ No newline at end of file diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.html b/Open-ILS/src/eg2/src/app/share/toast/toast.component.html index 98ed26c6a4..221bcc98e9 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.html +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.html @@ -1,6 +1,8 @@ <output id="eg-toast-container" role="status"> - <div *ngIf="message" class="alert alert-{{message.style}} alert-dismissible border-2 fade shadow-lg show"> - {{message.text}} - <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close alert" (click)="dismiss(message)"></button> - </div> + <ul *ngIf="messages.length" class="list-unstyled"> + <li *ngFor="let message of messages" class="alert alert-{{message.style}} alert-dismissible border-2 fade shadow-lg show"> + {{message.text}} + <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close alert" (click)="dismiss()"></button> + </li> + </ul> </output> diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts b/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts index 444dd31dad..8e01cd0b42 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts @@ -1,7 +1,6 @@ import {Component, Input, OnInit, ViewChild} from '@angular/core'; import {ToastService, ToastMessage} from '@eg/share/toast/toast.service'; import {ServerStoreService} from '@eg/core/server-store.service'; -import { StoreService } from '@eg/core/store.service'; const EG_TOAST_TIMEOUT = 10000; @@ -12,7 +11,7 @@ const EG_TOAST_TIMEOUT = 10000; }) export class ToastComponent implements OnInit { - message: ToastMessage; + messages: ToastMessage[] = []; duration: number = EG_TOAST_TIMEOUT; // track the most recent timeout event @@ -26,7 +25,7 @@ export class ToastComponent implements OnInit { this.toast.messages$.subscribe(msg => this.show(msg)); } - async setDuration() { + setDuration() { this.store.getItem('ui.toast_duration').then(setting => { if (setting) { this.duration = setting * 1000; @@ -35,22 +34,14 @@ export class ToastComponent implements OnInit { } show(msg: ToastMessage) { - this.dismiss(this.message); - this.message = msg; - console.info($localize`${new Date().toLocaleTimeString()} - ${this.message.text}`); + this.messages.push(msg); + console.info($localize`${new Date().toLocaleTimeString()} - ${msg.text}`); + this.timeout = setTimeout( - () => this.dismiss(this.message), + () => this.messages.shift(), this.duration ); } - - dismiss(msg: ToastMessage) { - this.message = null; - if (this.timeout) { - clearTimeout(this.timeout); - this.timeout = null; - } - } } ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/share/toast/toast.component.css | 8 ++++++++ .../eg2/src/app/share/toast/toast.component.html | 10 ++++++---- .../src/eg2/src/app/share/toast/toast.component.ts | 21 ++++++--------------- 3 files changed, 20 insertions(+), 19 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 9c23b870f2360b6814ca1751c20a64850fbf4993
by Git User 31 Mar '25

31 Mar '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 9c23b870f2360b6814ca1751c20a64850fbf4993 (commit) from 7f8aa607789629cc902bb0941f774c3eb5038724 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9c23b870f2360b6814ca1751c20a64850fbf4993 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Wed Mar 19 05:25:07 2025 +0000 LP2103619 Stack toasts Allows multiple toast messages to appear in a vertical stack. Release-note: Allows multiple toast messages to appear at once. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off by: Shula Link <slink(a)gchrl.org> Signed-off by: Gina Monti <gmonti(a)biblio.org> Signed-off by: Dan Guarracino <dguarracino(a)owwl.org> Signed-off by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.css b/Open-ILS/src/eg2/src/app/share/toast/toast.component.css index 901938313e..da6217df1f 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.css +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.css @@ -9,3 +9,11 @@ bottom: 5px; } +#eg-toast-container ol { + display: flex; + flex-direction: column; +} + +li.alert:not(:last-child) { + filter: brightness(0.85); +} \ No newline at end of file diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.html b/Open-ILS/src/eg2/src/app/share/toast/toast.component.html index 98ed26c6a4..221bcc98e9 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.html +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.html @@ -1,6 +1,8 @@ <output id="eg-toast-container" role="status"> - <div *ngIf="message" class="alert alert-{{message.style}} alert-dismissible border-2 fade shadow-lg show"> - {{message.text}} - <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close alert" (click)="dismiss(message)"></button> - </div> + <ul *ngIf="messages.length" class="list-unstyled"> + <li *ngFor="let message of messages" class="alert alert-{{message.style}} alert-dismissible border-2 fade shadow-lg show"> + {{message.text}} + <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close alert" (click)="dismiss()"></button> + </li> + </ul> </output> diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts b/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts index 444dd31dad..8e01cd0b42 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts @@ -1,7 +1,6 @@ import {Component, Input, OnInit, ViewChild} from '@angular/core'; import {ToastService, ToastMessage} from '@eg/share/toast/toast.service'; import {ServerStoreService} from '@eg/core/server-store.service'; -import { StoreService } from '@eg/core/store.service'; const EG_TOAST_TIMEOUT = 10000; @@ -12,7 +11,7 @@ const EG_TOAST_TIMEOUT = 10000; }) export class ToastComponent implements OnInit { - message: ToastMessage; + messages: ToastMessage[] = []; duration: number = EG_TOAST_TIMEOUT; // track the most recent timeout event @@ -26,7 +25,7 @@ export class ToastComponent implements OnInit { this.toast.messages$.subscribe(msg => this.show(msg)); } - async setDuration() { + setDuration() { this.store.getItem('ui.toast_duration').then(setting => { if (setting) { this.duration = setting * 1000; @@ -35,22 +34,14 @@ export class ToastComponent implements OnInit { } show(msg: ToastMessage) { - this.dismiss(this.message); - this.message = msg; - console.info($localize`${new Date().toLocaleTimeString()} - ${this.message.text}`); + this.messages.push(msg); + console.info($localize`${new Date().toLocaleTimeString()} - ${msg.text}`); + this.timeout = setTimeout( - () => this.dismiss(this.message), + () => this.messages.shift(), this.duration ); } - - dismiss(msg: ToastMessage) { - this.message = null; - if (this.timeout) { - clearTimeout(this.timeout); - this.timeout = null; - } - } } ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/share/toast/toast.component.css | 8 ++++++++ .../eg2/src/app/share/toast/toast.component.html | 10 ++++++---- .../src/eg2/src/app/share/toast/toast.component.ts | 21 ++++++--------------- 3 files changed, 20 insertions(+), 19 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. 9c6acbb3328454cf9a6b1f364fdeb4a239d1998e
by Git User 31 Mar '25

31 Mar '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_13 has been updated via 9c6acbb3328454cf9a6b1f364fdeb4a239d1998e (commit) from 942fe6217d2b433b60fcc3b090a687508c6ab301 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9c6acbb3328454cf9a6b1f364fdeb4a239d1998e Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Sun Mar 16 00:15:24 2025 +0000 LP2102735 Update MARC Import/Export tab styling Updates the MARC Import/Export tab styles to match other nav tabs. Release-note: Updates MARC Import/Export tab styles to match other tabs Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off by: Shula Link <slink(a)gchrl.org> Signed-off by: Gina Monti <gmonti(a)biblio.org> Signed-off by: Dan Guarracino <dguarracino(a)owwl.org> Signed-off by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html index a62bcc643c..d46aa4b5e0 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html @@ -1,6 +1,6 @@ <eg-staff-banner bannerText="MARC Batch Import/Export" i18n-bannerText> </eg-staff-banner> -<ul class="nav nav-pills nav-fill pb-4"> +<ul class="nav nav-tabs pb-4"> <li class="nav-item"> <a class="nav-link" [ngClass]="{active: tab==='export'}" routerLink="/staff/cat/vandelay/export" i18n>Export</a> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. c1a238374a7476a075f90125dac99bfbee9ea182
by Git User 31 Mar '25

31 Mar '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_14 has been updated via c1a238374a7476a075f90125dac99bfbee9ea182 (commit) from 8f675c0139ab37c7181a62afe2fd043ab2b24a3e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c1a238374a7476a075f90125dac99bfbee9ea182 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Sun Mar 16 00:15:24 2025 +0000 LP2102735 Update MARC Import/Export tab styling Updates the MARC Import/Export tab styles to match other nav tabs. Release-note: Updates MARC Import/Export tab styles to match other tabs Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off by: Shula Link <slink(a)gchrl.org> Signed-off by: Gina Monti <gmonti(a)biblio.org> Signed-off by: Dan Guarracino <dguarracino(a)owwl.org> Signed-off by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html index a62bcc643c..d46aa4b5e0 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html @@ -1,6 +1,6 @@ <eg-staff-banner bannerText="MARC Batch Import/Export" i18n-bannerText> </eg-staff-banner> -<ul class="nav nav-pills nav-fill pb-4"> +<ul class="nav nav-tabs pb-4"> <li class="nav-item"> <a class="nav-link" [ngClass]="{active: tab==='export'}" routerLink="/staff/cat/vandelay/export" i18n>Export</a> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. a0ad8bbddebd304c37ff19ef18832c08f0415c2a
by Git User 31 Mar '25

31 Mar '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via a0ad8bbddebd304c37ff19ef18832c08f0415c2a (commit) from 0af85e02e4d30304d9aa3d528e49461f5fe7b795 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a0ad8bbddebd304c37ff19ef18832c08f0415c2a Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Sun Mar 16 00:15:24 2025 +0000 LP2102735 Update MARC Import/Export tab styling Updates the MARC Import/Export tab styles to match other nav tabs. Release-note: Updates MARC Import/Export tab styles to match other tabs Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off by: Shula Link <slink(a)gchrl.org> Signed-off by: Gina Monti <gmonti(a)biblio.org> Signed-off by: Dan Guarracino <dguarracino(a)owwl.org> Signed-off by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html index a62bcc643c..d46aa4b5e0 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html @@ -1,6 +1,6 @@ <eg-staff-banner bannerText="MARC Batch Import/Export" i18n-bannerText> </eg-staff-banner> -<ul class="nav nav-pills nav-fill pb-4"> +<ul class="nav nav-tabs pb-4"> <li class="nav-item"> <a class="nav-link" [ngClass]="{active: tab==='export'}" routerLink="/staff/cat/vandelay/export" i18n>Export</a> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 7f8aa607789629cc902bb0941f774c3eb5038724
by Git User 31 Mar '25

31 Mar '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 7f8aa607789629cc902bb0941f774c3eb5038724 (commit) from 13e619107fcbaf15352821399edc3d2ffaef20a7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7f8aa607789629cc902bb0941f774c3eb5038724 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Sun Mar 16 00:15:24 2025 +0000 LP2102735 Update MARC Import/Export tab styling Updates the MARC Import/Export tab styles to match other nav tabs. Release-note: Updates MARC Import/Export tab styles to match other tabs Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off by: Shula Link <slink(a)gchrl.org> Signed-off by: Gina Monti <gmonti(a)biblio.org> Signed-off by: Dan Guarracino <dguarracino(a)owwl.org> Signed-off by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html index a62bcc643c..d46aa4b5e0 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html @@ -1,6 +1,6 @@ <eg-staff-banner bannerText="MARC Batch Import/Export" i18n-bannerText> </eg-staff-banner> -<ul class="nav nav-pills nav-fill pb-4"> +<ul class="nav nav-tabs pb-4"> <li class="nav-item"> <a class="nav-link" [ngClass]="{active: tab==='export'}" routerLink="/staff/cat/vandelay/export" i18n>Export</a> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/vandelay/vandelay.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 0af85e02e4d30304d9aa3d528e49461f5fe7b795
by Git User 31 Mar '25

31 Mar '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via 0af85e02e4d30304d9aa3d528e49461f5fe7b795 (commit) from 33f1e17c1450142a6a1ffe94772cb39e5d7e5387 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0af85e02e4d30304d9aa3d528e49461f5fe7b795 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Wed Mar 19 22:44:02 2025 +0000 LP1947868 Dialog: focus on first focusable element On dialog open, places the cursor on the first focusable element in .modal-body. This may be any interactive element: links, inputs, selects, details summaries, etc. If none, focus will land on the first footer button, or as a last resort, the [X] close button in the dialog header. In alert dialogs, focus is placed on the modal body as a whole rather than the OK button when there is nothing interactive in the content. This avoids the issue where barcode scanners' automatically added 'Enter' can accidentally dismiss the alert telling the user that something went wrong. Release-note: Sets focus on the first interactive element in dialog body Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off by: Shula Link <slink(a)gchrl.org> Signed-off by: Gina Monti <gmonti(a)biblio.org> Signed-off by: Dan Guarracino <dguarracino(a)owwl.org> Signed-off by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/share/dialog/alert.component.html b/Open-ILS/src/eg2/src/app/share/dialog/alert.component.html index 87a96637a7..722248c3d1 100644 --- a/Open-ILS/src/eg2/src/app/share/dialog/alert.component.html +++ b/Open-ILS/src/eg2/src/app/share/dialog/alert.component.html @@ -1,9 +1,9 @@ <ng-template #dialogContent> - <div class="modal-body"> - <h4 class="modal-title"> - <span *ngIf="!dialogTitle" i18n>Could Not Complete The Action</span> + <div class="modal-body modal-alert" tabindex="-1" role="status"> + <h2 class="modal-title text-reset mb-3"> + <span *ngIf="!dialogTitle" i18n>Could not complete the action</span> <span *ngIf="dialogTitle">{{dialogTitle}}</span> - </h4> + </h2> <ng-container *ngIf="!dialogBodyTemplate"> <div class="alert" [ngClass]="'alert-' + alertType">{{dialogBody}}</div> </ng-container> @@ -13,7 +13,7 @@ <ng-content></ng-content> </div> <div class="modal-footer"> - <button type="button" class="btn btn-success" + <button type="button" class="btn btn-normal" (click)="close()" i18n>OK</button> </div> </ng-template> diff --git a/Open-ILS/src/eg2/src/app/share/dialog/alert.component.ts b/Open-ILS/src/eg2/src/app/share/dialog/alert.component.ts index 9911cf0195..b8183c074e 100644 --- a/Open-ILS/src/eg2/src/app/share/dialog/alert.component.ts +++ b/Open-ILS/src/eg2/src/app/share/dialog/alert.component.ts @@ -3,7 +3,8 @@ import {DialogComponent} from '@eg/share/dialog/dialog.component'; @Component({ selector: 'eg-alert-dialog', - templateUrl: './alert.component.html' + templateUrl: './alert.component.html', + styles: ['.modal-alert.modal-body:is(:focus, :focus-visible) { outline: 0.25rem solid var(--bs-border-color-translucent); }'] }) /** diff --git a/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts b/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts index b4a37be97c..668b23b56f 100644 --- a/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts @@ -63,8 +63,6 @@ export class DialogComponent implements OnInit { // The modalRef allows direct control of the modal instance. protected modalRef: NgbModalRef = null; - public focusable: string; - constructor(private modalService: NgbModal) {} // Close all active dialogs @@ -79,26 +77,6 @@ export class DialogComponent implements OnInit { ngOnInit() { this.onOpen$ = new EventEmitter<any>(); - - const notFocusable = ':is(:disabled, [inert], [inert] *, [hidden], [hidden] *, [tabindex^="-"])'; - const isFocusable = [ - '[egAutofocus]', - '[ngbAutofocus]', - 'a[href]', - 'area[href]', - 'input:not([type="hidden"]):not(fieldset:disabled *)', - 'select:not(fieldset:disabled *)', - 'textarea:not(fieldset:disabled *)', - 'details > summary:first-of-type:not(details:not([open]) > details summary)', - 'details:not(:has(> summary)):not(details:not([open]) > details)', - 'button', - 'iframe', - 'audio[controls]', - 'video[controls]', - '[contenteditable]', - '[tabindex]' - ].join(', '); - this.focusable = `:is(${isFocusable}):not(${notFocusable})`; } open(options: NgbModalOptions = { backdrop: 'static' }): Observable<any> { @@ -121,7 +99,7 @@ export class DialogComponent implements OnInit { setTimeout(() => { this.onOpen$.emit(true); this._setFocus(); - }); + }, 100); } return new Observable(observer => { @@ -141,13 +119,26 @@ export class DialogComponent implements OnInit { } // Look for the first focusable element in .modal-body. - // If none, focus will default to the 'X' close button, if present, or the first footer button + // Fallbacks are the footer buttons, then (implicitly) the 'X' close button in the dialog header private _setFocus() { if (!this.modalRef) {return;} if (!this._elRef.nativeElement.contains(this._document.activeElement)) { - const elementToFocus = this._elRef.nativeElement.querySelector('.modal-body ' + this.focusable) as HTMLElement; - // console.debug('elementToFocus', elementToFocus); - setTimeout(() => elementToFocus?.focus()); + const dialogEl = this.modalRef['_windowCmptRef'].instance['_elRef'].nativeElement; + const dialogBodySelector = `.modal-body ${this.getFocusable()}`; + const dialogFooterSelector = `.modal-footer ${this.getFocusable()}`; + setTimeout(() => { + let elementToFocus = dialogEl.querySelector(dialogBodySelector) as HTMLElement; + if (!elementToFocus) { + // if this is an alert dialog, focus the whole body rather than a footer button + if (this.hasOwnProperty('alertType')) { // eslint-disable-line no-prototype-builtins + elementToFocus = dialogEl.querySelector('.modal-body') as HTMLElement; + } else { + elementToFocus = dialogEl.querySelector(dialogFooterSelector) as HTMLElement; + } + } + elementToFocus?.focus(); + console.debug('elementToFocus', elementToFocus); + }); } } @@ -155,6 +146,28 @@ export class DialogComponent implements OnInit { setTimeout(() => this.returnFocusTo.focus()); } + public getFocusable() { + const notFocusable = ':is(:disabled, [inert], [inert] *, [hidden], [hidden] *, [tabindex^="-"])'; + const isFocusable = [ + '[egAutofocus]', + '[ngbAutofocus]', + 'a[href]', + 'area[href]', + 'input:not([type="hidden"]):not(fieldset:disabled *)', + 'select:not(fieldset:disabled *)', + 'textarea:not(fieldset:disabled *)', + 'details > summary:first-of-type:not(details:not([open]) > details summary)', + 'details:not(:has(> summary)):not(details:not([open]) > details)', + 'button', + 'iframe', + 'audio[controls]', + 'video[controls]', + '[contenteditable]', + '[tabindex]' + ].join(', '); + return `:is(${isFocusable}):not(${notFocusable})`; + } + // Send a response to the caller without closing the dialog. respond(value: any) { if (this.observer && value !== undefined) { ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/share/dialog/alert.component.html | 10 ++-- .../eg2/src/app/share/dialog/alert.component.ts | 3 +- .../eg2/src/app/share/dialog/dialog.component.ts | 67 +++++++++++++--------- 3 files changed, 47 insertions(+), 33 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 13e619107fcbaf15352821399edc3d2ffaef20a7
by Git User 31 Mar '25

31 Mar '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 13e619107fcbaf15352821399edc3d2ffaef20a7 (commit) from bb256ffaad6cebf02118389679a3b8491f4e7b83 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 13e619107fcbaf15352821399edc3d2ffaef20a7 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Wed Mar 19 22:44:02 2025 +0000 LP1947868 Dialog: focus on first focusable element On dialog open, places the cursor on the first focusable element in .modal-body. This may be any interactive element: links, inputs, selects, details summaries, etc. If none, focus will land on the first footer button, or as a last resort, the [X] close button in the dialog header. In alert dialogs, focus is placed on the modal body as a whole rather than the OK button when there is nothing interactive in the content. This avoids the issue where barcode scanners' automatically added 'Enter' can accidentally dismiss the alert telling the user that something went wrong. Release-note: Sets focus on the first interactive element in dialog body Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off by: Shula Link <slink(a)gchrl.org> Signed-off by: Gina Monti <gmonti(a)biblio.org> Signed-off by: Dan Guarracino <dguarracino(a)owwl.org> Signed-off by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/share/dialog/alert.component.html b/Open-ILS/src/eg2/src/app/share/dialog/alert.component.html index 87a96637a7..722248c3d1 100644 --- a/Open-ILS/src/eg2/src/app/share/dialog/alert.component.html +++ b/Open-ILS/src/eg2/src/app/share/dialog/alert.component.html @@ -1,9 +1,9 @@ <ng-template #dialogContent> - <div class="modal-body"> - <h4 class="modal-title"> - <span *ngIf="!dialogTitle" i18n>Could Not Complete The Action</span> + <div class="modal-body modal-alert" tabindex="-1" role="status"> + <h2 class="modal-title text-reset mb-3"> + <span *ngIf="!dialogTitle" i18n>Could not complete the action</span> <span *ngIf="dialogTitle">{{dialogTitle}}</span> - </h4> + </h2> <ng-container *ngIf="!dialogBodyTemplate"> <div class="alert" [ngClass]="'alert-' + alertType">{{dialogBody}}</div> </ng-container> @@ -13,7 +13,7 @@ <ng-content></ng-content> </div> <div class="modal-footer"> - <button type="button" class="btn btn-success" + <button type="button" class="btn btn-normal" (click)="close()" i18n>OK</button> </div> </ng-template> diff --git a/Open-ILS/src/eg2/src/app/share/dialog/alert.component.ts b/Open-ILS/src/eg2/src/app/share/dialog/alert.component.ts index 9911cf0195..b8183c074e 100644 --- a/Open-ILS/src/eg2/src/app/share/dialog/alert.component.ts +++ b/Open-ILS/src/eg2/src/app/share/dialog/alert.component.ts @@ -3,7 +3,8 @@ import {DialogComponent} from '@eg/share/dialog/dialog.component'; @Component({ selector: 'eg-alert-dialog', - templateUrl: './alert.component.html' + templateUrl: './alert.component.html', + styles: ['.modal-alert.modal-body:is(:focus, :focus-visible) { outline: 0.25rem solid var(--bs-border-color-translucent); }'] }) /** diff --git a/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts b/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts index b4a37be97c..668b23b56f 100644 --- a/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts @@ -63,8 +63,6 @@ export class DialogComponent implements OnInit { // The modalRef allows direct control of the modal instance. protected modalRef: NgbModalRef = null; - public focusable: string; - constructor(private modalService: NgbModal) {} // Close all active dialogs @@ -79,26 +77,6 @@ export class DialogComponent implements OnInit { ngOnInit() { this.onOpen$ = new EventEmitter<any>(); - - const notFocusable = ':is(:disabled, [inert], [inert] *, [hidden], [hidden] *, [tabindex^="-"])'; - const isFocusable = [ - '[egAutofocus]', - '[ngbAutofocus]', - 'a[href]', - 'area[href]', - 'input:not([type="hidden"]):not(fieldset:disabled *)', - 'select:not(fieldset:disabled *)', - 'textarea:not(fieldset:disabled *)', - 'details > summary:first-of-type:not(details:not([open]) > details summary)', - 'details:not(:has(> summary)):not(details:not([open]) > details)', - 'button', - 'iframe', - 'audio[controls]', - 'video[controls]', - '[contenteditable]', - '[tabindex]' - ].join(', '); - this.focusable = `:is(${isFocusable}):not(${notFocusable})`; } open(options: NgbModalOptions = { backdrop: 'static' }): Observable<any> { @@ -121,7 +99,7 @@ export class DialogComponent implements OnInit { setTimeout(() => { this.onOpen$.emit(true); this._setFocus(); - }); + }, 100); } return new Observable(observer => { @@ -141,13 +119,26 @@ export class DialogComponent implements OnInit { } // Look for the first focusable element in .modal-body. - // If none, focus will default to the 'X' close button, if present, or the first footer button + // Fallbacks are the footer buttons, then (implicitly) the 'X' close button in the dialog header private _setFocus() { if (!this.modalRef) {return;} if (!this._elRef.nativeElement.contains(this._document.activeElement)) { - const elementToFocus = this._elRef.nativeElement.querySelector('.modal-body ' + this.focusable) as HTMLElement; - // console.debug('elementToFocus', elementToFocus); - setTimeout(() => elementToFocus?.focus()); + const dialogEl = this.modalRef['_windowCmptRef'].instance['_elRef'].nativeElement; + const dialogBodySelector = `.modal-body ${this.getFocusable()}`; + const dialogFooterSelector = `.modal-footer ${this.getFocusable()}`; + setTimeout(() => { + let elementToFocus = dialogEl.querySelector(dialogBodySelector) as HTMLElement; + if (!elementToFocus) { + // if this is an alert dialog, focus the whole body rather than a footer button + if (this.hasOwnProperty('alertType')) { // eslint-disable-line no-prototype-builtins + elementToFocus = dialogEl.querySelector('.modal-body') as HTMLElement; + } else { + elementToFocus = dialogEl.querySelector(dialogFooterSelector) as HTMLElement; + } + } + elementToFocus?.focus(); + console.debug('elementToFocus', elementToFocus); + }); } } @@ -155,6 +146,28 @@ export class DialogComponent implements OnInit { setTimeout(() => this.returnFocusTo.focus()); } + public getFocusable() { + const notFocusable = ':is(:disabled, [inert], [inert] *, [hidden], [hidden] *, [tabindex^="-"])'; + const isFocusable = [ + '[egAutofocus]', + '[ngbAutofocus]', + 'a[href]', + 'area[href]', + 'input:not([type="hidden"]):not(fieldset:disabled *)', + 'select:not(fieldset:disabled *)', + 'textarea:not(fieldset:disabled *)', + 'details > summary:first-of-type:not(details:not([open]) > details summary)', + 'details:not(:has(> summary)):not(details:not([open]) > details)', + 'button', + 'iframe', + 'audio[controls]', + 'video[controls]', + '[contenteditable]', + '[tabindex]' + ].join(', '); + return `:is(${isFocusable}):not(${notFocusable})`; + } + // Send a response to the caller without closing the dialog. respond(value: any) { if (this.observer && value !== undefined) { ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/share/dialog/alert.component.html | 10 ++-- .../eg2/src/app/share/dialog/alert.component.ts | 3 +- .../eg2/src/app/share/dialog/dialog.component.ts | 67 +++++++++++++--------- 3 files changed, 47 insertions(+), 33 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. bb256ffaad6cebf02118389679a3b8491f4e7b83
by Git User 31 Mar '25

31 Mar '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via bb256ffaad6cebf02118389679a3b8491f4e7b83 (commit) from c36282b9258ba7be1c9ef10905ab418ade536d44 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bb256ffaad6cebf02118389679a3b8491f4e7b83 Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Mon Mar 31 09:05:03 2025 -0700 LP2074112 follow-up: allow angular unit tests to compile LP2074112 added a ninth parameter to the constructor of this component, but did not update the test in which the constructor was called. This caused the angular unit tests to not be able to compile at all. This work was done in the collaborative code review -- many thanks for this! Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/copy-attrs.component.spec.ts b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/copy-attrs.component.spec.ts index 465bb742f6..5b4212046a 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/copy-attrs.component.spec.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/copy-attrs.component.spec.ts @@ -24,7 +24,7 @@ describe('CopyAttrsComponent', () => { beforeEach(() => { component = new CopyAttrsComponent(idlMock, orgMock, authServiceMock, - null, formatServiceMock, storeServiceMock, + null, null, formatServiceMock, storeServiceMock, toastServiceMock, volCopyServiceMock); component.copyTemplateCbox = jasmine.createSpyObj<ComboboxComponent>(['entries']); component.copyTemplateCbox.selected = {id: 0}; ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/volcopy/copy-attrs.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 33f1e17c1450142a6a1ffe94772cb39e5d7e5387
by Git User 27 Mar '25

27 Mar '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via 33f1e17c1450142a6a1ffe94772cb39e5d7e5387 (commit) from 8577efdd85a2735592212aae501018dab073389c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 33f1e17c1450142a6a1ffe94772cb39e5d7e5387 Author: Dan Briem <dbriem(a)harrisonpl.org> Date: Fri Feb 14 21:57:52 2025 +0000 LP#2098011 Holds Shelving Location Group Filter Not Reapplying On the holds pull list, filtering by shelving location group, removing the filter, then reapplying it fails because of a malformed pcrud request. Fix condition: !groupsToMap.length instead of !groupsToMap. Release-note: Fixes a bug where re-applying a shelving location group filter to the pull list fails. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Gina Monti <gmonti(a)biblio.org> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/copy-locations-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holds/copy-locations-dialog.component.ts index 011cb5580c..d06b20eef8 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holds/copy-locations-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holds/copy-locations-dialog.component.ts @@ -211,7 +211,7 @@ export class HoldCopyLocationsDialogComponent return mappedIds; }, []); - if (!groupsToMap) {return of([...new Set(cachedIds)]);} + if (!groupsToMap.length) {return of([...new Set(cachedIds)]);} // otherwise, prepare the pcrud search groupsToMap.forEach(id => this.mappedIdsCache[id] = []); ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/holds/copy-locations-dialog.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0