From 91c438ce94183d72eb758b6d9307b9dda5979120 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 19 Jun 2019 16:25:51 -0400
Subject: [PATCH] LP1823041 Observable dialogs repairs and cleanup

Fixes a few instances where dialog.open() calls did not return
Observables.

Replace a number of calls to the now deprecated dialog.dismiss() with
calls to dialog.close().

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
---
 .../make-bookable-dialog.component.html       |  4 ++--
 .../conjoined-items-dialog.component.html     |  6 +++---
 .../copy-alerts-dialog.component.html         |  4 ++--
 .../holdings/copy-alerts-dialog.component.ts  | 21 ++++++++++---------
 .../delete-volcopy-dialog.component.html      |  6 +++---
 .../mark-damaged-dialog.component.html        |  6 +++---
 .../holdings/mark-damaged-dialog.component.ts | 13 ++++++++----
 .../mark-missing-dialog.component.html        |  6 +++---
 .../replace-barcode-dialog.component.html     |  6 +++---
 .../replace-barcode-dialog.component.ts       | 10 ++++-----
 .../share/holds/cancel-dialog.component.html  |  6 +++---
 .../share/holds/manage-dialog.component.html  |  4 ++--
 .../holds/retarget-dialog.component.html      |  6 +++---
 .../holds/transfer-dialog.component.html      |  6 +++---
 .../share/holds/transfer-dialog.component.ts  |  5 +++--
 15 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.html
index 25ad596575..aa7793581a 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/booking/make-bookable-dialog.component.html
@@ -11,7 +11,7 @@
         <span i18n>Make Items Bookable</span>
       </h4>
       <button type="button" class="close" 
-        i18n-aria-label aria-label="Close" (click)="dismiss('cross_click')">
+        i18n-aria-label aria-label="Close" (click)="close()">
         <span aria-hidden="true">&times;</span>
       </button>
     </div>
@@ -36,7 +36,7 @@
     <div class="modal-footer">
       <ng-container>
         <button type="button" class="btn btn-warning" 
-          (click)="dismiss('canceled')" i18n>Cancel</button>
+          (click)="close()" i18n>Cancel</button>
         <ng-container *ngIf="!updateComplete">
           <button type="button" class="btn btn-success" 
             (click)="makeBookable()" i18n>Make Bookable</button>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html
index 9801c3ee77..33b433fe45 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html
@@ -11,7 +11,7 @@
         <span i18n>Attach/Modify {{copyIds.length}} Conjoined Item(s)</span>
       </h4>
       <button type="button" class="close" 
-        i18n-aria-label aria-label="Close" (click)="dismiss('cross_click')">
+        i18n-aria-label aria-label="Close" (click)="close()">
         <span aria-hidden="true">&times;</span>
       </button>
     </div>
@@ -31,7 +31,7 @@
     <div class="modal-footer">
       <ng-container>
         <button type="button" class="btn btn-warning" 
-          (click)="dismiss('canceled')" i18n>Cancel</button>
+          (click)="close()" i18n>Cancel</button>
         <button type="button" class="btn btn-success" 
           (click)="linkCopies()" [disabled]="!peerType" i18n>
           Attach/Modify
@@ -39,4 +39,4 @@
       </ng-container>
     </div>
   </ng-template>
-  
\ No newline at end of file
+  
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
index 4b3c1caab1..039d776f13 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
@@ -13,7 +13,7 @@
       <span i18n></span>
     </h4>
     <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="dismiss('cross_click')">
+      i18n-aria-label aria-label="Close" (click)="close()">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
@@ -100,7 +100,7 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-secondary" 
-      (click)="dismiss('canceled')" i18n>Close</button>
+      (click)="close()" i18n>Close</button>
     <ng-container *ngIf="mode == 'manage'">
       <button class="btn btn-success mr-2" 
         (click)="applyChanges()" i18n>Apply Changes</button>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts
index 450fc348b0..6d96a91ea7 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts
@@ -1,5 +1,6 @@
 import {Component, OnInit, Input, ViewChild} from '@angular/core';
-import {Observable, throwError} from 'rxjs';
+import {Observable, throwError, from} from 'rxjs';
+import {switchMap} from 'rxjs/operators';
 import {NetService} from '@eg/core/net.service';
 import {IdlService, IdlObject} from '@eg/core/idl.service';
 import {EventService} from '@eg/core/event.service';
@@ -94,15 +95,15 @@ export class CopyAlertsDialogComponent
             }
         }
 
