From 00878252a6b86375865a08a5b6306bddc5ed563b Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 5 May 2022 12:10:19 +0200
Subject: [PATCH] Bug 32030: use Pinia for AVs

Signed-off-by: Jonathan Field <jonathan.field@ptfs-europe.com>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/js/vue/components/ERM/Agreements.vue | 22 ------------------
 .../vue/components/ERM/AgreementsFormAdd.vue  | 23 ++++++++++++++-----
 .../js/vue/components/ERM/AgreementsList.vue  | 10 +++++---
 .../js/vue/components/ERM/AgreementsShow.vue  | 23 ++++++++++++++-----
 .../prog/js/vue/components/ERM/ERMMain.vue    | 13 ++++++++++-
 .../prog/js/vue/components/ERM/Licenses.vue   |  6 -----
 .../js/vue/components/ERM/LicensesFormAdd.vue | 17 ++++++++++++--
 .../js/vue/components/ERM/LicensesList.vue    | 15 ++++++++++++
 .../js/vue/components/ERM/LicensesShow.vue    | 15 +++++++++---
 .../prog/js/vue/stores/authorised_values.js   | 15 ++++++++++++
 10 files changed, 110 insertions(+), 49 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/js/vue/stores/authorised_values.js

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Agreements.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Agreements.vue
index aa08f6f9fa..80990361b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Agreements.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Agreements.vue
@@ -4,9 +4,6 @@
     <div class="dialog alert" v-if="error">{{ error }}</div>
     <List
         v-if="op == 'list'"
-        :av_agreement_statuses="agreement_statuses"
-        :av_agreement_closure_reasons="agreement_closure_reasons"
-        :av_agreement_renewal_priorities="agreement_renewal_priorities"
         @set-current-agreement-id="setCurrentAgreementID"
         @switch-view="switchView"
         @set-error="setError"
@@ -14,24 +11,12 @@
     <Show
         v-if="op == 'show'"
         :agreement_id="agreement_id"
-        :av_agreement_statuses="agreement_statuses"
-        :av_agreement_closure_reasons="agreement_closure_reasons"
-        :av_agreement_renewal_priorities="agreement_renewal_priorities"
-        :av_agreement_user_roles="agreement_user_roles"
-        :av_agreement_license_statuses="agreement_license_statuses"
-        :av_agreement_license_location="agreement_license_location"
         @switch-view="switchView"
         @set-error="setError"
     />
     <AddForm
         v-if="op == 'add-form'"
         :agreement_id="agreement_id"
-        :av_agreement_statuses="agreement_statuses"
-        :av_agreement_closure_reasons="agreement_closure_reasons"
-        :av_agreement_renewal_priorities="agreement_renewal_priorities"
-        :av_agreement_user_roles="agreement_user_roles"
-        :av_agreement_license_statuses="agreement_license_statuses"
-        :av_agreement_license_location="agreement_license_location"
         @agreement-created="agreementCreated"
         @agreement-updated="agreementUpdated"
         @switch-view="switchView"
@@ -54,7 +39,6 @@ import AddForm from "./AgreementsFormAdd.vue"
 import ConfirmDeleteForm from "./AgreementsFormConfirmDelete.vue"
 import { ref, reactive, computed } from "vue"
 
