From 07c9d989e2fb4637a986e59c83b64e84d90aedf4 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Mon, 23 Jun 2025 15:34:18 +0100 Subject: [PATCH] Bug 38201: Move 'created' call into base-resource Signed-off-by: Michaela Sieber Signed-off-by: Jonathan Druart Signed-off-by: Lucas Gass --- .../RecordSources/RecordSourcesResource.vue | 1 - .../vue/components/ERM/AgreementResource.vue | 2 -- .../ERM/EHoldingsLocalPackageResource.vue | 1 - .../ERM/EHoldingsLocalTitleResource.vue | 2 -- .../js/vue/components/ERM/LicenseResource.vue | 2 -- .../components/Preservation/TrainResource.vue | 2 -- .../Preservation/WaitingListResource.vue | 2 -- .../vue/components/Vendors/VendorResource.vue | 2 -- .../prog/js/vue/composables/base-resource.js | 30 ++++++++++--------- 9 files changed, 16 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue index 36e8acc9d5..2862f3a5e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue @@ -116,7 +116,6 @@ export default { ); } }; - baseResource.created(); return { ...baseResource, diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue index d3437a1f61..58ee482009 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue @@ -853,8 +853,6 @@ export default { table.redraw(tableUrl(filters)); }; - baseResource.created(); - return { ...baseResource, tableOptions, diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageResource.vue index 551604c7d2..983a18bad0 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageResource.vue @@ -360,7 +360,6 @@ export default { }, ]; }; - baseResource.created(); return { ...baseResource, diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue index e38b3476b9..b0d93b5ed0 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue @@ -516,8 +516,6 @@ export default { } }; - baseResource.created(); - return { ...baseResource, tableOptions, diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicenseResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicenseResource.vue index 6b7613ecf9..2cee5c718c 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicenseResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicenseResource.vue @@ -382,8 +382,6 @@ export default { } }; - baseResource.created(); - return { ...baseResource, tableOptions, diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainResource.vue index dcbe52e9d2..5990e4eb92 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainResource.vue @@ -431,8 +431,6 @@ export default { ]; }; - baseResource.created(); - return { ...baseResource, tableOptions, diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/WaitingListResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/WaitingListResource.vue index ab2e24b7a8..850c7dc602 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/WaitingListResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/WaitingListResource.vue @@ -276,8 +276,6 @@ export default { }, }; - baseResource.created(); - return { ...baseResource, tableOptions, diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue index 0ee9bb0c46..074811af41 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue @@ -857,8 +857,6 @@ export default { ]; }; - baseResource.created(); - return { ...baseResource, tableOptions, diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/composables/base-resource.js b/koha-tmpl/intranet-tmpl/prog/js/vue/composables/base-resource.js index ec8094a553..ab6140561a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/composables/base-resource.js +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/composables/base-resource.js @@ -347,20 +347,6 @@ export function useBaseResource(instancedResource) { }); }; - /** - * Initializes the component by populating resource attributes - * with their respective authorised values. This ensures that - * any select or relationship attributes have the correct options - * or authorised values assigned before the component is used. - */ - const created = () => { - if (instancedResource.resourceAttrs) { - populateAttributesWithAuthorisedValues( - instancedResource.resourceAttrs - ); - } - }; - /** * Retrieves a resource by id and assigns it to the component data. * If the resource component has an 'afterResourceFetch' method, it is called @@ -620,6 +606,22 @@ export function useBaseResource(instancedResource) { refreshTemplate.value++; }; + /** + * Initializes the component by populating resource attributes + * with their respective authorised values. This ensures that + * any select or relationship attributes have the correct options + * or authorised values assigned before the component is used. + */ + const created = () => { + if (instancedResource.resourceAttrs) { + populateAttributesWithAuthorisedValues( + instancedResource.resourceAttrs + ); + } + }; + + created(); + return { ...instancedResource, ...moduleStoreUtils,