From 557da2b5c1df73428b9f42b979afa96d6c11cf3b Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 21 Mar 2022 12:20:08 -0400 Subject: [PATCH] LP1904036 Patron tabs can be opened in new browser tabs/windows Signed-off-by: Bill Erickson Signed-off-by: Jane Sandberg Signed-off-by: Galen Charlton --- .../app/staff/circ/patron/patron.component.html | 20 ++++++---- .../src/app/staff/circ/patron/patron.component.ts | 45 ++++++++++++---------- .../src/app/staff/circ/patron/patron.service.ts | 5 ++- 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html index a0d6ca335e..638d82a7e2 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html @@ -67,7 +67,7 @@
-
    @@ -85,7 +85,8 @@
  • - Check Out + Check Out
    @@ -94,7 +95,8 @@
  • - + Items Out ({{counts('checkouts', 'total_out')}}) @@ -105,7 +107,8 @@
  • - + Holds ({{counts('holds', 'ready')}} / {{counts('holds', 'total')}}) @@ -114,7 +117,8 @@
  • - + Bills ({{counts('fines', 'balance_owed') | currency}}) @@ -136,7 +140,8 @@
  • - Messages + Messages
    @@ -145,7 +150,8 @@
  • - Edit + Edit diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.ts index 60703cd77f..90e6d84e2d 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.ts @@ -1,5 +1,6 @@ import {Component, ViewChild, OnInit, AfterViewInit, HostListener} from '@angular/core'; import {Router, ActivatedRoute, ParamMap, RoutesRecognized} from '@angular/router'; +import {Location} from '@angular/common'; import {NgbNav, NgbNavChangeEvent} from '@ng-bootstrap/ng-bootstrap'; import {Observable, throwError, empty} from 'rxjs'; import {filter, pairwise, concatMap, tap} from 'rxjs/operators'; @@ -56,6 +57,7 @@ export class PatronComponent implements OnInit, AfterViewInit { constructor( private router: Router, private route: ActivatedRoute, + private ngLocation: Location, private net: NetService, private auth: AuthService, private pcrud: PcrudService, @@ -178,47 +180,48 @@ export class PatronComponent implements OnInit, AfterViewInit { ngAfterViewInit() { } - beforeTabChange(evt: NgbNavChangeEvent) { - // tab will change with route navigation. + // Navigate, opening new tabs when requested via control-click. + // NOTE: The nav items have routerLinks, but for some reason, + // control-click on the links does not open them in a new tab. + // Mouse middle-click does, though. *shrug* + navItemClick(tab: string, evt: PointerEvent) { evt.preventDefault(); - - // Protect against tab changes with dirty data. this.canDeactivate().then(ok => { if (ok) { - this.patronTab = evt.nextId; - this.routeToTab(); + this.routeToTab(tab, evt.ctrlKey); } }); } - // The bills tab has various sub-interfaces. If the user is already - // on the Bills tab and clicks the tab, return them to the main bills - // screen. - // Avoid the navigate call when not on the bills tab because it - // interferes with the pre-tab-change "changes pending" confirm dialog - // used by the editor and possibily others. - billsTabClicked() { - if (this.patronTab === 'bills') { - this.router.navigate(['/staff/circ/patron', this.patronId, 'bills']); - } + beforeTabChange(evt: NgbNavChangeEvent) { + // Prevent the nav component from changing tabs so we can + // control the behaviour. + evt.preventDefault(); } - routeToTab() { + routeToTab(tab?: string, newWindow?: boolean) { let url = '/staff/circ/patron/'; - switch (this.patronTab) { + tab = tab || this.patronTab; + + switch (tab) { case 'search': case 'bcsearch': - url += this.patronTab; + url += tab; break; case 'other': url += `${this.patronId}/${this.altTab}`; break; default: - url += `${this.patronId}/${this.patronTab}`; + url += `${this.patronId}/${tab}`; } - this.router.navigate([url]); + if (newWindow) { + url = this.ngLocation.prepareExternalUrl(url); + window.open(url); + } else { + this.router.navigate([url]); + } } showSummaryPane(): boolean { diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts index e696cbabf1..2b69f5967e 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts @@ -140,9 +140,10 @@ export class PatronContextService { patronAlertsShown(): boolean { if (!this.summary) { return false; } - const shown = this.store.getSessionItem('eg.circ.last_alerted_patron'); + this.store.addLoginSessionKey('eg.circ.last_alerted_patron'); + const shown = this.store.getLoginSessionItem('eg.circ.last_alerted_patron'); if (shown === this.summary.patron.id()) { return true; } - this.store.setSessionItem('eg.circ.last_alerted_patron', this.summary.patron.id()); + this.store.setLoginSessionItem('eg.circ.last_alerted_patron', this.summary.patron.id()); return false; } -- 2.11.0