From b2d970d976c10210cac8872d9798f2dc69d3c732 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 22 Feb 2021 11:09:26 -0500
Subject: [PATCH] LP1901930 SIP Account admin UI improvements

* Clear the password value from the password prompt upon close
* Add New Account button to account edit page
* Fixes issues with navigating between new and existing accounts.
* Fixes issues with dialog body/title display.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html |  6 +++---
 Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts   |  5 +++++
 .../src/app/staff/admin/server/sip/account.component.html   | 13 +++++++++++--
 .../eg2/src/app/staff/admin/server/sip/account.component.ts |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html
index ca479616d7..50e8236783 100644
--- a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html
+++ b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.html
@@ -2,7 +2,7 @@
   <div class="modal-header bg-info">
     <h4 class="modal-title">{{dialogTitle}}</h4>
     <button type="button" class="close" 
-      i18n-aria-label aria-label="Close" (click)="close()">
+      i18n-aria-label aria-label="Close" (click)="closeAndClear()">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
@@ -14,8 +14,8 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-success" 
-      (click)="close(promptValue)" i18n>Confirm</button>
+      (click)="closeAndClear(promptValue)" i18n>Confirm</button>
     <button type="button" class="btn btn-warning" 
-      (click)="close()" i18n>Cancel</button>
+      (click)="closeAndClear()" i18n>Cancel</button>
   </div>
 </ng-template>
diff --git a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts
index a5d8ecab90..4db0896b6f 100644
--- a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts
+++ b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts
@@ -16,6 +16,11 @@ export class PromptDialogComponent extends DialogComponent {
     @Input() public promptValue: string;
     // 'password', etc.
     @Input() promptType = 'text';
+
+    closeAndClear(value?: any) {
+        this.close(value);
+        this.promptValue = '';
+    }
 }
 
 
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.html
index a63b3eab97..ded1b74c0c 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.html
@@ -13,6 +13,15 @@
   </button>
 </a>
 
+<ng-container *ngIf="!createMode">
+  <a routerLink="/staff/admin/server/sip/account/new">
+    <button class="btn btn-outline-dark label-with-material-icon ml-2">
+      <span class="material-icons">add</span>
+      <span i18n>New Account</span>
+    </button>
+  </a>
+</ng-container>
+
 <eg-sip-group-delete-dialog *ngIf="account && account.setting_group()"
   #deleteGroupDialog
   [group]="account.setting_group()" [settingGroups]="settingGroups">
@@ -29,14 +38,14 @@
 
 <ng-container *ngIf="createMode">
   <eg-prompt-dialog #passwordDialog i18n-dialogTitle i18n-dialogBody
-    dialogTitle="Create SIP Password" i18n-dialogBody="Create a new password"
+    dialogTitle="Create SIP Password" dialogBody="Create a new password"
     promptType="password">
   </eg-prompt-dialog>
 </ng-container>
 
 <ng-container *ngIf="!createMode">
   <eg-prompt-dialog #passwordDialog i18n-dialogTitle i18n-dialogBody
-    dialogTitle="Create SIP Password" i18n-dialogBody="Create a new password"
+    dialogTitle="Modify SIP Password" dialogBody="Change SIP account password"
     promptType="password">
   </eg-prompt-dialog>
 </ng-container>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.ts
index 5f72cd4508..a2351e08c3 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account.component.ts
@@ -61,8 +61,11 @@ export class SipAccountComponent implements OnInit {
                 this.account = this.idl.create('sipacc'); // dummy
                 this.createMode = true;
                 return;
+            } else {
+                this.createMode = false;
             }
 
+            this.usrId = null;
             this.accountId = Number(params.get('id'));
             this.loadAccount().toPromise(); // force it to run
         });
-- 
2.11.0