From f70cb150135d9032445af1ab5b0531b15e9d56a3 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Thu, 13 Jan 2022 10:30:57 -0500
Subject: [PATCH] LP#1929749: improvements to provider selector

This patch converts the provider combobox to use
the automatic PCRUD data source so that the OU label
shows up by default. This also means that all providers
visible to the user are available, not just the ones
owned by the WS OU or its ancestors.

This patch also tweaks a couple of the selectors so
that they get properly updated when a template is selected.

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../src/app/staff/acq/picklist/upload.component.html    | 10 ++++++----
 .../eg2/src/app/staff/acq/picklist/upload.component.ts  | 17 +++--------------
 .../eg2/src/app/staff/acq/picklist/upload.service.ts    | 14 --------------
 3 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html
index 8b268611d3..c597f6f58a 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html
@@ -48,11 +48,13 @@
   
     <div class="col-lg-3">
       <eg-combobox #providerSelector
-        id="provider-select"
-        [entries]="formatEntries('providersList')"
-        (onChange)="selectEntry($event, 'providersList')"
+        domId="provider-select"
+        [selectedId]="selectedProvider" (onChange)="selectedProvider = $event.id"
+        style="border-left-width: 0px"
         [required]="true"
-        [startId]="selectedProvider">
+        [asyncSupportsEmptyTermClick]="true"
+        idlIncludeLibraryInLabel="owner"
+        [idlQueryAnd]="{active: 't'}" idlClass="acqpro">
       </eg-combobox>
     </div>
 
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts
index 47b990c44f..0f6ba1321a 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts
@@ -123,9 +123,9 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy {
         private formTemplateSelector: ComboboxComponent;
     @ViewChild('bibSourceSelector', { static: true })
         private bibSourceSelector: ComboboxComponent;
-    @ViewChild('providerSelector', {static: true})
+    @ViewChild('providerSelector', {static: false})
         private providerSelector: ComboboxComponent;
-    @ViewChild('fiscalYearSelector', { static: true })
+    @ViewChild('fiscalYearSelector', { static: false })
         private fiscalYearSelector: ComboboxComponent;
     @ViewChild('selectionListSelector', { static: true })
         private selectionListSelector: ComboboxComponent;
@@ -210,7 +210,6 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy {
             this.vlagent.getMatchSets('bib'),
             this.vlagent.getBibSources(),
             this.vlagent.getFiscalYears(),
-            this.vlagent.getProvidersList(),
             this.vlagent.getSelectionLists(),
             this.vlagent.getItemImportDefs(),
            this.org.settings(['vandelay.default_match_set']).then(
@@ -260,12 +259,6 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy {
                         return {id: s.id(), label: s.source()};
                     });
 
-            case 'providersList':
-                return (this.vlagent.providersList || []).map(
-                    p => {
-                        return {id: p.id(), label: p.code()};
-                    });
-
             case 'fiscalYears':
                 return (this.vlagent.fiscalYears || []).map(
                     fy => {
@@ -308,10 +301,6 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy {
                 this.recordType = id;
                 break;
 
-            case 'providersList':
-                this.selectedProvider = id;
-                break;
-
             case 'bibSources':
                 this.selectedBibSource = id;
                 break;
@@ -605,7 +594,7 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy {
 
         this.bibSourceSelector.applyEntryId(this.selectedBibSource);
         this.matchSetSelector.applyEntryId(this.selectedMatchSet);
-        this.providerSelector.applyEntryId(this.selectedProvider);
+        this.providerSelector.selectedId = this.selectedProvider;
         this.fiscalYearSelector.applyEntryId(this.selectedFiscalYear);
         this.mergeProfileSelector.applyEntryId(this.selectedMergeProfile);
         this.fallThruMergeProfileSelector.applyEntryId(this.selectedFallThruMergeProfile);
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.service.ts
index 7b1f739bc3..15e78f7e8f 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.service.ts
@@ -79,20 +79,6 @@ export class PicklistUploadService {
         });
     }
 
-    getProvidersList(): Promise<IdlObject[]> {
-        if (this.providersList) {
-            return Promise.resolve(this.providersList);
-        }
-
-        const owners = this.org.ancestors(this.auth.user().ws_ou(), true);
-        return this.pcrud.search('acqpro',
-            {owner: owners}, {order_by: {acqpro: ['code']}}, {atomic: true})
-        .toPromise().then(providers => {
-            this.providersList = providers;
-            return providers;
-        });
-    }
-
     getSelectionLists(): Promise<IdlObject[]> {
         if (this.selectionLists) {
             return Promise.resolve(this.selectionLists);
-- 
2.11.0