From c056dd380e68f77c0d4527d43d92a76cc10e9e85 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Thu, 9 Jul 2020 13:01:25 -0400
Subject: [PATCH] add and update grid config WS settings (LH#22)

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../acq/provider/provider-addresses.component.html |  2 +-
 .../provider/provider-attributes.component.html    |  2 +-
 .../provider-contact-addresses.component.html      |  2 +-
 .../acq/provider/provider-contacts.component.html  |  2 +-
 .../provider/provider-edi-accounts.component.html  |  4 +-
 .../acq/provider/provider-holdings.component.html  |  2 +-
 .../acq/provider/provider-results.component.html   |  2 +-
 .../sql/Pg/upgrade/ZZZZ.data.angular-providers.sql | 67 ++++++++++++++++++++++
 8 files changed, 75 insertions(+), 8 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/ZZZZ.data.angular-providers.sql

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-addresses.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-addresses.component.html
index 80cbd21379..93dceb506b 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-addresses.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-addresses.component.html
@@ -6,7 +6,7 @@
 <eg-string #deleteSuccessString i18n-text text="Delete of Provider Address succeeded"></eg-string>
 
 <eg-grid #acqProviderAddressesGrid
-  persistKey="acq.provider.addresses.grid"
+  persistKey="acq.provider.addresses"
   idlClass="acqpa" [dataSource]="gridSource"
   [sortable]="true"
   [filterable]="true"
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-attributes.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-attributes.component.html
index 9280f6598e..a728c410cf 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-attributes.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-attributes.component.html
@@ -6,7 +6,7 @@
 <eg-string #deleteSuccessString i18n-text text="Delete of Provider Attributes succeeded"></eg-string>
 
 <eg-grid #acqProviderAttributesGrid
-  persistKey="acq.provider.attributes.grid"
+  persistKey="acq.provider.attributes"
   idlClass="acqlipad" [dataSource]="gridSource"
   [sortable]="true"
   hideFields="provider"
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contact-addresses.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contact-addresses.component.html
index 219b71e65b..3d4ea6b38e 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contact-addresses.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contact-addresses.component.html
@@ -6,7 +6,7 @@
 <eg-string #deleteSuccessString i18n-text text="Delete of Contact Address succeeded"></eg-string>
 
 <eg-grid #acqProviderContactAddressesGrid
-  persistKey="acq.provider.contact.addresses.grid"
+  persistKey="acq.provider.contact.addresses"
   idlClass="acqpca" [dataSource]="gridSource"
   [sortable]="true"
   [filterable]="true"
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contacts.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contacts.component.html
index 3a344bf919..113b3bfe03 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contacts.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-contacts.component.html
@@ -15,7 +15,7 @@
 </ng-template>
 
 <eg-grid #acqProviderContactsGrid
-  persistKey="acq.provider.contacts.grid"
+  persistKey="acq.provider.contacts"
   idlClass="acqpc" [dataSource]="gridSource"
   [sortable]="true"
   [disableMultiSelect]="true"
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-edi-accounts.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-edi-accounts.component.html
index 52f4c778c5..4841e1e6a2 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-edi-accounts.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-edi-accounts.component.html
@@ -14,7 +14,7 @@
 </eg-confirm-dialog>
 
 <eg-grid #acqProviderEdiAccountsGrid
-  persistKey="acq.provider.edi_accounts.grid"
+  persistKey="acq.provider.edi_accounts"
   idlClass="acqedi" [dataSource]="gridSource"
   [sortable]="true"
   hideFields="provider"
@@ -38,7 +38,7 @@
 <ng-container *ngIf="viewEdiMessages">
   <h2 i18n>EDI messages for account {{selectedEdiAccountLabel}}</h2>
   <eg-grid #acqProviderEdiMessagesGrid
-    persistKey="acq.provider.edi_messages.grid"
+    persistKey="acq.provider.edi_messages"
     idlClass="acqedim" [dataSource]="ediMessagesSource"
     [sortable]="true"
     [filterable]="true">
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.html
index 1713c52d13..57cd3f5005 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.html
@@ -31,7 +31,7 @@
 > </eg-fm-record-editor>
 
 <eg-grid #acqProviderHoldingsGrid
-  persistKey="acq.provider.holdings.grid"
+  persistKey="acq.provider.holdings"
   idlClass="acqphsm" [dataSource]="gridSource"
   [sortable]="true"
   hideFields="provider"
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-results.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-results.component.html
index 15d2c6dc37..9691ddb8e4 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-results.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-results.component.html
@@ -7,7 +7,7 @@
 </ng-template>
 
 <eg-grid #acqSearchProviderGrid
-  persistKey="acq.provider.search.result_grid"
+  persistKey="acq.provider.search.results"
   idlClass="acqpro" [dataSource]="gridSource"
   [stickyHeader]="true"
   [filterable]="true"
diff --git a/Open-ILS/src/sql/Pg/upgrade/ZZZZ.data.angular-providers.sql b/Open-ILS/src/sql/Pg/upgrade/ZZZZ.data.angular-providers.sql
new file mode 100644
index 0000000000..cedae0a369
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/ZZZZ.data.angular-providers.sql
@@ -0,0 +1,67 @@
+BEGIN;
+
+INSERT INTO config.workstation_setting_type
+    (name, grp, datatype, label)
+VALUES (
+    'eg.grid.acq.provider.addresses', 'gui', 'object',
+    oils_i18n_gettext(
+    'eg.grid.acq.provider.addresses',
+    'Grid Config: acq.provider.addresses',
+    'cwst', 'label')
+), (
+    'eg.grid.acq.provider.attributes', 'gui', 'object',
+    oils_i18n_gettext(
+    'eg.grid.acq.provider.attributes',
+    'Grid Config: acq.provider.attributes',
+    'cwst', 'label')
+), (
+    'eg.grid.acq.provider.contact.addresses', 'gui', 'object',
+    oils_i18n_gettext(
+    'eg.grid.acq.provider.contact.addresses',
+    'Grid Config: acq.provider.contact.addresses',
+    'cwst', 'label')
+), (
+    'eg.grid.acq.provider.contacts', 'gui', 'object',
+    oils_i18n_gettext(
+    'eg.grid.acq.provider.contacts',
+    'Grid Config: acq.provider.contacts',
+    'cwst', 'label')
+), (
+    'eg.grid.acq.provider.edi_accounts', 'gui', 'object',
+    oils_i18n_gettext(
+    'eg.grid.acq.provider.edi_accounts',
+    'Grid Config: acq.provider.edi_accounts',
+    'cwst', 'label')
+), (
+    'eg.grid.acq.provider.edi_messages', 'gui', 'object',
+    oils_i18n_gettext(
+    'eg.grid.acq.provider.edi_messages',
+    'Grid Config: acq.provider.edi_messages',
+    'cwst', 'label')
+), (
+    'eg.grid.acq.provider.holdings', 'gui', 'object',
+    oils_i18n_gettext(
+    'eg.grid.acq.provider.holdings',
+    'Grid Config: acq.provider.holdings',
+    'cwst', 'label')
+), (
+    'eg.grid.acq.provider.invoices', 'gui', 'object',
+    oils_i18n_gettext(
+    'eg.grid.acq.provider.invoices',
+    'Grid Config: acq.provider.invoices',
+    'cwst', 'label')
+), (
+    'eg.grid.acq.provider.purchaseorders', 'gui', 'object',
+    oils_i18n_gettext(
+    'eg.grid.acq.provider.purchaseorders',
+    'Grid Config: acq.provider.purchaseorders',
+    'cwst', 'label')
+), (
+    'eg.grid.acq.provider.search.results', 'gui', 'object',
+    oils_i18n_gettext(
+    'eg.grid.acq.provider.search.results',
+    'Grid Config: acq.provider.search.results',
+    'cwst', 'label')
+);
+
+COMMIT;
-- 
2.11.0