menu adjustments

- remove the additional menu items added in a previous commit
- add a 'Reset Default Search' button

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
index 2443325..3fe617e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
@@ -1,4 +1,5 @@
 <eg-string #defaultSearchSavedString i18n-text text="Default search saved"></eg-string>
+<eg-string #defaultSearchResetString i18n-text text="Default search reset"></eg-string>
 
 <div id="acq-search-form" class="pl-3 pr-3 pt-3 pb-3 mb-3">
 <form>
@@ -140,9 +141,12 @@
     <div class="col-lg-2">
       <button class="btn btn-success" (click)="submitSearch()" type="submit" i18n>Search</button>
     </div>
-    <div class="col-lg-6"></div>
-    <div class="col-lg-2">
+    <div class="col-lg-4"></div>
+    <div class="col-lg-4">
       <button class="btn btn-primary" (click)="saveSearchAsDefault()" type="button" i18n>Set As Default {{searchTypeLabel}} Search</button>
+      <button class="btn btn-secondary" (click)="clearDefaultSearch()" type="button" [disabled]="!hasDefaultSearch" i18n>
+        Reset Default Search
+      </button>
     </div>
     <div class="col-lg-2">
       <input class="form-check-input" type="checkbox" id="retrieve-immediately"

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
index 778ba1b..3bf1e1a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
@@ -27,6 +27,7 @@ export class AcqSearchFormComponent implements OnInit, AfterViewInit, OnChanges
     @Output() searchSubmitted = new EventEmitter<AcqSearch>();
 
     @ViewChild('defaultSearchSavedString', { static: true}) defaultSearchSavedString: StringComponent;
+    @ViewChild('defaultSearchResetString', { static: true}) defaultSearchResetString: StringComponent;
 
     showForm = true;
 
@@ -40,6 +41,7 @@ export class AcqSearchFormComponent implements OnInit, AfterViewInit, OnChanges
     defaultSearchType = 'lineitems';
     searchConjunction = 'all';
     runImmediately = false;
+    hasDefaultSearch = false;
 
     searchTerms: AcqSearchTerm[] = [];
 
@@ -109,6 +111,7 @@ export class AcqSearchFormComponent implements OnInit, AfterViewInit, OnChanges
                         if (defaultSearch) {
                             this.searchTerms = JSON.parse(JSON.stringify(defaultSearch.terms));
                             this.searchConjunction = defaultSearch.conjunction;
+                            this.hasDefaultSearch = true;
                         } else if (this.fallbackSearchTerms.length) {
                             this.searchTerms.length = 0;
                             JSON.parse(JSON.stringify(this.fallbackSearchTerms))
@@ -214,11 +217,20 @@ export class AcqSearchFormComponent implements OnInit, AfterViewInit, OnChanges
         return this.store.setItem(this.defaultSearchSetting, {
             terms: this.searchTerms,
             conjunction: this.searchConjunction
-        }).then(() =>
+        }).then(() => {
+            this.hasDefaultSearch = true;
             this.defaultSearchSavedString.current().then(msg =>
                 this.toast.success(msg)
-            )
-        );
+            );
+        });
+    }
+    clearDefaultSearch() {
+        return this.store.removeItem(this.defaultSearchSetting).then(() => {
+            this.hasDefaultSearch = false;
+            this.defaultSearchResetString.current().then(msg =>
+                this.toast.success(msg)
+            );
+        });
     }
     saveRunImmediately() {
         return this.store.setItem(this.runImmediatelySetting, this.runImmediately);

diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html
index 90b6056..5026e49 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -247,13 +247,7 @@
           <a class="dropdown-item"
             routerLink="/staff/acq/search/selectionlists">
             <span class="material-icons">view_list</span>
-            <span i18n>Selection List Search</span>
-          </a>
-          <a class="dropdown-item" 
-            routerLink="/staff/acq/search/selectionlists"
-            [queryParams]="{f: 'acqpl:owner', val1: user_id()}">
-            <span class="material-icons">view_list</span>
-            <span i18n>My Selection Lists</span>
+            <span i18n>Selection Lists</span>
           </a>
           <a class="dropdown-item" 
             href="/eg/staff/acq/legacy/picklist/brief_record">
@@ -284,13 +278,7 @@
           <a class="dropdown-item"
             routerLink="/staff/acq/search/purchaseorders">
             <span class="material-icons">shopping_cart</span>
-            <span i18n>Purchase Order Search</span>
-          </a>
-          <a class="dropdown-item" 
-            routerLink="/staff/acq/search/purchaseorders"
-            [queryParams]="{f: ['acqpo:ordering_agency','acqpo:state'], val1: [ws_ou(), 'on-order']}">
-            <span class="material-icons">shopping_cart</span>
-            <span i18n>On Order at Workstation</span>
+            <span i18n>Purchase Orders</span>
           </a>
           <a class="dropdown-item" href="/eg/staff/acq/legacy/po/create">
             <span class="material-icons">add_shopping_cart</span>
@@ -305,13 +293,7 @@
           <a class="dropdown-item"
             routerLink="/staff/acq/search/invoices">
             <span class="material-icons">attach_money</span>
-            <span i18n>Invoice Search</span>
-          </a>
-          <a class="dropdown-item" 
-            routerLink="/staff/acq/search/invoices"
-            [queryParams]="{f: ['acqinv:receiver', 'acqinv:close_date'], op: ['', '__isnull'], val1: [ws_ou(), null]}">
-            <span class="material-icons">attach_money</span>
-            <span i18n>Open Invoices</span>
+            <span i18n>Invoices</span>
           </a>
           <a class="dropdown-item" 
             href="/eg/staff/acq/legacy/invoice/view?create=1">

diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index c1c5aca..c10fb4b 100644 (file)
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -363,9 +363,9 @@
           </li>
           <li class="divider"></li>
           <li>
-            <a href="/eg2/staff/acq/search/selectionlists?f=acqpl:owner&val1={{user_id}}" target="_self">
+            <a href="/eg2/staff/acq/search/selectionlists" target="_self">
               <span class="glyphicon glyphicon-list"></span>
-              [% l('My Selection Lists') %]
+              [% l('Selection Lists') %]
             </a>
           </li>
           <li>
@@ -421,7 +421,7 @@
           <li>
             <a href="/eg2/staff/acq/search/invoices?f=acqinv:receiver&f=acqinv:close_date&op=&op=__isnull&val1={{ws_ou}}&val1=null" target="_self">
               <span class="glyphicon glyphicon-usd"></span>
-              [% l('Open Invoices') %]
+              [% l('Invoices') %]
             </a>
           </li>
           <li>