-
 export default {
     data() {
         return {
@@ -62,12 +46,6 @@ export default {
             op: "list",
             message: null,
             error: null,
-            agreement_statuses,
-            agreement_closure_reasons,
-            agreement_renewal_priorities,
-            agreement_user_roles,
-            agreement_license_statuses,
-            agreement_license_location,
         }
     },
     methods: {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
index 2e8e693a94..a8f0c73ed1 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
@@ -192,14 +192,31 @@ import AgreementPeriods from './AgreementPeriods.vue'
 import AgreementUserRoles from './AgreementUserRoles.vue'
 import AgreementLicenses from './AgreementLicenses.vue'
 import { useVendorStore } from "../../stores/vendors"
+import { useAVStore } from "../../stores/authorised_values"
 import { storeToRefs } from "pinia"
 
 export default {
     setup() {
         const vendorStore = useVendorStore()
         const { vendors } = storeToRefs(vendorStore)
+        const AVStore = useAVStore()
+        const {
+            av_agreement_statuses,
+            av_agreement_closure_reasons,
+            av_agreement_renewal_priorities,
+            av_agreement_user_roles,
+            av_agreement_license_statuses,
+            av_agreement_license_location,
+        } = storeToRefs(AVStore)
+
         return {
             vendors,
+            av_agreement_statuses,
+            av_agreement_closure_reasons,
+            av_agreement_renewal_priorities,
+            av_agreement_user_roles,
+            av_agreement_license_statuses,
+            av_agreement_license_location,
         }
     },
     data() {
@@ -296,12 +313,6 @@ export default {
     emits: ['agreement-created', 'agreement-updated', 'set-error', 'switch-view'],
     props: {
         agreement_id: Number,
-        av_agreement_statuses: Array,
-        av_agreement_closure_reasons: Array,
-        av_agreement_renewal_priorities: Array,
-        av_agreement_user_roles: Array,
-        av_agreement_license_statuses: Array,
-        av_agreement_license_location: Array,
     },
     components: {
         AgreementPeriods,
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 31599b111b..0072ddb4cf 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
@@ -13,14 +13,21 @@ import ButtonEdit from "./ButtonEdit.vue"
 import ButtonDelete from "./ButtonDelete.vue"
 import { createVNode, defineComponent, render, resolveComponent } from 'vue'
 import { useVendorStore } from "../../stores/vendors"
+import { useAVStore } from "../../stores/authorised_values"
 import { storeToRefs } from "pinia"
 
 export default {
     setup() {
         const vendorStore = useVendorStore()
         const { vendors } = storeToRefs(vendorStore)
+        const AVStore = useAVStore()
+        const { av_agreement_statuses, av_agreement_closure_reasons, av_agreement_renewal_priorities } = storeToRefs(AVStore)
+
         return {
             vendors,
+            av_agreement_statuses,
+            av_agreement_closure_reasons,
+            av_agreement_renewal_priorities,
         }
     },
     created() {
@@ -235,9 +242,6 @@ export default {
         },
     },
     props: {
-        av_agreement_statuses: Array,
-        av_agreement_closure_reasons: Array,
-        av_agreement_renewal_priorities: Array,
     },
     name: "AgreementsList",
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
index 37cc0ddf99..711d607888 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
@@ -170,6 +170,7 @@
 import AgreementPeriods from './AgreementPeriods.vue'
 import AgreementUserRoles from './AgreementUserRoles.vue'
 import { useVendorStore } from "../../stores/vendors"
+import { useAVStore } from "../../stores/authorised_values"
 import { storeToRefs } from "pinia"
 
 export default {
@@ -185,11 +186,27 @@ export default {
         const vendorStore = useVendorStore()
         const { vendors } = storeToRefs(vendorStore)
 
+        const AVStore = useAVStore()
+        const {
+            av_agreement_statuses,
+            av_agreement_closure_reasons,
+            av_agreement_renewal_priorities,
+            av_agreement_user_roles,
+            av_agreement_license_statuses,
+            av_agreement_license_location,
+        } = storeToRefs(AVStore)
+
         return {
             format_date,
             patron_to_html,
             get_lib_from_av,
             vendors,
+            av_agreement_statuses,
+            av_agreement_closure_reasons,
+            av_agreement_renewal_priorities,
+            av_agreement_user_roles,
+            av_agreement_license_statuses,
+            av_agreement_license_location,
         }
     },
     data() {
@@ -234,12 +251,6 @@ export default {
     emits: ['set-error', 'switch-view'],
     props: {
         agreement_id: Number,
-        av_agreement_statuses: Array,
-        av_agreement_closure_reasons: Array,
-        av_agreement_renewal_priorities: Array,
-        av_agreement_user_roles: Array,
-        av_agreement_license_statuses: Array,
-        av_agreement_license_location: Array,
     },
     components: {
         AgreementPeriods,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue
index 16d1a88f0f..4a8e3cf630 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue
@@ -42,13 +42,24 @@
 <script>
 import Breadcrumb from "./Breadcrumb.vue"
 import { useVendorStore } from "../../stores/vendors"
+import { useAVStore } from "../../stores/authorised_values"
 import { reactive, computed } from "vue"
 
 export default {
     setup() {
         const vendorStore = useVendorStore()
+        const AVStore = useAVStore()
+        AVStore.av_agreement_statuses = agreement_statuses
+        AVStore.av_agreement_closure_reasons = agreement_closure_reasons
+        AVStore.av_agreement_renewal_priorities = agreement_renewal_priorities
+        AVStore.av_agreement_user_roles = agreement_user_roles
+        AVStore.av_license_types = license_types
+        AVStore.av_license_statuses = license_statuses
+        AVStore.av_agreement_license_statuses = agreement_license_statuses
+        AVStore.av_agreement_license_location = agreement_license_location
+
         return {
-            vendorStore
+            vendorStore,
         }
     },
     data() {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Licenses.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Licenses.vue
index f6a1e40c7e..c557c44061 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Licenses.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Licenses.vue
@@ -4,8 +4,6 @@
     <div class="dialog alert" v-if="error">{{ error }}</div>
     <List
         v-if="op == 'list'"
-        :av_license_types="license_types"
-        :av_license_statuses="license_statuses"
         @set-current-license-id="setCurrentLicenseID"
         @switch-view="switchView"
         @set-error="setError"
@@ -13,16 +11,12 @@
     <Show
         v-if="op == 'show'"
         :license_id="license_id"
-        :av_license_types="license_types"
-        :av_license_statuses="license_statuses"
         @switch-view="switchView"
         @set-error="setError"
     />
     <AddForm
         v-if="op == 'add-form'"
         :license_id="license_id"
-        :av_license_types="license_types"
-        :av_license_statuses="license_statuses"
         @license-created="licenseCreated"
         @license-updated="licenseUpdated"
         @switch-view="switchView"
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
index 4585cdc728..1802f6e11e 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
@@ -109,8 +109,23 @@
 
 <script>
 import flatPickr from 'vue-flatpickr-component'
+import { useAVStore } from "../../stores/authorised_values"
+import { storeToRefs } from "pinia"
 
 export default {
+
+    setup() {
+        const AVStore = useAVStore()
+        const {
+            av_license_types,
+            av_license_statuses,
+        } = storeToRefs(AVStore)
+
+        return {
+            av_license_types,
+            av_license_statuses,
+        }
+    },
     data() {
         return {
             fp_config: flatpickr_defaults, dates_fixed: 0,
@@ -194,8 +209,6 @@ export default {
     emits: ['license-created', 'license-updated', 'set-error', 'switch-view'],
     props: {
         license_id: Number,
-        av_license_types: Array,
-        av_license_statuses: Array,
     },
     components: {
         flatPickr
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 6de3ee40fb..728cc727ce 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
@@ -12,7 +12,22 @@
 import ButtonEdit from "./ButtonEdit.vue"
 import ButtonDelete from "./ButtonDelete.vue"
 import { createVNode, defineComponent, render, resolveComponent } from 'vue'
+import { useAVStore } from "../../stores/authorised_values"
+import { storeToRefs } from "pinia"
+
 export default {
+    setup() {
+        const AVStore = useAVStore()
+        const {
+            av_license_types,
+            av_license_statuses,
+        } = storeToRefs(AVStore)
+
+        return {
+            av_license_types,
+            av_license_statuses,
+        }
+    },
     created() {
         const apiUrl = '/api/v1/erm/licenses'
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue
index df507b6189..f9a35c4c0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue
@@ -52,6 +52,8 @@
 </template>
 
 <script>
+import { useAVStore } from "../../stores/authorised_values"
+import { storeToRefs } from "pinia"
 
 export default {
     setup() {
@@ -62,9 +64,18 @@ export default {
             )
             return o ? o.lib : ""
         }
+
+        const AVStore = useAVStore()
+        const {
+            av_license_types,
+            av_license_statuses,
+        } = storeToRefs(AVStore)
+
         return {
             format_date,
-            get_lib_from_av
+            get_lib_from_av,
+            av_license_types,
+            av_license_statuses,
         }
     },
     data() {
@@ -104,8 +115,6 @@ export default {
     emits: ['set-error', 'switch-view'],
     props: {
         license_id: Number,
-        av_license_types: Array,
-        av_license_statuses: Array,
     },
     components: {
     },
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/stores/authorised_values.js b/koha-tmpl/intranet-tmpl/prog/js/vue/stores/authorised_values.js
new file mode 100644
index 0000000000..287e027ca5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/stores/authorised_values.js
@@ -0,0 +1,15 @@
+import { defineStore } from "pinia";
+
+export const useAVStore = defineStore("authorised_values", {
+    state: () => ({
+        av_agreement_statuses: [],
+        av_agreement_closure_reasons: [],
+        av_agreement_renewal_priorities: [],
+        av_agreement_user_roles: [],
+        av_license_types: [],
+        av_license_statuses: [],
+        av_agreement_license_statuses: [],
+        av_agreement_license_location: [],
+    }),
+    // FIXME We could move get_lib_from_av here
+});
-- 
2.39.2