From cdee2155b243651b2287431d0ed3743fcabea30c Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 12 Jul 2024 12:43:42 +0200 Subject: [PATCH] perf: remove unnecessay code --- src/components/FetchData.vue | 1 + src/composables/useAxios.js | 35 -------------------------- src/pages/Worker/Card/WorkerLocker.vue | 14 ++++++++--- 3 files changed, 11 insertions(+), 39 deletions(-) delete mode 100644 src/composables/useAxios.js diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue index 28e841abf..2a0864d3e 100644 --- a/src/components/FetchData.vue +++ b/src/components/FetchData.vue @@ -35,6 +35,7 @@ const $props = defineProps({ const emit = defineEmits(['onFetch']); defineExpose({ fetch }); + onMounted(async () => { if ($props.autoLoad) { await fetch(); diff --git a/src/composables/useAxios.js b/src/composables/useAxios.js deleted file mode 100644 index 1595e453f..000000000 --- a/src/composables/useAxios.js +++ /dev/null @@ -1,35 +0,0 @@ -import axios from 'axios'; - -export function useAxios(props, url) { - if (!url) url = props.url; - const handleFilter = (filter) => { - filter = Object.assign(filter, props.filter); - if (props.where && !filter.where) filter.where = props.where; - if (props.sortBy) filter.order = props.sortBy; - if (props.limit) filter.limit = props.limit; - return JSON.stringify(filter); - }; - const fetch = async (filter) => - ( - await axios.get(url, { - params: { filter: handleFilter(filter), ...props.params }, - }) - ).data; - - const push = async (method = 'PUT', filter, data) => - axios({ - url, - method, - data, - params: { filter: handleFilter(filter), ...props.params }, - }); - - const pop = async (filter) => - axios.delete(url, { params: { filter: handleFilter(filter), ...props.params } }); - - return { - fetch, - push, - pop, - }; -} diff --git a/src/pages/Worker/Card/WorkerLocker.vue b/src/pages/Worker/Card/WorkerLocker.vue index 6e9cfba38..f19fc8ae6 100644 --- a/src/pages/Worker/Card/WorkerLocker.vue +++ b/src/pages/Worker/Card/WorkerLocker.vue @@ -7,10 +7,11 @@ import { useRole } from 'src/composables/useRole'; import FormModel from 'components/FormModel.vue'; import VnSelect from 'src/components/common/VnSelect.vue'; import { useArrayData } from 'src/composables/useArrayData'; -import { useAxios } from 'src/composables/useAxios'; +import FetchData from 'components/FetchData.vue'; const { hasAny } = useRole(); const { t } = useI18n(); +const fetchData = ref(); const originaLockerId = ref(); const lockers = ref([]); const { store } = useArrayData('Worker'); @@ -26,14 +27,21 @@ const save = async (data) => { const lockerId = data.id ?? originaLockerId.value; const workerFk = lockerId == originaLockerId.value ? null : entityId.value; - return useAxios(`Lockers/${lockerId}`).push('PATCH', { workerFk }); + return axios.patch(`Lockers/${lockerId}`, { workerFk }); }; const init = async (data) => { + await fetchData.value.fetch(); originaLockerId.value = data.id; };