-        this.getAlertTypes()
-        .then(() => this.getCopies())
-        .then(() => {
-            if (this.mode === 'manage') {
-                this.getCopyAlerts()
-                .then(() => super.open(args) );
-            }
-            return super.open(args);
-        });
+        // Observerify data loading
+        const obs = from(
+            this.getAlertTypes()
+            .then(_ => this.getCopies())
+            .then(_ => this.mode === 'manage' ? this.getCopyAlerts() : null)
+        );
+
+        // Return open() observable to caller
+        return obs.pipe(switchMap(_ => super.open(args)));
     }
 
     getAlertTypes(): Promise<any> {
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.html
index 9a07de77ff..30b0f2c434 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.html
@@ -12,7 +12,7 @@
         <span i18n>Delete Holdings</span>
       </h4>
       <button type="button" class="close" 
-        i18n-aria-label aria-label="Close" (click)="dismiss('cross_click')">
+        i18n-aria-label aria-label="Close" (click)="close()">
         <span aria-hidden="true">&times;</span>
       </button>
     </div>
@@ -22,7 +22,7 @@
     <div class="modal-footer">
       <ng-container>
         <button type="button" class="btn btn-warning" 
-          (click)="dismiss('canceled')" i18n>Cancel</button>
+          (click)="close()" i18n>Cancel</button>
         <button type="button" class="btn btn-success" 
           (click)="deleteHoldings()" i18n>
           Delete Holdings
@@ -30,4 +30,4 @@
       </ng-container>
     </div>
   </ng-template>
-  
\ No newline at end of file
+  
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.html
index ddcf6b1134..0c53c9c5af 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.html
@@ -7,7 +7,7 @@
       <span i18n>Mark Item Damaged</span>
     </h4>
     <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="dismiss('cross_click')">
+      i18n-aria-label aria-label="Close" (click)="close(false)">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
@@ -90,13 +90,13 @@
   <div class="modal-footer">
     <ng-container *ngIf="!chargeResponse">
       <button type="button" class="btn btn-warning" 
-        (click)="dismiss('canceled')" i18n>Cancel</button>
+        (click)="close(false)" i18n>Cancel</button>
       <button type="button" class="btn btn-success" 
         (click)="markDamaged()" i18n>Mark Damaged</button>
     </ng-container>
     <ng-container *ngIf="chargeResponse">
       <button type="button" class="btn btn-warning" 
-        (click)="dismiss('canceled')" i18n>Cancel</button>
+        (click)="close(false)" i18n>Cancel</button>
       <button class="btn btn-info mr-2" 
         (click)="amountChangeRequested = true" i18n>Change Amount</button>
       <button class="btn btn-secondary mr-2" 
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.ts
index 8a1c7130f1..346b3f0500 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-damaged-dialog.component.ts
@@ -1,5 +1,6 @@
 import {Component, OnInit, Input, ViewChild} from '@angular/core';
-import {Observable, throwError} from 'rxjs';
+import {Observable, throwError, from} from 'rxjs';
+import {switchMap} from 'rxjs/operators';
 import {NetService} from '@eg/core/net.service';
 import {IdlObject} from '@eg/core/idl.service';
 import {EventService} from '@eg/core/event.service';
@@ -70,9 +71,13 @@ export class MarkDamagedDialogComponent
             return throwError('copy ID required');
         }
 
-        this.getBillingTypes()
-        .then(() => { this.getData(); })
-        .then(() => super.open(args));
+        // Map data-loading promises to an observable
+        const obs = from(
+            this.getBillingTypes().then(_ => this.getData()));
+
+        // Fire data loading observable and replace results with
+        // dialog opener observable.
+        return obs.pipe(switchMap(_ => super.open(args)));
     }
 
     // Fetch-cache billing types
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.html
index 5e85a861a9..ea6b7d709c 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/mark-missing-dialog.component.html
@@ -11,7 +11,7 @@
         <span i18n>Mark Item Missing</span>
       </h4>
       <button type="button" class="close" 
-        i18n-aria-label aria-label="Close" (click)="dismiss('cross_click')">
+        i18n-aria-label aria-label="Close" (click)="close()">
         <span aria-hidden="true">&times;</span>
       </button>
     </div>
@@ -35,10 +35,10 @@
     <div class="modal-footer">
       <ng-container *ngIf="!chargeResponse">
         <button type="button" class="btn btn-warning" 
-          (click)="dismiss('canceled')" i18n>Cancel</button>
+          (click)="close()" i18n>Cancel</button>
         <button type="button" class="btn btn-success" 
           (click)="markItemsMissing()" i18n>Mark Missing</button>
       </ng-container>
     </div>
   </ng-template>
-  
\ No newline at end of file
+  
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html
index 562681bcd9..8bca301cbd 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html
@@ -11,7 +11,7 @@
         <span i18n>Replace Item Barcode</span>
       </h4>
       <button type="button" class="close" 
-        i18n-aria-label aria-label="Close" (click)="dismiss('cross_click')">
+        i18n-aria-label aria-label="Close" (click)="close()">
         <span aria-hidden="true">&times;</span>
       </button>
     </div>
@@ -39,7 +39,7 @@
     <div class="modal-footer">
       <ng-container>
         <button type="button" class="btn btn-warning" 
-          (click)="dismiss('canceled')" i18n>Cancel</button>
+          (click)="close()" i18n>Cancel</button>
         <button type="button" class="btn btn-success" 
           (click)="replaceOneBarcode()" [disabled]="!newBarcode" i18n>
           Replace Barcode
