Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32030: Use Pinia for vendors 🍍

Browse source 
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>
This commit is contained in:
Jonathan Druart 2022-05-05 10:13:56 +02:00 committed by Tomas Cohen Arazi
parent 3754cabab2
commit a95b659e68
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
8 changed files with 68 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Agreements.vue
View file

@ -4,7 +4,6 @@
<div class="dialog alert" v-if="error">{{ error }}</div>
<List
v-if="op == 'list'"
:vendors="vendors"
:av_agreement_statuses="agreement_statuses"
:av_agreement_closure_reasons="agreement_closure_reasons"
:av_agreement_renewal_priorities="agreement_renewal_priorities"
@ -15,7 +14,6 @@
<Show
v-if="op == 'show'"
:agreement_id="agreement_id"
:vendors="vendors"
:av_agreement_statuses="agreement_statuses"
:av_agreement_closure_reasons="agreement_closure_reasons"
:av_agreement_renewal_priorities="agreement_renewal_priorities"
@ -28,7 +26,6 @@
<AddForm
v-if="op == 'add-form'"
:agreement_id="agreement_id"
:vendors="vendors"
:av_agreement_statuses="agreement_statuses"
:av_agreement_closure_reasons="agreement_closure_reasons"
:av_agreement_renewal_priorities="agreement_renewal_priorities"
@ -55,8 +52,8 @@ import List from "./AgreementsList.vue"
import Show from "./AgreementsShow.vue"
import AddForm from "./AgreementsFormAdd.vue"
import ConfirmDeleteForm from "./AgreementsFormConfirmDelete.vue"
import { ref, reactive, computed } from "vue"
import { reactive, computed } from "vue"
export default {
data() {
@ -65,7 +62,6 @@ export default {
op: "list",
message: null,
error: null,
vendors: [],
agreement_statuses,
agreement_closure_reasons,
agreement_renewal_priorities,
@ -74,22 +70,6 @@ export default {
agreement_license_location,
}
},
beforeCreate() {
// FIXME it's not only called on setup, but setup() does not have 'this'.
const apiUrl = "/api/v1/acquisitions/vendors"
fetch(apiUrl)
.then((res) => res.json())
.then(
(result) => {
this.vendors = result
}).catch(
(error) => {
this.$emit('set-error', error)
}
)
},
methods: {
switchView(view) {
this.message = null

14
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
View file

@ -165,7 +165,9 @@
/>
<AgreementLicenses
:agreement_licenses="agreement.agreement_licenses"
:av_agreement_license_statuses="av_agreement_license_statuses"
:av_agreement_license_statuses="
av_agreement_license_statuses
"
:av_agreement_license_location="
av_agreement_license_location
"
@ -189,8 +191,17 @@
import AgreementPeriods from './AgreementPeriods.vue'
import AgreementUserRoles from './AgreementUserRoles.vue'
import AgreementLicenses from './AgreementLicenses.vue'
import { useVendorStore } from "../../stores/vendors"
import { storeToRefs } from "pinia"
export default {
setup() {
const vendorStore = useVendorStore()
const { vendors } = storeToRefs(vendorStore)
return {
vendors,
}
},
data() {
return {
agreement: {
@ -285,7 +296,6 @@ export default {
emits: ['agreement-created', 'agreement-updated', 'set-error', 'switch-view'],
props: {
agreement_id: Number,
vendors: Array,
av_agreement_statuses: Array,
av_agreement_closure_reasons: Array,
av_agreement_renewal_priorities: Array,

11
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
View file

@ -12,7 +12,17 @@
import ButtonEdit from "./ButtonEdit.vue"
import ButtonDelete from "./ButtonDelete.vue"
import { createVNode, defineComponent, render, resolveComponent } from 'vue'
import { useVendorStore } from "../../stores/vendors"
import { storeToRefs } from "pinia"
export default {
setup() {
const vendorStore = useVendorStore()
const { vendors } = storeToRefs(vendorStore)
return {
vendors,
}
},
created() {
const apiUrl = '/api/v1/erm/agreements'
@ -225,7 +235,6 @@ export default {
},
},
props: {
vendors: Array,
av_agreement_statuses: Array,
av_agreement_closure_reasons: Array,
av_agreement_renewal_priorities: Array,

16
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
View file

@ -101,7 +101,12 @@
>
<td>{{ patron_to_html(role.patron) }}</td>
<td>
{{ get_lib_from_av(av_agreement_user_roles, role.role) }}
{{
get_lib_from_av(
av_agreement_user_roles,
role.role
)
}}
</td>
</tr>
</tbody>
@ -164,6 +169,8 @@
<script>
import AgreementPeriods from './AgreementPeriods.vue'
import AgreementUserRoles from './AgreementUserRoles.vue'
import { useVendorStore } from "../../stores/vendors"
import { storeToRefs } from "pinia"
export default {
setup() {
@ -175,10 +182,14 @@ export default {
)
return o ? o.lib : ""
}
const vendorStore = useVendorStore()
const { vendors } = storeToRefs(vendorStore)
return {
format_date,
patron_to_html,
get_lib_from_av
get_lib_from_av,
vendors,
}
},
data() {
@ -223,7 +234,6 @@ export default {
emits: ['set-error', 'switch-view'],
props: {
agreement_id: Number,
vendors: Array,
av_agreement_statuses: Array,
av_agreement_closure_reasons: Array,
av_agreement_renewal_priorities: Array,

24
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue
View file

@ -30,7 +30,6 @@
Licenses</router-link
>
</li>
</ul>
</div>
</div>
@ -42,16 +41,35 @@
<script>
import Breadcrumb from "./Breadcrumb.vue"
import { useVendorStore } from "../../stores/vendors"
import { reactive, computed } from "vue"
export default {
setup() {
const vendorStore = useVendorStore()
return {
vendorStore
}
},
data() {
return {
component: "agreement",
}
},
beforeCreate() {
const apiUrl = "/api/v1/acquisitions/vendors"
fetch(apiUrl)
.then((res) => res.json())
.then(
(result) => {
this.vendorStore.vendors = result
},
(error) => {
this.$emit("set-error", error)
}
)
},
methods: {
switchComponent(component) {
this.component = component

4
koha-tmpl/intranet-tmpl/prog/js/vue/main-erm.ts
View file

@ -1,5 +1,6 @@
import { createApp } from "vue";
import { createWebHistory, createRouter } from "vue-router";
import { createPinia } from 'pinia'
import { library } from "@fortawesome/fontawesome-svg-core";
import { faPlus, faPencil, faTrash } from "@fortawesome/free-solid-svg-icons";
@ -60,6 +61,7 @@ const routes = [
const router = createRouter({ history: createWebHistory(), routes });
createApp(App)
.use(createPinia())
.use(router)
.component("font-awesome-icon", FontAwesomeIcon)
.mount("#erm");
.mount("#erm");

7
koha-tmpl/intranet-tmpl/prog/js/vue/stores/vendors.js Normal file
View file

@ -0,0 +1,7 @@
import { defineStore } from 'pinia'
export const useVendorStore = defineStore('vendors', {
state: () => ({
vendors: [],
}),
})

1
package.json
View file

@ -33,6 +33,7 @@
"merge-stream": "^2.0.0",
"minimist": "^1.2.5",
"mysql": "^2.18.1",
"pinia": "^2.0.13",
"style-loader": "^3.3.1",
"vue": "^3.2.31",
"vue-flatpickr-component": "^9",