From e3e64785234b7c0fac8903989e1a140c5e86297b Mon Sep 17 00:00:00 2001
From: Jeff Davis <jdavis@sitka.bclibraries.ca>
Date: Mon, 3 May 2021 15:21:02 -0700
Subject: [PATCH] LP#1922273: use a setting to determine which advanced search
 filters are displayed in staff catalog

The TPAC allows admins to customize which search filters are available
in advanced search.  This commit adds an org unit setting,
eg.staffcat.search_filters, which lets you customize search filters in
the staff catalog.  The setting value should be an array of filter
types, e.g. ["item_lang","audience","lit_form"].  The standard set of
search filters is used when the settings are not set.

Signed-off-by: Jeff Davis <jdavis@sitka.bclibraries.ca>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../eg2/src/app/staff/catalog/catalog.service.ts   |  4 ++++
 .../eg2/src/app/staff/catalog/resolver.service.ts  |  4 ++++
 .../app/staff/catalog/search-form.component.html   | 14 +++++++-------
 .../src/app/staff/catalog/search-form.component.ts |  3 +++
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       | 15 +++++++++++++++
 .../upgrade/XXXX.data.staffcat-search-filters.sql  | 22 ++++++++++++++++++++++
 6 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.staffcat-search-filters.sql

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/catalog.service.ts b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.service.ts
index 04eb852de5..76b75ca830 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/catalog.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.service.ts
@@ -25,6 +25,10 @@ export class StaffCatalogService {
     // Display the Exclude Electronic checkbox
     showExcludeElectronic = false;
 
+    // Advanced search filters to display
+    searchFilters: string[];
+
+    // TODO: does unapi support pref-lib for result-page copy counts?
     prefOrg: IdlObject;
 
     // Default search tab
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts b/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts
index 11c46ff4c2..6780c2dc8c 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts
@@ -8,6 +8,7 @@ import {AuthService} from '@eg/core/auth.service';
 import {CatalogService} from '@eg/share/catalog/catalog.service';
 import {StaffCatalogService} from './catalog.service';
 import {BasketService} from '@eg/share/catalog/basket.service';
+import {CATALOG_CCVM_FILTERS} from '@eg/share/catalog/search-context';
 
 
 @Injectable()
@@ -60,6 +61,7 @@ export class CatalogResolver implements Resolve<Promise<any[]>> {
             'eg.staff.catalog.results.show_more',
             'circ.staff_placed_holds_fallback_to_ws_ou',
             'opac.staff.jump_to_details_on_single_hit',
+            'eg.staffcat.search_filters'
         ]).then(settings => {
             this.staffCat.defaultSearchOrg =
                 this.org.get(settings['eg.search.search_lib']);
@@ -76,6 +78,8 @@ export class CatalogResolver implements Resolve<Promise<any[]>> {
                 settings['eg.staffcat.exclude_electronic'] === true;
             this.staffCat.jumpOnSingleHit =
                 settings['opac.staff.jump_to_details_on_single_hit'] === true;
+            this.staffCat.searchFilters =
+                settings['eg.staffcat.search_filters'] || CATALOG_CCVM_FILTERS;
         });
     }
 }
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
index 0911b8f322..8f3ed840c3 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
@@ -167,7 +167,7 @@
               </div>
           </div>
           <div class="row mt-3" *ngIf="showFilters()">
-            <div class="col-lg-3">
+            <div class="col-lg-3" *ngIf="searchFilters().includes('item_type')">
               <select class="form-control"  multiple="true"
                 [(ngModel)]="context.termSearch.ccvmFilters.item_type">
                 <option value='' i18n>All Item Types</option>
@@ -176,7 +176,7 @@
                 </ng-container> 
               </select>
             </div>
-            <div class="col-lg-3">
+            <div class="col-lg-3" *ngIf="searchFilters().includes('item_form')">
               <select class="form-control" multiple="true"
                 [(ngModel)]="context.termSearch.ccvmFilters.item_form">
                 <option value='' i18n>All Item Forms</option>
