March 2025 - Evergreen-commits

[GIT] Evergreen ILS branch main updated. 8dbeb06ce59a6376fc239ddea0e8c44996e168ef
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 8dbeb06ce59a6376fc239ddea0e8c44996e168ef (commit) from 4c0c258397b4c0f0452aaf04f993255003b52008 (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 8dbeb06ce59a6376fc239ddea0e8c44996e168ef Author: Jane Sandberg <js7389(a)princeton.edu> Date: Mon Mar 31 16:23:02 2025 -0700 LP2074112 follow-up: address NG0203: inject() must be called from an injection context errors in angular tests The affected angular unit tests all had two characteristics in common: * They tested a component that extends DialogComponent * They had tried to avoid using the extensive boilerplate necessary to use Angular Dependency Injection in test contexts by explicitly calling the component's constructor (i.e. treating the components like a plain old typescript object). LP2074112 forced the issue of Angular DI by including the newer "inject" dependency injection syntax in the DialogComponent. This commit gets these tests passing again by using Angular's TestBed boilerplate to join the dependency injection world. Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.spec.ts b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.spec.ts index ab3123ca00..3e5c83561c 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.spec.ts +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.spec.ts @@ -5,8 +5,9 @@ import { FmRecordEditorComponent } from './fm-editor.component'; import { FormatService } from '@eg/core/format.service'; import { OrgService } from '@eg/core/org.service'; import { PcrudService } from '@eg/core/pcrud.service'; -import { waitForAsync } from '@angular/core/testing'; +import { TestBed, waitForAsync } from '@angular/core/testing'; import { of } from 'rxjs'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; describe('FmRecordEditorComponent', () => { let component: FmRecordEditorComponent; @@ -43,9 +44,18 @@ describe('FmRecordEditorComponent', () => { } }); - component = new FmRecordEditorComponent( - mockModal, mockIdl, mockToast, mockFormat, mockOrg, mockPcrud - ); + TestBed.configureTestingModule({ + providers: [ + {provide: NgbModal, useValue: mockModal}, + {provide: IdlService, useValue: mockIdl}, + {provide: ToastService, useValue: mockToast}, + {provide: FormatService, useValue: mockFormat}, + {provide: OrgService, useValue: mockOrg}, + {provide: PcrudService, useValue: mockPcrud} + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + component = TestBed.createComponent(FmRecordEditorComponent).componentInstance; }); describe('hidden fields', () => { diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.spec.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.spec.ts index 28d4d9933e..799ce6ba7f 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.spec.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.spec.ts @@ -1,18 +1,20 @@ import { PermService } from '@eg/core/perm.service'; -import { waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ToastService } from '@eg/share/toast/toast.service'; import { CourseService } from '@eg/staff/share/course.service'; import { AuthService } from '@eg/core/auth.service'; import { NetService } from '@eg/core/net.service'; import { PcrudService } from '@eg/core/pcrud.service'; import { CourseAssociateMaterialComponent } from './course-associate-material.component'; -import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {NgbModal, NgbNav} from '@ng-bootstrap/ng-bootstrap'; import { of } from 'rxjs'; import { DialogComponent } from '@eg/share/dialog/dialog.component'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; describe('CourseAssociateMaterialComponent', () => { let component: CourseAssociateMaterialComponent; + let fixture: ComponentFixture<CourseAssociateMaterialComponent>; const mockLibrary = { id: () => 5, @@ -35,10 +37,10 @@ describe('CourseAssociateMaterialComponent', () => { a: [], classname: 'acmc', _isfieldmapper: true, - owning_lib: () => mockLibrary2 + owning_lib: () => mockLibrary2, + course_number: () => 'HIST123' }; - const authServiceSpy = jasmine.createSpyObj<AuthService>(['token']); const courseServiceSpy = jasmine.createSpyObj<CourseService>(['associateMaterials']); courseServiceSpy.associateMaterials.and.returnValue({item: mockItem, material: new Promise(() => {})}); const netServiceSpy = jasmine.createSpyObj<NetService>(['request']); @@ -53,10 +55,25 @@ describe('CourseAssociateMaterialComponent', () => { const rejectedDialogComponentSpy = jasmine.createSpyObj<DialogComponent>(['open']); rejectedDialogComponentSpy.open.and.returnValue(of(false)); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + providers: [ + {provide: AuthService, useValue: jasmine.createSpyObj<AuthService>(['token'])}, + {provide: CourseService, useValue: courseServiceSpy}, + {provide: NetService, useValue: netServiceSpy}, + {provide: PcrudService, useValue: pcrudServiceSpy}, + {provide: ToastService, useValue: toastServiceSpy}, + {provide: PermService, useValue: permServiceSpy}, + {provide: NgbModal, useValue: modalSpy}, + ], + schemas: [NO_ERRORS_SCHEMA], + imports: [NgbNav] + }).compileComponents(); + })); + beforeEach(() => { - component = new CourseAssociateMaterialComponent(authServiceSpy, courseServiceSpy, - netServiceSpy, pcrudServiceSpy, - toastServiceSpy, permServiceSpy, modalSpy); + fixture = TestBed.createComponent(CourseAssociateMaterialComponent); + component = fixture.componentInstance; component.confirmOtherLibraryDialog = dialogComponentSpy; component.currentCourse = mockCourse; }); diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.spec.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.spec.ts index 30cbc66d02..b58fdebb81 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.spec.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.spec.ts @@ -1,10 +1,11 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { EditOuSettingDialogComponent } from './edit-org-unit-setting-dialog.component'; -import { TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { AfterViewInit, CUSTOM_ELEMENTS_SCHEMA, ChangeDetectorRef, Component, TemplateRef, ViewChild } from '@angular/core'; const modal = jasmine.createSpyObj<NgbModal>(['open']); -let component = new EditOuSettingDialogComponent(modal); +let fixture: ComponentFixture<EditOuSettingDialogComponent>; +let component: EditOuSettingDialogComponent; @Component({ template: ` @@ -25,6 +26,20 @@ class MockModalComponent implements AfterViewInit { } describe('EditOuSettingDialogComponent', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ + { provide: NgbModal, useValue: modal} + ], declarations: [ + MockModalComponent, + EditOuSettingDialogComponent + ], schemas: [ + CUSTOM_ELEMENTS_SCHEMA + ] + }).compileComponents(); + fixture = TestBed.createComponent(EditOuSettingDialogComponent); + component = fixture.componentInstance; + }); describe('inputType()', () => { describe('when setting name is lib.timezone', () => { it('returns timezone', () => { @@ -48,19 +63,9 @@ describe('EditOuSettingDialogComponent', () => { }); describe('template', () => { it(('displays a timezone select if the entry is lib.timezone'), waitForAsync(() => { - TestBed.configureTestingModule({ - providers: [ - { provide: NgbModal, useValue: modal} - ], declarations: [ - MockModalComponent, - EditOuSettingDialogComponent - ], schemas: [ - CUSTOM_ELEMENTS_SCHEMA - ] - }).compileComponents(); - const fixture = TestBed.createComponent(MockModalComponent); - const mockModal = fixture.debugElement.componentInstance; - fixture.detectChanges(); + const mockModalFixture = TestBed.createComponent(MockModalComponent); + const mockModal = mockModalFixture.debugElement.componentInstance; + mockModalFixture.detectChanges(); mockModal.ngAfterViewInit(); component = mockModal.componentRef; const entry = { @@ -68,8 +73,8 @@ describe('EditOuSettingDialogComponent', () => { dataType: 'string' }; component.entry = entry; - const editElement: HTMLElement = fixture.nativeElement; - fixture.detectChanges(); + const editElement: HTMLElement = mockModalFixture.nativeElement; + mockModalFixture.detectChanges(); expect(editElement.querySelectorAll('eg-timezone-select').length).toEqual(1); })); }); diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.spec.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.spec.ts index 6453be286d..739809e1b3 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.spec.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-setting-history-dialog.component.spec.ts @@ -1,6 +1,8 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { OrgService } from '@eg/core/org.service'; import { OuSettingHistoryDialogComponent } from './org-unit-setting-history-dialog.component'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; describe('OuSettingHistoryDialogComponent', () => { const mockOrg = { @@ -10,10 +12,25 @@ describe('OuSettingHistoryDialogComponent', () => { id: () => 22 }; + let component: OuSettingHistoryDialogComponent; + let fixture: ComponentFixture<OuSettingHistoryDialogComponent>; + + const orgServiceSpy = jasmine.createSpyObj<OrgService>(['get']); const modalSpy = jasmine.createSpyObj<NgbModal>(['open']); orgServiceSpy.get.and.returnValue(mockOrg); - const component = new OuSettingHistoryDialogComponent(orgServiceSpy, modalSpy); + + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ + {provide: OrgService, useValue: orgServiceSpy}, + {provide: NgbModal, useValue: modalSpy} + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + fixture = TestBed.createComponent(OuSettingHistoryDialogComponent); + component = fixture.componentInstance; + }); it('can revert a change back to a null value', () => { const mockLog = { diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.spec.ts b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.spec.ts index 5c93a93920..710a6f75b4 100644 --- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.spec.ts +++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.spec.ts @@ -6,6 +6,13 @@ import { NetService } from '@eg/core/net.service'; import { of } from 'rxjs'; import { AuthService } from '@eg/core/auth.service'; import * as moment from 'moment'; +import { TestBed } from '@angular/core/testing'; +import { OrgService } from '@eg/core/org.service'; +import { PcrudService } from '@eg/core/pcrud.service'; +import { Router } from '@angular/router'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ToastService } from '@eg/share/toast/toast.service'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; let component: CreateReservationDialogComponent; @@ -24,8 +31,21 @@ describe('CreateReservationDialogComponent', () => { 'textcode': 'RESOURCE_IN_USE', 'desc': 'Resource is in use at this time' })); - component = new CreateReservationDialogComponent(mockAuth, mockFormat, - mockNet, null, null, null, null, mockPbv, null); + TestBed.configureTestingModule({ + providers: [ + {provide: AuthService, useValue: mockAuth}, + {provide: FormatService, useValue: mockFormat}, + {provide: NetService, useValue: mockNet}, + {provide: OrgService, useValue: null}, + {provide: PcrudService, useValue: null}, + {provide: Router, useValue: null}, + {provide: NgbModal, useValue: null}, + {provide: PatronBarcodeValidator, useValue: mockPbv}, + {provide: ToastService, useValue: null} + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + component = TestBed.createComponent(CreateReservationDialogComponent).componentInstance; component.ngOnInit(); component.setDefaultTimes([moment()], 15); component.targetResourceType = {id: 10, label: 'Friendly penguin'}; ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/share/fm-editor/fm-editor.spec.ts | 18 +++++++--- .../course-associate-material.component.spec.ts | 31 +++++++++++++---- .../edit-org-unit-setting-dialog.component.spec.ts | 39 ++++++++++++---------- ...g-unit-setting-history-dialog.component.spec.ts | 19 ++++++++++- .../create-reservation-dialog.component.spec.ts | 24 +++++++++++-- 5 files changed, 100 insertions(+), 31 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 7db4ac785cb66e79a88fa1cd13755cef7af7ace6
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 7db4ac785cb66e79a88fa1cd13755cef7af7ace6 (commit) via 9a780613dcfe3279d3f5d7436c2dda3345e60cb5 (commit) from a9fc46eb8f9273b3c10254cf21947b98ff022499 (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 7db4ac785cb66e79a88fa1cd13755cef7af7ace6 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Feb 17 22:44:47 2025 +0000 LP2080373 Right-click menus for grid utility columns Sets up the right-click context menu actions in grid checkbox, flair, and row counter columns. Release-note: Right-click menu support for grid utility columns Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Lindsay Stratton <lstratton(a)wlsmail.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html index 1090490d33..3ea17e1433 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html @@ -4,29 +4,41 @@ <ng-container *ngIf="!context.disableSelect"> <td role="gridcell" class="eg-grid-cell eg-grid-checkbox-cell"> - <div class="eg-grid-cell-contents"> + <div class="eg-grid-cell-contents" #rowContextMenu="ngbPopover" + popoverTitle="Actions for Selected Rows" i18n-popoverTitle + (contextmenu)="onRowContextClick($event, row, rowContextMenu)" + [ngbPopover]="contextMenu" + placement="right" + triggers="manual"> <input type='checkbox' [ngModel]="context.rowSelector.indexes[context.getRowIndex(row)]" (ngModelChange)="context.rowSelector.toggle(context.getRowIndex(row))" - i18n-aria-label="e.g. Row 13" attr.aria-label="Row {{context.pager.rowNumber(idx)}}" - #rowContextMenu="ngbPopover" + i18n-aria-label="e.g. Row 13" attr.aria-label="Row {{context.pager.rowNumber(idx)}}"> + </div> + </td> + </ng-container> + <td role="gridcell" class="eg-grid-cell eg-grid-number-cell alphanumeric" (click)="onRowClick($event, row, idx)"> + <div class="eg-grid-cell-contents" #rowContextMenu="ngbPopover" popoverTitle="Actions for Selected Rows" i18n-popoverTitle (contextmenu)="onRowContextClick($event, row, rowContextMenu)" [ngbPopover]="contextMenu" placement="right" triggers="manual"> - </div> - </td> - </ng-container> - <td role="gridcell" class="eg-grid-cell eg-grid-number-cell alphanumeric"> - <div class="eg-grid-cell-contents">{{context.pager.rowNumber(idx)}}</div> + {{context.pager.rowNumber(idx)}} + </div> </td> - <td role="gridcell" *ngIf="context.rowFlairIsEnabled" class="eg-grid-cell eg-grid-flair-cell"> + <td role="gridcell" *ngIf="context.rowFlairIsEnabled" class="eg-grid-cell eg-grid-flair-cell" + (click)="onRowClick($event, row, idx)">  <ng-container *ngIf="context.rowFlairCallback(row); let flair"> <ng-container *ngIf="flair.icon"> - <div class="eg-grid-cell-contents"> + <div class="eg-grid-cell-contents" #rowContextMenu="ngbPopover" + popoverTitle="Actions for Selected Rows" i18n-popoverTitle + (contextmenu)="onRowContextClick($event, row, rowContextMenu)" + [ngbPopover]="contextMenu" + placement="right" + triggers="manual"> <span class="material-icons" aria-hidden="true" title="{{flair.title}}" i18n-title> {{flair.icon}} @@ -46,9 +58,9 @@  <td role="gridcell" *ngFor="let col of context.columnSet.displayColumns()" class="eg-grid-cell eg-grid-body-cell" - [ngClass]="context.setClassNames(row, col)"> + [ngClass]="context.setClassNames(row, col)" + (click)="onRowClick($event, row, idx)"> <div class="eg-grid-cell-contents" (dblclick)="onRowDblClick(row)" - (click)="onRowClick($event, row, idx)" #rowContextMenu="ngbPopover" popoverTitle="Actions for Selected Rows" i18n-popoverTitle (contextmenu)="onRowContextClick($event, row, rowContextMenu)" diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts index aeffb4722b..2be65e2e72 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts @@ -29,6 +29,11 @@ export class GridBodyComponent { return; } + if (['a', 'button', 'input', 'select', 'summary'].includes($event.target.tagName.toLowerCase())) { + // avoid interrupting normal interactive elements + return; + } + const index = this.context.getRowIndex(row); if (this.context.disableMultiSelect) { commit 9a780613dcfe3279d3f5d7436c2dda3345e60cb5 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Feb 17 22:30:26 2025 +0000 LP2080373 Expand grid row right-click area (Chrome) In Chrome, .eg-grid-cell-contents (which carries the right-click context menu handler) does not stretch to fill the available table cell height. The fix is to set an explicit, pixel-based height on the parent <table> element. Setting it to 1px works, even though this will be overridden by the child row and cell heights. Release-note: Allow right-click anywhere in grid cells in Chrome Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.component.css b/Open-ILS/src/eg2/src/app/share/grid/grid.component.css index 75cc192c4f..280c02e14b 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid.component.css +++ b/Open-ILS/src/eg2/src/app/share/grid/grid.component.css @@ -39,6 +39,7 @@ table.table.eg-grid { width: 100%; color: var(--grid); caption-side: block-start; + height: 1px; table-layout: auto; white-space: normal; } ----------------------------------------------------------------------- Summary of changes: .../src/app/share/grid/grid-body.component.html | 36 ++++++++++++++-------- .../eg2/src/app/share/grid/grid-body.component.ts | 5 +++ .../src/eg2/src/app/share/grid/grid.component.css | 1 + 3 files changed, 30 insertions(+), 12 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 28d354cc5c3d6474948803c55b200cace3082c19
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 28d354cc5c3d6474948803c55b200cace3082c19 (commit) via 766a367a8ab87a350508dfafed9ea7caa15c0ea5 (commit) from 78f0af8eaa290216e3ac0b8fed676dfa9407bd66 (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 28d354cc5c3d6474948803c55b200cace3082c19 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Feb 17 22:44:47 2025 +0000 LP2080373 Right-click menus for grid utility columns Sets up the right-click context menu actions in grid checkbox, flair, and row counter columns. Release-note: Right-click menu support for grid utility columns Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Lindsay Stratton <lstratton(a)wlsmail.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html index 1090490d33..3ea17e1433 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html @@ -4,29 +4,41 @@ <ng-container *ngIf="!context.disableSelect"> <td role="gridcell" class="eg-grid-cell eg-grid-checkbox-cell"> - <div class="eg-grid-cell-contents"> + <div class="eg-grid-cell-contents" #rowContextMenu="ngbPopover" + popoverTitle="Actions for Selected Rows" i18n-popoverTitle + (contextmenu)="onRowContextClick($event, row, rowContextMenu)" + [ngbPopover]="contextMenu" + placement="right" + triggers="manual"> <input type='checkbox' [ngModel]="context.rowSelector.indexes[context.getRowIndex(row)]" (ngModelChange)="context.rowSelector.toggle(context.getRowIndex(row))" - i18n-aria-label="e.g. Row 13" attr.aria-label="Row {{context.pager.rowNumber(idx)}}" - #rowContextMenu="ngbPopover" + i18n-aria-label="e.g. Row 13" attr.aria-label="Row {{context.pager.rowNumber(idx)}}"> + </div> + </td> + </ng-container> + <td role="gridcell" class="eg-grid-cell eg-grid-number-cell alphanumeric" (click)="onRowClick($event, row, idx)"> + <div class="eg-grid-cell-contents" #rowContextMenu="ngbPopover" popoverTitle="Actions for Selected Rows" i18n-popoverTitle (contextmenu)="onRowContextClick($event, row, rowContextMenu)" [ngbPopover]="contextMenu" placement="right" triggers="manual"> - </div> - </td> - </ng-container> - <td role="gridcell" class="eg-grid-cell eg-grid-number-cell alphanumeric"> - <div class="eg-grid-cell-contents">{{context.pager.rowNumber(idx)}}</div> + {{context.pager.rowNumber(idx)}} + </div> </td> - <td role="gridcell" *ngIf="context.rowFlairIsEnabled" class="eg-grid-cell eg-grid-flair-cell"> + <td role="gridcell" *ngIf="context.rowFlairIsEnabled" class="eg-grid-cell eg-grid-flair-cell" + (click)="onRowClick($event, row, idx)">  <ng-container *ngIf="context.rowFlairCallback(row); let flair"> <ng-container *ngIf="flair.icon"> - <div class="eg-grid-cell-contents"> + <div class="eg-grid-cell-contents" #rowContextMenu="ngbPopover" + popoverTitle="Actions for Selected Rows" i18n-popoverTitle + (contextmenu)="onRowContextClick($event, row, rowContextMenu)" + [ngbPopover]="contextMenu" + placement="right" + triggers="manual"> <span class="material-icons" aria-hidden="true" title="{{flair.title}}" i18n-title> {{flair.icon}} @@ -46,9 +58,9 @@  <td role="gridcell" *ngFor="let col of context.columnSet.displayColumns()" class="eg-grid-cell eg-grid-body-cell" - [ngClass]="context.setClassNames(row, col)"> + [ngClass]="context.setClassNames(row, col)" + (click)="onRowClick($event, row, idx)"> <div class="eg-grid-cell-contents" (dblclick)="onRowDblClick(row)" - (click)="onRowClick($event, row, idx)" #rowContextMenu="ngbPopover" popoverTitle="Actions for Selected Rows" i18n-popoverTitle (contextmenu)="onRowContextClick($event, row, rowContextMenu)" diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts index e773fc3999..917f3666a0 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts @@ -29,6 +29,11 @@ export class GridBodyComponent { return; } + if (['a', 'button', 'input', 'select', 'summary'].includes($event.target.tagName.toLowerCase())) { + // avoid interrupting normal interactive elements + return; + } + const index = this.context.getRowIndex(row); if (this.context.disableMultiSelect) { commit 766a367a8ab87a350508dfafed9ea7caa15c0ea5 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Feb 17 22:30:26 2025 +0000 LP2080373 Expand grid row right-click area (Chrome) In Chrome, .eg-grid-cell-contents (which carries the right-click context menu handler) does not stretch to fill the available table cell height. The fix is to set an explicit, pixel-based height on the parent <table> element. Setting it to 1px works, even though this will be overridden by the child row and cell heights. Release-note: Allow right-click anywhere in grid cells in Chrome Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.component.css b/Open-ILS/src/eg2/src/app/share/grid/grid.component.css index 09ba1dfaa8..5fd23552ec 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid.component.css +++ b/Open-ILS/src/eg2/src/app/share/grid/grid.component.css @@ -38,6 +38,7 @@ table.table.eg-grid { width: 100%; color: var(--grid); caption-side: block-start; + height: 1px; table-layout: auto; white-space: normal; } ----------------------------------------------------------------------- Summary of changes: .../src/app/share/grid/grid-body.component.html | 36 ++++++++++++++-------- .../eg2/src/app/share/grid/grid-body.component.ts | 5 +++ .../src/eg2/src/app/share/grid/grid.component.css | 1 + 3 files changed, 30 insertions(+), 12 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 4c0c258397b4c0f0452aaf04f993255003b52008
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 4c0c258397b4c0f0452aaf04f993255003b52008 (commit) via 4a92cf6d7523b0b2566451c16a232e6be2553505 (commit) from 5f22e31efb922c4ba661a76155e7facde4c162d3 (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 4c0c258397b4c0f0452aaf04f993255003b52008 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Feb 17 22:44:47 2025 +0000 LP2080373 Right-click menus for grid utility columns Sets up the right-click context menu actions in grid checkbox, flair, and row counter columns. Release-note: Right-click menu support for grid utility columns Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Lindsay Stratton <lstratton(a)wlsmail.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html index 1090490d33..3ea17e1433 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html @@ -4,29 +4,41 @@ <ng-container *ngIf="!context.disableSelect"> <td role="gridcell" class="eg-grid-cell eg-grid-checkbox-cell"> - <div class="eg-grid-cell-contents"> + <div class="eg-grid-cell-contents" #rowContextMenu="ngbPopover" + popoverTitle="Actions for Selected Rows" i18n-popoverTitle + (contextmenu)="onRowContextClick($event, row, rowContextMenu)" + [ngbPopover]="contextMenu" + placement="right" + triggers="manual"> <input type='checkbox' [ngModel]="context.rowSelector.indexes[context.getRowIndex(row)]" (ngModelChange)="context.rowSelector.toggle(context.getRowIndex(row))" - i18n-aria-label="e.g. Row 13" attr.aria-label="Row {{context.pager.rowNumber(idx)}}" - #rowContextMenu="ngbPopover" + i18n-aria-label="e.g. Row 13" attr.aria-label="Row {{context.pager.rowNumber(idx)}}"> + </div> + </td> + </ng-container> + <td role="gridcell" class="eg-grid-cell eg-grid-number-cell alphanumeric" (click)="onRowClick($event, row, idx)"> + <div class="eg-grid-cell-contents" #rowContextMenu="ngbPopover" popoverTitle="Actions for Selected Rows" i18n-popoverTitle (contextmenu)="onRowContextClick($event, row, rowContextMenu)" [ngbPopover]="contextMenu" placement="right" triggers="manual"> - </div> - </td> - </ng-container> - <td role="gridcell" class="eg-grid-cell eg-grid-number-cell alphanumeric"> - <div class="eg-grid-cell-contents">{{context.pager.rowNumber(idx)}}</div> + {{context.pager.rowNumber(idx)}} + </div> </td> - <td role="gridcell" *ngIf="context.rowFlairIsEnabled" class="eg-grid-cell eg-grid-flair-cell"> + <td role="gridcell" *ngIf="context.rowFlairIsEnabled" class="eg-grid-cell eg-grid-flair-cell" + (click)="onRowClick($event, row, idx)">  <ng-container *ngIf="context.rowFlairCallback(row); let flair"> <ng-container *ngIf="flair.icon"> - <div class="eg-grid-cell-contents"> + <div class="eg-grid-cell-contents" #rowContextMenu="ngbPopover" + popoverTitle="Actions for Selected Rows" i18n-popoverTitle + (contextmenu)="onRowContextClick($event, row, rowContextMenu)" + [ngbPopover]="contextMenu" + placement="right" + triggers="manual"> <span class="material-icons" aria-hidden="true" title="{{flair.title}}" i18n-title> {{flair.icon}} @@ -46,9 +58,9 @@  <td role="gridcell" *ngFor="let col of context.columnSet.displayColumns()" class="eg-grid-cell eg-grid-body-cell" - [ngClass]="context.setClassNames(row, col)"> + [ngClass]="context.setClassNames(row, col)" + (click)="onRowClick($event, row, idx)"> <div class="eg-grid-cell-contents" (dblclick)="onRowDblClick(row)" - (click)="onRowClick($event, row, idx)" #rowContextMenu="ngbPopover" popoverTitle="Actions for Selected Rows" i18n-popoverTitle (contextmenu)="onRowContextClick($event, row, rowContextMenu)" diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts index e773fc3999..917f3666a0 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.ts @@ -29,6 +29,11 @@ export class GridBodyComponent { return; } + if (['a', 'button', 'input', 'select', 'summary'].includes($event.target.tagName.toLowerCase())) { + // avoid interrupting normal interactive elements + return; + } + const index = this.context.getRowIndex(row); if (this.context.disableMultiSelect) { commit 4a92cf6d7523b0b2566451c16a232e6be2553505 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Mon Feb 17 22:30:26 2025 +0000 LP2080373 Expand grid row right-click area (Chrome) In Chrome, .eg-grid-cell-contents (which carries the right-click context menu handler) does not stretch to fill the available table cell height. The fix is to set an explicit, pixel-based height on the parent <table> element. Setting it to 1px works, even though this will be overridden by the child row and cell heights. Release-note: Allow right-click anywhere in grid cells in Chrome Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.component.css b/Open-ILS/src/eg2/src/app/share/grid/grid.component.css index 09ba1dfaa8..5fd23552ec 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid.component.css +++ b/Open-ILS/src/eg2/src/app/share/grid/grid.component.css @@ -38,6 +38,7 @@ table.table.eg-grid { width: 100%; color: var(--grid); caption-side: block-start; + height: 1px; table-layout: auto; white-space: normal; } ----------------------------------------------------------------------- Summary of changes: .../src/app/share/grid/grid-body.component.html | 36 ++++++++++++++-------- .../eg2/src/app/share/grid/grid-body.component.ts | 5 +++ .../src/eg2/src/app/share/grid/grid.component.css | 1 + 3 files changed, 30 insertions(+), 12 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. 8487d8340a69b8232bb427d3ccca37ec452c12e3
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 8487d8340a69b8232bb427d3ccca37ec452c12e3 (commit) from 9c6acbb3328454cf9a6b1f364fdeb4a239d1998e (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 8487d8340a69b8232bb427d3ccca37ec452c12e3 Author: Dan Briem <dbriem(a)harrisonpl.org> Date: Sat Feb 22 19:28:33 2025 +0000 LP#2098898 Precat Checkouts Automatically Override Fail Events Removes the automatic override designation on precat checkouts ensuring failure events are returned to the client so the user can choose to override them or not. Release-note: Prevents blocked accounts from checking out Precats. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm index b0e68a2ac4..f2c9ced454 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm @@ -247,11 +247,7 @@ sub run_method { $circulator->do_permit(); } elsif( $api =~ /checkout.full/ ) { - - # requesting a precat checkout implies that any required - # overrides have been performed. Go ahead and re-override. $circulator->skip_permit_key(1); - $circulator->override(1) if ( $circulator->request_precat && $circulator->editor->allowed('CREATE_PRECAT') ); $circulator->do_permit(); $circulator->is_checkout(1); unless( $circulator->bail_out ) { @@ -1335,7 +1331,14 @@ sub run_indb_circ_test { { from => [ $dbfunc, $self->circ_lib, - ($self->is_noncat or ($self->is_precat and !$self->override and !$self->is_renewal)) ? undef : $self->copy->id, + ( + $self->is_noncat + or ( + $self->is_precat and + !$self->request_precat and + !$self->is_renewal + ) + ) ? undef : $self->copy->id, $self->patron->id, ] } ----------------------------------------------------------------------- Summary of changes: .../src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. a9fc46eb8f9273b3c10254cf21947b98ff022499
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 a9fc46eb8f9273b3c10254cf21947b98ff022499 (commit) from 949036f3c85b72bcd8615734f4be221227186c01 (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 a9fc46eb8f9273b3c10254cf21947b98ff022499 Author: Dan Briem <dbriem(a)harrisonpl.org> Date: Sat Feb 22 19:28:33 2025 +0000 LP#2098898 Precat Checkouts Automatically Override Fail Events Removes the automatic override designation on precat checkouts ensuring failure events are returned to the client so the user can choose to override them or not. Release-note: Prevents blocked accounts from checking out Precats Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm index 7a2e2c19ca..c312d0a592 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm @@ -247,11 +247,7 @@ sub run_method { $circulator->do_permit(); } elsif( $api =~ /checkout.full/ ) { - - # requesting a precat checkout implies that any required - # overrides have been performed. Go ahead and re-override. $circulator->skip_permit_key(1); - $circulator->override(1) if ( $circulator->request_precat && $circulator->editor->allowed('CREATE_PRECAT') ); $circulator->do_permit(); $circulator->is_checkout(1); unless( $circulator->bail_out ) { @@ -1335,7 +1331,14 @@ sub run_indb_circ_test { { from => [ $dbfunc, $self->circ_lib, - ($self->is_noncat or ($self->is_precat and !$self->override and !$self->is_renewal)) ? undef : $self->copy->id, + ( + $self->is_noncat + or ( + $self->is_precat and + !$self->request_precat and + !$self->is_renewal + ) + ) ? undef : $self->copy->id, $self->patron->id, ] } ----------------------------------------------------------------------- Summary of changes: .../src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 78f0af8eaa290216e3ac0b8fed676dfa9407bd66
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 78f0af8eaa290216e3ac0b8fed676dfa9407bd66 (commit) from 31b6a8447d3f95b182500079707ab12b72ea3b39 (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 78f0af8eaa290216e3ac0b8fed676dfa9407bd66 Author: Dan Briem <dbriem(a)harrisonpl.org> Date: Sat Feb 22 19:28:33 2025 +0000 LP#2098898 Precat Checkouts Automatically Override Fail Events Removes the automatic override designation on precat checkouts ensuring failure events are returned to the client so the user can choose to override them or not. Release-note: Prevents blocked accounts from checking out Precats. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm index 7a2e2c19ca..c312d0a592 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm @@ -247,11 +247,7 @@ sub run_method { $circulator->do_permit(); } elsif( $api =~ /checkout.full/ ) { - - # requesting a precat checkout implies that any required - # overrides have been performed. Go ahead and re-override. $circulator->skip_permit_key(1); - $circulator->override(1) if ( $circulator->request_precat && $circulator->editor->allowed('CREATE_PRECAT') ); $circulator->do_permit(); $circulator->is_checkout(1); unless( $circulator->bail_out ) { @@ -1335,7 +1331,14 @@ sub run_indb_circ_test { { from => [ $dbfunc, $self->circ_lib, - ($self->is_noncat or ($self->is_precat and !$self->override and !$self->is_renewal)) ? undef : $self->copy->id, + ( + $self->is_noncat + or ( + $self->is_precat and + !$self->request_precat and + !$self->is_renewal + ) + ) ? undef : $self->copy->id, $self->patron->id, ] } ----------------------------------------------------------------------- Summary of changes: .../src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 5f22e31efb922c4ba661a76155e7facde4c162d3
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 5f22e31efb922c4ba661a76155e7facde4c162d3 (commit) from ff4a622bdb3ad553f2a02abf8d8b971edb4e1dab (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 5f22e31efb922c4ba661a76155e7facde4c162d3 Author: Dan Briem <dbriem(a)harrisonpl.org> Date: Sat Feb 22 19:28:33 2025 +0000 LP#2098898 Precat Checkouts Automatically Override Fail Events Removes the automatic override designation on precat checkouts ensuring failure events are returned to the client so the user can choose to override them or not. Signed-off-by: Dan Briem <dbriem(a)harrisonpl.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm index 7a2e2c19ca..c312d0a592 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm @@ -247,11 +247,7 @@ sub run_method { $circulator->do_permit(); } elsif( $api =~ /checkout.full/ ) { - - # requesting a precat checkout implies that any required - # overrides have been performed. Go ahead and re-override. $circulator->skip_permit_key(1); - $circulator->override(1) if ( $circulator->request_precat && $circulator->editor->allowed('CREATE_PRECAT') ); $circulator->do_permit(); $circulator->is_checkout(1); unless( $circulator->bail_out ) { @@ -1335,7 +1331,14 @@ sub run_indb_circ_test { { from => [ $dbfunc, $self->circ_lib, - ($self->is_noncat or ($self->is_precat and !$self->override and !$self->is_renewal)) ? undef : $self->copy->id, + ( + $self->is_noncat + or ( + $self->is_precat and + !$self->request_precat and + !$self->is_renewal + ) + ) ? undef : $self->copy->id, $self->patron->id, ] } ----------------------------------------------------------------------- Summary of changes: .../src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. ff4a622bdb3ad553f2a02abf8d8b971edb4e1dab
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 ff4a622bdb3ad553f2a02abf8d8b971edb4e1dab (commit) from 9c23b870f2360b6814ca1751c20a64850fbf4993 (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 ff4a622bdb3ad553f2a02abf8d8b971edb4e1dab Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Mon Mar 31 13:15:14 2025 -0700 Follow-up: fix ng lint Several lint issues have crept into main from various new features. This commit includes automated fixes (npx ng lint --fix) and ignores one lint error that cannot be fixed automatically Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> 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 8e01cd0b42..341340724b 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 @@ -36,7 +36,7 @@ export class ToastComponent implements OnInit { show(msg: ToastMessage) { this.messages.push(msg); console.info($localize`${new Date().toLocaleTimeString()} - ${msg.text}`); - + this.timeout = setTimeout( () => this.messages.shift(), this.duration diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts index 25474ae1d6..71c320c6ac 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts @@ -604,8 +604,7 @@ export class VolCopyService implements OnDestroy { // convert actual booleans to 't' and 'f' Object.keys(data).forEach(key => { if (this.idl.classes.acp.field_map[key]?.datatype === 'bool') { - if (data[key] === true) { data[key] = 't'; } - else if (data[key] === false) { data[key] = 'f'; } + if (data[key] === true) { data[key] = 't'; } else if (data[key] === false) { data[key] = 'f'; } } }); @@ -616,8 +615,7 @@ export class VolCopyService implements OnDestroy { data[thing].forEach(thingElement => { Object.keys(thingElement).forEach(key => { if (this.idl.classes[ant[thing]].field_map[key].datatype === 'bool') { - if (thingElement[key] === true) { thingElement[key] = 't'; } - else if (thingElement[key] === false) { thingElement[key] = 'f'; } + if (thingElement[key] === true) { thingElement[key] = 't'; } else if (thingElement[key] === false) { thingElement[key] = 'f'; } } }); }); diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.ts b/Open-ILS/src/eg2/src/app/staff/nav.component.ts index 173f942dd0..546235a7f7 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.ts @@ -188,8 +188,7 @@ export class StaffNavComponent implements OnInit, OnDestroy { const staffContainer = document.getElementById('staff-content-container'); if (disable_links_newtabs) { staffContainer.classList.add('user-pref-no-new-tabs'); - } - else { + } else { staffContainer.classList.remove('user-pref-no-new-tabs'); } } diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-things-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-things-dialog.component.ts index adfc1c110b..947a4606b6 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-things-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-things-dialog.component.ts @@ -198,7 +198,7 @@ export abstract class CopyThingsDialogComponent< */ protected async initializeCopies(): Promise<void> { /* - console.debug(`CopyThingsDialog(${this.thingType}): initializeCopies(), this.copies, + console.debug(`CopyThingsDialog(${this.thingType}): initializeCopies(), this.copies, this.copyIds`, this.copies, this.copyIds); /** */ if (!this.copies) { @@ -215,7 +215,7 @@ export abstract class CopyThingsDialogComponent< }); /* - console.debug(`CopyThingsDialog(${this.thingType}): initializeCopies(); + console.debug(`CopyThingsDialog(${this.thingType}): initializeCopies(); this.inPlaceCreateMode, this.inBatch()`, this.inPlaceCreateMode, this.inBatch()); /** */ @@ -226,7 +226,7 @@ export abstract class CopyThingsDialogComponent< // This is also mucking with our pending changes when the dialog is // reinvoked before save; hrmm. clones/new-instances vs references /* - console.debug(`CopyThingsDialog(${this.thingType}): initializeCopies(); + console.debug(`CopyThingsDialog(${this.thingType}): initializeCopies(); calling this.getThings`); /** */ await this.getThings(); @@ -234,7 +234,7 @@ export abstract class CopyThingsDialogComponent< // Process batch things if needed if (this.inBatch()) { /* - console.debug(`CopyThingsDialog(${this.thingType}): initializeCopies(); + console.debug(`CopyThingsDialog(${this.thingType}): initializeCopies(); calling this.processCommonThings`); /** */ await this.processCommonThings(); @@ -352,16 +352,16 @@ export abstract class CopyThingsDialogComponent< /* console.debug(`CopyThingsDialog(${this.thingType}): removeThing: things`, this.idl.clone(things)); - console.debug(`CopyThingsDialog(${this.thingType}): removeThing: + console.debug(`CopyThingsDialog(${this.thingType}): removeThing: incoming this.newThings`, this.newThings.length, this.idl.clone(this.newThings)); - console.debug(`CopyThingsDialog(${this.thingType}): removeThing: + console.debug(`CopyThingsDialog(${this.thingType}): removeThing: incoming this.changedThings`, this.changedThings.length, this.idl.clone(this.changedThings)); - console.debug(`CopyThingsDialog(${this.thingType}): removeThing: + console.debug(`CopyThingsDialog(${this.thingType}): removeThing: incoming this.deletedThings`, this.deletedThings.length, this.idl.clone(this.deletedThings)); /** */ things.forEach(thing => { /* - console.debug(`CopyThingsDialog(${this.thingType}): removeThing: + console.debug(`CopyThingsDialog(${this.thingType}): removeThing: considering thing with id, isnew, ischanged, isdeleted`, this.idl.clone(thing), thing?.id(), thing?.isnew(), thing?.ischanged(), thing?.isdeleted()); /** */ diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/tag-map-list.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/tag-map-list.component.ts index 2e3ed53f39..9a65609280 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/tag-map-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/tag-map-list.component.ts @@ -55,9 +55,10 @@ export class TagMapListComponent implements OnInit { this.trickery(this); } + // eslint-disable-next-line rxjs/no-async-subscribe this.broadcaster.listen('eg.acpt_updated').subscribe(async (data) => { // console.debug('TagMapListComponent listener received',data); - if (typeof data.result === 'string' || typeof data.result == 'number') { + if (typeof data.result === 'string' || typeof data.result === 'number') { const flesh = { flesh: 1, flesh_fields: { diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts index d6ebca0dbb..1e04fba77a 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts @@ -153,7 +153,7 @@ implements OnInit, AfterViewInit, OnDestroy { } selectText(req?: FieldFocusRequest) { - if (this.field && typeof this.field == 'object') { + if (this.field && typeof this.field === 'object') { this.field.hasFocus = true; this.field.isDraggable = false; } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/share/toast/toast.component.ts | 2 +- .../src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts | 6 ++---- Open-ILS/src/eg2/src/app/staff/nav.component.ts | 3 +-- .../staff/share/holdings/copy-things-dialog.component.ts | 16 ++++++++-------- .../app/staff/share/holdings/tag-map-list.component.ts | 3 ++- .../staff/share/marc-edit/editable-content.component.ts | 2 +- 6 files changed, 15 insertions(+), 17 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 949036f3c85b72bcd8615734f4be221227186c01
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 949036f3c85b72bcd8615734f4be221227186c01 (commit) from c1a238374a7476a075f90125dac99bfbee9ea182 (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 949036f3c85b72bcd8615734f4be221227186c01 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 1f70349f5c..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 @@ -4,8 +4,16 @@ border-radius: 2px; padding: 10px; position: fixed; - z-index: 1; + z-index: 1500; /* ngbModal uses 1055 */ right: 15px; 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 | 10 +++++++++- .../eg2/src/app/share/toast/toast.component.html | 10 ++++++---- .../src/eg2/src/app/share/toast/toast.component.ts | 21 ++++++--------------- 3 files changed, 21 insertions(+), 20 deletions(-) hooks/post-receive -- Evergreen ILS

1 0