From 950fa218d49ba8c8c6316f0b32ddbed958bcb75e Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 11 Nov 2022 14:30:18 +0000
Subject: [PATCH] Bug 32179: Add page-sections as appropraite to the ERM module

We missed the page-section addition when ERM was updated for the new UI
prior to push.

Test plan
1) Start a koha-testing-docker
2) Build the ERM module with 'kshell > yarn install > yarn build_js'
3) Enable the ERM module via the system preferences
4) Enable both 'EBSCO' and 'Local' as providers
4) Check the following pages
   * ERM > Agreements
   * ERM > Licenses
   * ERM > eHoldings > Local > Packages
   * ERM > eHoldings > Local > Titles
   * ERM > eHoldings > Local > Titles > Add from a list
   * ERM > eHoldings > EBSCO > Packages
   * ERM > eHoldings > EBSCO > Titles
5) Apply this patch
6) Build the app again 'yarn build_js'
7) Confirm page-sections appear as expected on the pages mentioned in
   step 4.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/js/vue/components/ERM/AgreementsList.vue           | 4 +++-
 .../js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue    | 2 +-
 .../prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue | 2 +-
 .../js/vue/components/ERM/EHoldingsLocalPackagesList.vue    | 6 +++++-
 .../vue/components/ERM/EHoldingsLocalTitlesFormImport.vue   | 6 +++---
 .../prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue | 6 +++++-
 .../prog/js/vue/components/ERM/LicensesList.vue             | 4 +++-
 7 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
index bb4dc481ec..ab5b8c9a49 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
@@ -24,7 +24,9 @@
                 :value="$__('Filter')"
             />
         </fieldset>
-        <table v-if="agreements.length" :id="table_id"></table>
+        <div v-if="agreements.length" class="page-section">
+            <table :id="table_id"></table>
+        </div>
         <div v-else-if="initialized" class="dialog message">
             {{ $__("There are no agreements defined") }}
         </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
index b7f6225884..dd4e79ae31 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
@@ -52,7 +52,7 @@
                     }}</router-link
                 >
             </div>
-            <div id="package_list_result">
+            <div id="package_list_result" class="page-section">
                 <table :id="table_id"></table>
             </div>
         </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue
index d95be95206..3554c0f00e 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue
@@ -58,7 +58,7 @@
                     }}</router-link
                 >
             </div>
-            <div id="title_list_result">
+            <div id="title_list_result" class="page-section">
                 <table :id="table_id"></table>
             </div>
         </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
index a62e20785c..2fa3f105fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
@@ -3,7 +3,11 @@
         <div v-if="!initialized">{{ $__("Loading") }}</div>
         <div v-else-if="packages" id="packages_list">
             <Toolbar />
-            <div v-if="packages.length" id="package_list_result">
+            <div
+                v-if="packages.length"
+                id="package_list_result"
+                class="page-section"
+            >
                 <table :id="table_id"></table>
             </div>
             <div v-else-if="initialized" class="dialog message">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormImport.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormImport.vue
index 8ff87af18b..96684bf6db 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormImport.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormImport.vue
@@ -6,7 +6,7 @@
             {{ $__("see job #%s").format(job_id) }}
         </router-link>
     </div>
-    <div id="package_list">
+    <fieldset id="package_list" class="rows">
         {{ $__("To the following local package") }}:
         <v-select
             v-model="package_id"
@@ -16,8 +16,8 @@
             :clearable="false"
         >
         </v-select>
-    </div>
-    <div id="import_list_result">
+    </fieldset>
+    <div id="import_list_result" class="page-section">
         <table :id="table_id"></table>
     </div>
 </template>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue
index 201fd6eb61..7cf7bcdfb5 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue
@@ -3,7 +3,11 @@
         <div v-if="!initialized">{{ $__("Loading") }}</div>
         <div v-else-if="titles" id="titles_list">
             <Toolbar />
-            <div v-if="titles.length" id="title_list_result">
+            <div
+                v-if="titles.length"
+                id="title_list_result"
+                class="page-section"
+            >
                 <table v-if="titles.length" :id="table_id"></table>
             </div>
             <div v-else-if="initialized" class="dialog message">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
index fd7fcd7b06..c8d80b3d22 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
@@ -2,7 +2,9 @@
     <div v-if="!initialized">{{ $__("Loading") }}</div>
     <div v-else-if="licenses" id="licenses_list">
         <Toolbar />
-        <table v-if="licenses.length" :id="table_id"></table>
+        <div v-if="licenses.length" class="page-section">
+            <table :id="table_id"></table>
+        </div>
         <div v-else-if="initialized" class="dialog message">
             {{ $__("There are no licenses defined") }}
         </div>
-- 
2.39.2