@@ -185,7 +185,7 @@
                 </ng-container> 
               </select>
             </div>
-            <div class="col-lg-3">
+            <div class="col-lg-3" *ngIf="searchFilters().includes('item_lang')">
               <select class="form-control" 
                 [(ngModel)]="context.termSearch.ccvmFilters.item_lang" multiple="true">
                 <option value='' i18n>All Languages</option>
@@ -194,7 +194,7 @@
                 </ng-container> 
               </select>
             </div>
-            <div class="col-lg-3">
+            <div class="col-lg-3" *ngIf="searchFilters().includes('audience')">
               <select class="form-control" 
                 [(ngModel)]="context.termSearch.ccvmFilters.audience" multiple="true">
                 <option value='' i18n>All Audiences</option>
@@ -205,7 +205,7 @@
             </div>
           </div>
           <div class="row mt-3" *ngIf="showFilters()">
-            <div class="col-lg-3">
+            <div class="col-lg-3" *ngIf="searchFilters().includes('vr_format')">
               <select class="form-control" 
                 [(ngModel)]="context.termSearch.ccvmFilters.vr_format" multiple="true">
                 <option value='' i18n>All Video Formats</option>
@@ -214,7 +214,7 @@
                 </ng-container> 
               </select>
             </div>
-            <div class="col-lg-3">
+            <div class="col-lg-3" *ngIf="searchFilters().includes('bib_level')">
               <select class="form-control" 
                 [(ngModel)]="context.termSearch.ccvmFilters.bib_level" multiple="true">
                 <option value='' i18n>All Bib Levels</option>
@@ -223,7 +223,7 @@
                 </ng-container> 
               </select>
             </div>
-            <div class="col-lg-3">
+            <div class="col-lg-3" *ngIf="searchFilters().includes('lit_form')">
               <select class="form-control" 
                 [(ngModel)]="context.termSearch.ccvmFilters.lit_form" multiple="true">
                 <option value='' i18n>All Literary Forms</option>
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts
index d416f16a60..c7d9898be9 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts
@@ -309,6 +309,9 @@ export class SearchFormComponent implements OnInit, AfterViewInit {
     showExcludeElectronic(): boolean {
         return this.staffCat.showExcludeElectronic;
     }
+    searchFilters(): string[] {
+        return this.staffCat.searchFilters;
+    }
 }
 
 
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 4d5c730293..ab4ada2b06 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -21862,3 +21862,18 @@ INSERT into config.org_unit_setting_type
         'string'
     );
 
+INSERT INTO config.org_unit_setting_type
+( name, grp, label, description, datatype )
+VALUES
+( 'eg.staffcat.search_filters', 'gui',
+  oils_i18n_gettext(
+    'eg.staffcat.search_filters',
+    'Staff Catalog Search Filters',
+    'coust', 'label'),
+  oils_i18n_gettext(
+    'eg.staffcat.search_filters',
+    'Array of advanced search filters to display, e.g. ["item_lang","audience","lit_form"]',
+    'coust', 'description'),
+  'array' );
+
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.staffcat-search-filters.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.staffcat-search-filters.sql
new file mode 100644
index 0000000000..ef1769480a
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.staffcat-search-filters.sql
@@ -0,0 +1,22 @@
+BEGIN;
+
+--SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.org_unit_setting_type
+( name, grp, label, description, datatype )
+VALUES
+( 'eg.staffcat.search_filters', 'gui',
+  oils_i18n_gettext(
+    'eg.staffcat.search_filters',
+    'Staff Catalog Search Filters',
+    'coust', 'label'),
+  oils_i18n_gettext(
+    'eg.staffcat.search_filters',
+    'Array of advanced search filters to display, e.g. ["item_lang","audience","lit_form"]',
+    'coust', 'description'),
+  'array' );
+
+COMMIT;
+
+
+
-- 
2.11.0