@@ -47,4 +47,4 @@
       </ng-container>
     </div>
   </ng-template>
-  
\ No newline at end of file
+  
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.ts
index 2d18eb9bb3..2b85d38931 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.ts
@@ -1,6 +1,6 @@
 import {Component, OnInit, Input, ViewChild, Renderer2} from '@angular/core';
 import {Observable, throwError} from 'rxjs';
-import {flatMap, map, tap} from 'rxjs/operators';
+import {switchMap, map, tap} from 'rxjs/operators';
 import {IdlObject} from '@eg/core/idl.service';
 import {NetService} from '@eg/core/net.service';
 import {EventService} from '@eg/core/event.service';
@@ -59,10 +59,10 @@ export class ReplaceBarcodeDialogComponent
         this.numFailed = 0;
 
         return this.getNextCopy()
-        .pipe(flatMap(() => {
-            return super.open(args)
-            .pipe(tap(() => {this.renderer.selectRootElement('#new-barcode-input').focus(); }));
-        }));
+        .pipe(switchMap(() => super.open(args)))
+        .pipe(tap(() =>
+            this.renderer.selectRootElement('#new-barcode-input').focus())
+        );
     }
 
     getNextCopy(): Observable<any> {
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html
index d7417fa646..a2d70cd9fa 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html
@@ -9,7 +9,7 @@
         <span i18n>Cancel Hold</span>
       </h4>
       <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="dismiss('cross_click')">
+        i18n-aria-label aria-label="Close" (click)="close()">
         <span aria-hidden="true">&times;</span>
       </button>
     </div>
@@ -52,9 +52,9 @@
     <div class="modal-footer">
       <ng-container *ngIf="!chargeResponse">
         <button type="button" class="btn btn-warning"
-          (click)="dismiss('canceled')" i18n>Cancel</button>
+          (click)="close()" i18n>Cancel</button>
         <button type="button" class="btn btn-success"
           (click)="cancelBatch()" i18n>Cancel Hold</button>
       </ng-container>
     </div>
-  </ng-template>
\ No newline at end of file
+  </ng-template>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.html
index ac07dd6f35..1a8cbc320a 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/manage-dialog.component.html
@@ -7,7 +7,7 @@
         <h4 class="modal-title">Batch Modify {{holdIds.length}} Holds</h4>
       </ng-container>
       <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="dismiss('cross_click')">
+        i18n-aria-label aria-label="Close" (click)="close()">
         <span aria-hidden="true">&times;</span>
       </button>
     </div>
@@ -15,4 +15,4 @@
       <eg-hold-manage [holdIds]="holdIds" (onComplete)="onComplete($event)">
       </eg-hold-manage>
     </div>
-  </ng-template>
\ No newline at end of file
+  </ng-template>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.html
index 37d349dd80..b24a63e62e 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/retarget-dialog.component.html
@@ -9,7 +9,7 @@
         <span i18n>Retarget Hold</span>
       </h4>
       <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="dismiss('cross_click')">
+        i18n-aria-label aria-label="Close" (click)="close()">
         <span aria-hidden="true">&times;</span>
       </button>
     </div>
@@ -33,9 +33,9 @@
     <div class="modal-footer">
       <ng-container *ngIf="!chargeResponse">
         <button type="button" class="btn btn-warning"
-          (click)="dismiss('canceled')" i18n>Cancel</button>
+          (click)="close()" i18n>Cancel</button>
         <button type="button" class="btn btn-success"
           (click)="retargetBatch()" i18n>Retarget</button>
       </ng-container>
     </div>
-  </ng-template>
\ No newline at end of file
+  </ng-template>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.html
index 80728caf8b..9046836a14 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.html
@@ -11,7 +11,7 @@
         <span i18n>Transfer Hold(s) To Marked Target</span>
       </h4>
       <button type="button" class="close"
-        i18n-aria-label aria-label="Close" (click)="dismiss('cross_click')">
+        i18n-aria-label aria-label="Close" (click)="close()">
         <span aria-hidden="true">&times;</span>
       </button>
     </div>
@@ -35,9 +35,9 @@
     <div class="modal-footer">
       <ng-container *ngIf="!chargeResponse">
         <button type="button" class="btn btn-warning"
-          (click)="dismiss('canceled')" i18n>Cancel</button>
+          (click)="close()" i18n>Cancel</button>
         <button type="button" class="btn btn-success"
           (click)="transferBatch()" i18n>Transfer</button>
       </ng-container>
     </div>
-  </ng-template>
\ No newline at end of file
+  </ng-template>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.ts
index 58b8200083..796aa107a6 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/transfer-dialog.component.ts
@@ -53,8 +53,9 @@ export class HoldTransferDialogComponent
 
         if (!this.transferTarget) {
             this.targetNeeded.current()
-            .then((msg) => this.toast.warning(msg))
-            .then(() => throwError('Transfer Target Required'));
+            .then((msg) => this.toast.warning(msg));
+
+            return throwError('Transfer Target Required');
         }
 
         return super.open(args);
-- 
2.43.2