cypress.config.js

@@ -1,7 +1,4 @@
 const { defineConfig } = require('cypress');
-// https://docs.cypress.io/app/tooling/reporters
-// https://docs.cypress.io/app/references/configuration
-// https://www.npmjs.com/package/cypress-mochawesome-reporter
 
 module.exports = defineConfig({
     e2e: {
@@ -19,7 +16,6 @@ module.exports = defineConfig({
         reporterOptions: {
             charts: true,
             reportPageTitle: 'Cypress Inline Reporter',
-            reportFilename: '[status]_[datetime]-report',
             embeddedScreenshots: true,
             reportDir: 'test/cypress/reports',
             inlineAssets: true,

src/components/CreateNewCityForm.vue

@@ -17,6 +17,10 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
 });
 const { t } = useI18n();
 
@@ -52,6 +56,7 @@ const onDataSaved = (...args) => {
                     :province-selected="$props.provinceSelected"
                     :country-fk="$props.countryFk"
                     v-model="data.provinceFk"
+                    :provinces="$props.provinces"
                 />
             </VnRow>
         </template>

src/components/CreateNewPostcodeForm.vue

@@ -56,10 +56,10 @@ async function onCityCreated(newTown, formData) {
 }
 
 function setTown(newTown, data) {
-    data.provinceFk = newTown.provinceFk;
-    data.countryFk = newTown.province.countryFk;
     if (!newTown) return;
     town.value = newTown;
+    data.provinceFk = newTown.provinceFk;
+    data.countryFk = newTown.province.countryFk;
 }
 
 async function setProvince(id, data) {
@@ -73,7 +73,7 @@ async function onProvinceCreated(data) {
     await provincesFetchDataRef.value.fetch({
         where: { countryFk: postcodeFormData.countryFk },
     });
-    postcodeFormData.provinceFk = data.id;
+    postcodeFormData.provinceFk.value = data.id;
 }
 
 watch(
@@ -90,33 +90,22 @@ watch(
             postcodeFormData.townFk = null;
         }
         if (oldValueFk !== newCountryFk) {
-            await fetchProvinces(newCountryFk);
+            await provincesFetchDataRef.value.fetch({
-            await fetchTowns(newCountryFk);
+                where: {
-        }
+                    countryFk: newCountryFk,
-    }
+                },
-);
+            });
-async function fetchTowns(countryFk) {
+            await townsFetchDataRef.value.fetch({
-    const townsFilter = countryFk
-        ? {
                 where: {
                     provinceFk: {
                         inq: provincesOptions.value.map(({ id }) => id),
                     },
                 },
+            });
         }
-        : {};
-    await townsFetchDataRef.value.fetch(townsFilter);
-}
-async function fetchProvinces(countryFk) {
-    const provincesFilter = countryFk
-        ? {
-              where: {
-                  countryFk: countryFk,
-              },
     }
-        : {};
+);
-    await provincesFetchDataRef.value.fetch(provincesFilter);
+
-}
 watch(
     () => postcodeFormData.provinceFk,
     async (newProvinceFk, oldValueFk) => {
@@ -158,13 +147,6 @@ async function handleCountries(data) {
         auto-load
         url="Towns/location"
     />
-    <FetchData
-        ref="CountriesFetchDataRef"
-        :sort-by="['name ASC']"
-        @on-fetch="handleCountries"
-        auto-load
-        url="Countries"
-    />
 
     <FormModelPopup
         url-create="postcodes"
@@ -211,6 +193,7 @@ async function handleCountries(data) {
                         <CreateNewCityForm
                             :country-fk="data.countryFk"
                             :province-selected="data.provinceFk"
+                            :provinces="provincesOptions"
                             @on-data-saved="
                                 (_, requestResponse) =>
                                     onCityCreated(requestResponse, data)
@@ -226,12 +209,14 @@ async function handleCountries(data) {
                     @update:model-value="(value) => setProvince(value, data)"
                     v-model="data.provinceFk"
                     :clearable="true"
+                    :provinces="provincesOptions"
                     @on-province-created="onProvinceCreated"
                 />
                 <VnSelect
+                    url="Countries"
+                    :sort-by="['name ASC']"
                     :label="t('Country')"
                     @update:options="handleCountries"
-                    :options="countriesOptions"
                     hide-selected
                     option-label="name"
                     option-value="id"

src/components/CreateNewProvinceForm.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, reactive, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
@@ -34,12 +34,6 @@ const onDataSaved = (dataSaved, requestResponse) => {
     );
     emit('onDataSaved', dataSaved, requestResponse);
 };
-const where = computed(() => {
-    if (!$props.countryFk) {
-        return {};
-    }
-    return { countryFk: $props.countryFk };
-});
 </script>
 
 <template>
@@ -47,7 +41,9 @@ const where = computed(() => {
         @on-fetch="(data) => (autonomiesOptions = data)"
         auto-load
         :filter="{
-            where,
+            where: {
+                countryFk: $props.countryFk,
+            },
         }"
         url="Autonomies/location"
         :sort-by="['name ASC']"

src/components/EditPictureForm.vue

@@ -156,6 +156,7 @@ const rotateRight = () => {
 };
 
 const onSubmit = () => {
+    try {
         if (!newPhoto.files && !newPhoto.url) {
             notify(t('Select an image'), 'negative');
             return;
@@ -172,6 +173,9 @@ const onSubmit = () => {
                 newPhoto.blob = file;
             })
             .then(() => makeRequest());
+    } catch (err) {
+        console.error('Error uploading image');
+    }
 };
 
 const makeRequest = async () => {

src/components/EditTableCellValueForm.vue

@@ -51,6 +51,7 @@ const onDataSaved = () => {
 };
 
 const onSubmit = async () => {
+    try {
         isLoading.value = true;
         const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
         const payload = {
@@ -62,6 +63,9 @@ const onSubmit = async () => {
         await axios.post($props.editUrl, payload);
         onDataSaved();
         isLoading.value = false;
+    } catch (err) {
+        console.error('Error submitting table cell edit');
+    }
 };
 
 const closeForm = () => {

src/components/FilterItemForm.vue

@@ -84,6 +84,7 @@ const tableColumns = computed(() => [
 ]);
 
 const onSubmit = async () => {
+    try {
         let filter = itemFilter;
         const params = itemFilterParams;
         const where = {};
@@ -108,6 +109,9 @@ const onSubmit = async () => {
             params: { filter: JSON.stringify(filter) },
         });
         tableRows.value = data;
+    } catch (err) {
+        console.error('Error fetching entries items');
+    }
 };
 
 const closeForm = () => {

src/components/FilterTravelForm.vue

@@ -86,6 +86,7 @@ const tableColumns = computed(() => [
 ]);
 
 const onSubmit = async () => {
+    try {
         let filter = travelFilter;
         const params = travelFilterParams;
         const where = {};
@@ -108,6 +109,9 @@ const onSubmit = async () => {
             params: { filter: JSON.stringify(filter) },
         });
         tableRows.value = data;
+    } catch (err) {
+        console.error('Error fetching travels');
+    }
 };
 
 const closeForm = () => {

src/components/FormPopup.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['onSubmit']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',
@@ -25,21 +25,16 @@ const $props = defineProps({
         type: String,
         default: '',
     },
-    submitOnEnter: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const { t } = useI18n();
+
 const closeButton = ref(null);
 const isLoading = ref(false);
 
 const onSubmit = () => {
-    if ($props.submitOnEnter) {
     emit('onSubmit');
     closeForm();
-    }
 };
 
 const closeForm = () => {

src/components/ItemsFilterPanel.vue

@@ -88,6 +88,7 @@ const applyTags = (params, search) => {
 };
 
 const fetchItemTypes = async (id) => {
+    try {
         const filter = {
             fields: ['id', 'name', 'categoryFk'],
             where: { categoryFk: id },
@@ -98,6 +99,9 @@ const fetchItemTypes = async (id) => {
             params: { filter: JSON.stringify(filter) },
         });
         itemTypesOptions.value = data;
+    } catch (err) {
+        console.error('Error fetching item types', err);
+    }
 };
 
 const getCategoryClass = (category, params) => {
@@ -107,6 +111,7 @@ const getCategoryClass = (category, params) => {
 };
 
 const getSelectedTagValues = async (tag) => {
+    try {
         if (!tag?.selectedTag?.id) return;
         tag.value = null;
         const filter = {
@@ -120,6 +125,9 @@ const getSelectedTagValues = async (tag) => {
             params,
         });
         tag.valueOptions = data;
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
 };
 
 const removeTag = (index, params, search) => {

src/components/RefundInvoiceForm.vue

@@ -39,10 +39,14 @@ const refund = async () => {
         invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,
     };
 
+    try {
         const { data } = await axios.post('InvoiceOuts/refundAndInvoice', params);
         notify(t('Refunded invoice'), 'positive');
         const [id] = data?.refundId || [];
         if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
+    } catch (err) {
+        console.error('Error refunding invoice', err);
+    }
 };
 </script>
 

src/components/TransferInvoiceForm.vue

@@ -49,6 +49,7 @@ const makeInvoice = async () => {
         makeInvoice: checked.value,
     };
 
+    try {
         if (checked.value && hasToInvoiceByAddress) {
             const response = await new Promise((resolve) => {
                 quasar
@@ -75,6 +76,9 @@ const makeInvoice = async () => {
         notify(t('Transferred invoice'), 'positive');
         const id = data?.[0];
         if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
+    } catch (err) {
+        console.error('Error transfering invoice', err);
+    }
 };
 </script>
 

src/components/VnSelectProvince.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch } from 'vue';
+import { ref } from 'vue';
 import { useValidator } from 'src/composables/useValidator';
 import { useI18n } from 'vue-i18n';
 
@@ -17,23 +17,20 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
 });
 const provinceFk = defineModel({ type: Number, default: null });
 
 const { validate } = useValidator();
 const { t } = useI18n();
-const filter = ref({
+
-    include: { relation: 'country' },
-    where: {
-        countryFk: $props.countryFk,
-    },
-});
 const provincesOptions = ref($props.provinces);
-const provincesFetchDataRef = ref();
 provinceFk.value = $props.provinceSelected;
-if (!$props.countryFk) {
+const provincesFetchDataRef = ref();
-    filter.value.where = {};
+
-}
 async function onProvinceCreated(_, data) {
     await provincesFetchDataRef.value.fetch({ where: { countryFk: $props.countryFk } });
     provinceFk.value = data.id;
@@ -42,29 +39,23 @@ async function onProvinceCreated(_, data) {
 async function handleProvinces(data) {
     provincesOptions.value = data;
 }
-
-watch(
-    () => $props.countryFk,
-    async () => {
-        if ($props.countryFk) {
-            filter.value.where.countryFk = $props.countryFk;
-        } else filter.value.where = {};
-        await provincesFetchDataRef.value.fetch({});
-    }
-);
 </script>
 
 <template>
     <FetchData
         ref="provincesFetchDataRef"
-        :filter="filter"
+        :filter="{
+            include: { relation: 'country' },
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
         @on-fetch="handleProvinces"
         url="Provinces"
-        auto-load
     />
     <VnSelectDialog
         :label="t('Province')"
-        :options="provincesOptions"
+        :options="$props.provinces"
         :tooltip="t('Create province')"
         hide-selected
         v-model="provinceFk"

src/components/common/TableVisibleColumns.vue

@@ -58,6 +58,7 @@ const getConfig = async (url, filter) => {
 };
 
 const fetchViewConfigData = async () => {
+    try {
         const userConfigFilter = {
             where: { tableCode: $props.tableCode, userFk: user.value.id },
         };
@@ -82,9 +83,13 @@ const fetchViewConfigData = async () => {
             $props.allColumns.forEach((col) => (defaultColumns[col] = true));
             setUserConfigViewData(defaultColumns);
         }
+    } catch (err) {
+        console.error('Error fetching config view data', err);
+    }
 };
 
 const saveConfig = async () => {
+    try {
         const params = {};
         const configuration = {};
 
@@ -123,6 +128,9 @@ const saveConfig = async () => {
         emitSavedConfig();
         notify('globals.dataSaved', 'positive');
         popupProxyRef.value.hide();
+    } catch (err) {
+        console.error('Error saving user view config', err);
+    }
 };
 
 const emitSavedConfig = () => {

src/components/ui/VnFilterPanel.vue

@@ -74,9 +74,6 @@ const arrayData = useArrayData($props.dataKey, {
 const route = useRoute();
 const store = arrayData.store;
 const userParams = ref({});
-
-defineExpose({ search, sanitizer, params: userParams });
-
 onMounted(() => {
     userParams.value = $props.modelValue ?? {};
     emit('init', { params: userParams.value });
@@ -200,7 +197,7 @@ const customTags = computed(() =>
 
 async function remove(key) {
     userParams.value[key] = undefined;
-    await search();
+    search();
     emit('remove', key);
     emit('update:modelValue', userParams.value);
 }
@@ -226,6 +223,8 @@ function sanitizer(params) {
     }
     return params;
 }
+
+defineExpose({ search, sanitizer, userParams });
 </script>
 
 <template>

src/components/ui/VnPaginate.vue

@@ -132,24 +132,10 @@ const addFilter = async (filter, params) => {
 
 async function fetch(params) {
     useArrayData(props.dataKey, params);
-    arrayData.reset(['filter.skip', 'skip', 'page']);
+    arrayData.reset(['filter.skip', 'skip']);
     await arrayData.fetch({ append: false });
-    return emitStoreData();
-}
-
-async function update(params) {
-    useArrayData(props.dataKey, params);
-    const { limit, skip } = store;
-    store.limit = limit + skip;
-    store.skip = 0;
-    await arrayData.fetch({ append: false });
-    store.limit = limit;
-    store.skip = skip;
-    return emitStoreData();
-}
-
-function emitStoreData() {
     if (!store.hasMoreData) isLoading.value = false;
+
     emit('onFetch', store.data);
     return store.data;
 }
@@ -195,7 +181,7 @@ async function onLoad(index, done) {
     done(isDone);
 }
 
-defineExpose({ fetch, update, addFilter, paginate });
+defineExpose({ fetch, addFilter, paginate });
 </script>
 
 <template>

src/composables/downloadFile.js

@@ -1,24 +1,11 @@
 import { useSession } from 'src/composables/useSession';
 import { getUrl } from './getUrl';
-import axios from 'axios';
-import { exportFile } from 'quasar';
 
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
-    const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
+    let appUrl = await getUrl('', 'lilium');
-    const response = await axios.get(
+    appUrl = appUrl.replace('/#/', '');
-        url ?? `${appUrl}/${model}/${id}${urlPath}?access_token=${token}`,
+    window.open(url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`);
-        { responseType: 'blob' }
-    );
-
-    const contentDisposition = response.headers['content-disposition'];
-    const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
-    const filename =
-        matches != null && matches[1]
-            ? matches[1].replace(/['"]/g, '')
-            : 'downloaded-file';
-
-    exportFile(filename, response.data);
 }

src/composables/useArrayData.js

@@ -87,7 +87,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         const params = { filter };
 
         Object.assign(params, userParams);
-        if (params.filter) params.filter.skip = store.skip;
+        params.filter.skip = store.skip;
         if (store?.order && typeof store?.order == 'string') store.order = [store.order];
         if (store.order?.length) params.filter.order = [...store.order];
         else delete params.filter.order;

src/i18n/locale/en.yml

@@ -769,7 +769,6 @@ travel:
         hb: HB
     basicData:
         daysInForward: Days in forward
-        isRaid: Raid
     thermographs:
         temperature: Temperature
         destination: Destination

src/i18n/locale/es.yml

@@ -763,7 +763,6 @@ travel:
         hb: HB
     basicData:
         daysInForward: Días redada
-        isRaid: Redada
     thermographs:
         temperature: Temperatura
         destination: Destino

src/pages/Account/AccountAccounts.vue

@@ -11,13 +11,21 @@ const { t } = useI18n();
 const { notify } = useNotify();
 
 const onSynchronizeAll = async () => {
+    try {
         notify(t('Synchronizing in the background'), 'positive');
         await axios.patch(`Accounts/syncAll`);
+    } catch (error) {
+        console.error('Error synchronizing all accounts', error);
+    }
 };
 
 const onSynchronizeRoles = async () => {
+    try {
         await axios.patch(`RoleInherits/sync`);
         notify(t('Roles synchronized!'), 'positive');
+    } catch (error) {
+        console.error('Error synchronizing roles', error);
+    }
 };
 </script>
 

src/pages/Account/AccountAcls.vue

@@ -111,6 +111,7 @@ const columns = computed(() => [
     },
 ]);
 const deleteAcl = async ({ id }) => {
+    try {
         await new Promise((resolve) => {
             quasar
                 .dialog({
@@ -130,6 +131,9 @@ const deleteAcl = async ({ id }) => {
         await axios.delete(`ACLs/${id}`);
         tableRef.value.reload();
         notify('ACL removed', 'positive');
+    } catch (error) {
+        console.error('Error deleting Acl: ', error);
+    }
 };
 </script>
 

src/pages/Account/AccountConnections.vue

@@ -34,9 +34,13 @@ const refresh = () => paginateRef.value.fetch();
 const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
 
 const killSession = async ({ userId, created }) => {
+    try {
         await axios.post(`${urlPath}/killSession`, { userId, created });
         paginateRef.value.fetch();
         notify(t('Session killed'), 'positive');
+    } catch (error) {
+        console.error('Error killing session', error);
+    }
 };
 </script>
 

src/pages/Account/AccountLdap.vue

@@ -40,8 +40,12 @@ const formUrlCreate = ref(null);
 const formUrlUpdate = ref(null);
 const formCustomFn = ref(null);
 const onTestConection = async () => {
+    try {
         await axios.get(`LdapConfigs/test`);
         notify(t('LDAP connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
 };
 const getInitialLdapConfig = async () => {
     try {
@@ -68,10 +72,14 @@ const getInitialLdapConfig = async () => {
     }
 };
 const deleteMailForward = async () => {
+    try {
         await axios.delete(URL_UPDATE);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
 };
 
 onMounted(async () => await getInitialLdapConfig());

src/pages/Account/AccountSamba.vue

@@ -46,8 +46,12 @@ const formUrlUpdate = ref(null);
 const formCustomFn = ref(null);
 
 const onTestConection = async () => {
+    try {
         await axios.get(`SambaConfigs/test`);
         notify(t('Samba connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
 };
 
 const getInitialSambaConfig = async () => {
@@ -75,10 +79,14 @@ const getInitialSambaConfig = async () => {
 };
 
 const deleteMailForward = async () => {
+    try {
         await axios.delete(URL_UPDATE);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
 };
 
 onMounted(async () => await getInitialSambaConfig());

src/pages/Account/Alias/Card/AliasDescriptor.vue

@@ -44,9 +44,13 @@ const removeAlias = () => {
             cancel: true,
         })
         .onOk(async () => {
+            try {
                 await axios.delete(`MailAliases/${entityId.value}`);
                 notify(t('Alias removed'), 'positive');
                 router.push({ name: 'AccountAlias' });
+            } catch (err) {
+                console.error('Error removing alias');
+            }
         });
 };
 </script>

src/pages/Account/Card/AccountMailForwarding.vue

@@ -41,22 +41,35 @@ const fetchAccountExistence = async () => {
 };
 
 const fetchMailForwards = async () => {
+    try {
         const response = await axios.get(`MailForwards/${route.params.id}`);
         return response.data;
+    } catch (err) {
+        console.error('Error fetching mail forwards', err);
+        return null;
+    }
 };
 
 const deleteMailForward = async () => {
+    try {
         await axios.delete(`MailForwards/${route.params.id}`);
         formData.value.forwardTo = null;
         initialData.value.forwardTo = null;
         initialData.value.hasData = hasData.value;
         notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
 };
 
 const updateMailForward = async () => {
+    try {
         await axios.patch('MailForwards', formData.value);
         initialData.value = { ...formData.value };
         initialData.value.hasData = hasData.value;
+    } catch (err) {
+        console.error('Error creating mail forward', err);
+    }
 };
 
 const onSubmit = async () => {

src/pages/Account/Role/Card/RoleDescriptor.vue

@@ -32,8 +32,12 @@ const filter = {
     where: { id: entityId },
 };
 const removeRole = async () => {
+    try {
         await axios.delete(`VnRoles/${entityId.value}`);
         notify(t('Role removed'), 'positive');
+    } catch (error) {
+        console.error('Error deleting role', error);
+    }
 };
 </script>
 

src/pages/Claim/ClaimList.vue

@@ -95,7 +95,6 @@ const columns = computed(() => [
                 optionLabel: 'description',
             },
         },
-        orderBy: 'priority',
     },
     {
         align: 'right',

src/pages/Customer/Card/CustomerAddress.vue

@@ -167,7 +167,7 @@ const toCustomerAddressEdit = (addressId) => {
                         <div>{{ item.street }}</div>
                         <div>
                             {{ item.postalCode }} - {{ item.city }},
-                            {{ item.province?.name }}
+                            {{ item.province.name }}
                         </div>
                         <div>
                             {{ item.phone }}

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -106,6 +106,7 @@ const setParams = (params) => {
 };
 
 const getPreview = async () => {
+    try {
         const params = {
             recipientId: entityId,
         };
@@ -124,6 +125,9 @@ const getPreview = async () => {
                 htmlContent: data,
             },
         });
+    } catch (err) {
+        notify('Errors getting preview', 'negative');
+    }
 };
 
 const onSubmit = async () => {

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -42,9 +42,13 @@ const setData = (entity) => {
 };
 
 const removeDepartment = async () => {
+    try {
         await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
         router.push({ name: 'WorkerDepartment' });
         notify('department.departmentRemoved', 'positive');
+    } catch (err) {
+        console.error('Error removing department');
+    }
 };
 
 const { openConfirmationModal } = useVnConfirm();

src/pages/Entry/Card/EntryBuys.vue

@@ -236,9 +236,13 @@ const copyOriginalRowsData = (rows) => {
 };
 
 const saveChange = async (field, { rowIndex, row }) => {
+    try {
         if (originalRowDataCopy.value[rowIndex][field] == row[field]) return;
         await axios.patch(`Buys/${row.id}`, row);
         originalRowDataCopy.value[rowIndex][field] = row[field];
+    } catch (err) {
+        console.error('Error saving changes', err);
+    }
 };
 
 const openRemoveDialog = async () => {
@@ -256,11 +260,15 @@ const openRemoveDialog = async () => {
             },
         })
         .onOk(async () => {
+            try {
                 await deleteBuys();
                 const notifyMessage = t(
                     `Buy${rowsSelected.value.length > 1 ? 's' : ''} deleted`
                 );
                 notify(notifyMessage, 'positive');
+            } catch (err) {
+                console.error('Error deleting buys');
+            }
         });
 };
 
@@ -274,6 +282,7 @@ const importBuys = () => {
 };
 
 const toggleGroupingMode = async (buy, mode) => {
+    try {
         const groupingMode = mode === 'grouping' ? mode : 'packing';
         const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode;
         const params = {
@@ -281,6 +290,9 @@ const toggleGroupingMode = async (buy, mode) => {
         };
         await axios.patch(`Buys/${buy.id}`, params);
         buy.groupingMode = newGroupingMode;
+    } catch (err) {
+        console.error('Error toggling grouping mode');
+    }
 };
 
 const lockIconType = (groupingMode, mode) => {

src/pages/Entry/Card/EntryBuysImport.vue

@@ -123,15 +123,20 @@ const fillData = async (rawData) => {
 };
 
 const fetchBuys = async (buys) => {
+    try {
         const params = { buys };
         const { data } = await axios.post(
             `Entries/${route.params.id}/importBuysPreview`,
             params
         );
         importData.value.buys = data;
+    } catch (err) {
+        console.error('Error fetching buys');
+    }
 };
 
 const onSubmit = async () => {
+    try {
         const params = importData.value;
         const hasAnyEmptyRow = params.buys.some((buy) => {
             return buy.itemFk === null;
@@ -145,6 +150,9 @@ const onSubmit = async () => {
         await axios.post(`Entries/${route.params.id}/importBuys`, params);
         notify('globals.dataSaved', 'positive');
         redirectToBuysView();
+    } catch (err) {
+        console.error('Error importing buys', err);
+    }
 };
 
 const redirectToBuysView = () => {

src/pages/Entry/Card/EntrySummary.vue

@@ -147,9 +147,12 @@ async function setEntryData(data) {
 }
 
 const fetchEntryBuys = async () => {
+    try {
         const { data } = await axios.get(`Entries/${entry.value.id}/getBuys`);
         if (data) entryBuys.value = data;
-
+    } catch (err) {
+        console.error('Error fetching entry buys');
+    }
 };
 </script>
 

src/pages/Entry/EntryList.vue

@@ -221,7 +221,7 @@ onMounted(async () => {
                         t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
                     }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
+                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: row.daysInForward })

src/pages/Entry/EntryWasteRecalc.vue

@@ -30,6 +30,8 @@ const recalc = async () => {
         isLoading.value = true;
         await axios.post('Applications/waste_addSales/execute-proc', params);
         notify('wasteRecalc.recalcOk', 'positive');
+    } catch (err) {
+        console.error(err);
     } finally {
         isLoading.value = false;
     }

src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue

@@ -61,6 +61,7 @@ const showSendInvoiceDialog = (type) => {
 };
 
 const sendEmailInvoice = async ({ address }) => {
+    try {
         if (!address) notify(`The email can't be empty`, 'negative');
 
         if (invoiceFormType.value === 'pdf') {
@@ -69,10 +70,16 @@ const sendEmailInvoice = async ({ address }) => {
                 recipient: address,
             });
         } else {
-        return sendEmail(`InvoiceOuts/${$props.invoiceOutData.ref}/invoice-csv-email`, {
+            return sendEmail(
+                `InvoiceOuts/${$props.invoiceOutData.ref}/invoice-csv-email`,
+                {
                     recipientId: $props.invoiceOutData.client.id,
                     recipient: address,
-        });
+                }
+            );
+        }
+    } catch (err) {
+        console.error('Error sending email', err);
     }
 };
 
@@ -81,21 +88,34 @@ const redirectToInvoiceOutList = () => {
 };
 
 const deleteInvoice = async () => {
+    try {
         await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/delete`);
         notify(t('InvoiceOut deleted'), 'positive');
+    } catch (err) {
+        console.error('Error deleting invoice out', err);
+    }
 };
 
 const bookInvoice = async () => {
+    try {
         await axios.post(`InvoiceOuts/${$props.invoiceOutData.ref}/book`);
         notify(t('InvoiceOut booked'), 'positive');
+    } catch (err) {
+        console.error('Error booking invoice out', err);
+    }
 };
 
 const generateInvoicePdf = async () => {
+    try {
         await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/createPdf`);
         notify(t('The invoice PDF document has been regenerated'), 'positive');
+    } catch (err) {
+        console.error('Error generating invoice out pdf', err);
+    }
 };
 
 const refundInvoice = async (withWarehouse) => {
+    try {
         const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse };
         const { data } = await axios.post('InvoiceOuts/refund', params);
         location.href = window.origin + `/#/ticket/${data[0].id}/sale`;
@@ -105,6 +125,9 @@ const refundInvoice = async (withWarehouse) => {
             }),
             'positive'
         );
+    } catch (err) {
+        console.error('Error generating invoice out pdf', err);
+    }
 };
 
 const showTransferInvoiceForm = async () => {

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -135,10 +135,15 @@ onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
 function openPdf(id) {
+    try {
         openReport(`${MODEL}/${id}/download`);
+    } catch (err) {
+        console.error('Error opening PDF', err);
+    }
 }
 
 function downloadPdf() {
+    try {
         if (selectedRows.value.size === 0) return;
         const selectedCardsArray = Array.from(selectedRows.value.values());
 
@@ -157,7 +162,9 @@ function downloadPdf() {
 
             openReport(`${MODEL}/downloadZip`, params);
         }
-
+    } catch (err) {
+        console.error('Error opening PDF');
+    }
 }
 
 watchEffect(selectedRows);

src/pages/Item/Card/ItemShelving.vue

@@ -45,9 +45,13 @@ const arrayData = useArrayData('ItemShelvings', {
 const rows = computed(() => arrayData.store.data || []);
 
 const applyColumnFilter = async (col) => {
+    try {
         const paramKey = col.columnFilter?.filterParamKey || col.field;
         params[paramKey] = col.columnFilter.filterValue;
         await arrayData.addFilter({ filter: null, params });
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
 };
 
 const getInputEvents = (col) => {
@@ -169,11 +173,15 @@ const totalLabels = computed(() =>
 );
 
 const removeLines = async () => {
+    try {
         const itemShelvingIds = rowsSelected.value.map((row) => row.itemShelvingFk);
         await axios.post('ItemShelvings/deleteItemShelvings', { itemShelvingIds });
         rowsSelected.value = [];
         notify('shelvings.shelvingsRemoved', 'positive');
         await arrayData.fetch({ append: false });
+    } catch (err) {
+        console.error('Error removing lines', err);
+    }
 };
 onMounted(async () => {
     await arrayData.fetch({ append: false });

src/pages/Item/Card/ItemTags.vue

@@ -19,6 +19,7 @@ const tagOptions = ref([]);
 const valueOptionsMap = ref(new Map());
 
 const getSelectedTagValues = async (tag) => {
+    try {
         if (!tag.tagFk && tag.tag.isFree) return;
         const filter = {
             fields: ['value'],
@@ -31,6 +32,9 @@ const getSelectedTagValues = async (tag) => {
             params,
         });
         valueOptionsMap.value.set(tag.tagFk, data);
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
 };
 
 const onItemTagsFetched = async (itemTags) => {

src/pages/Item/Card/ItemTax.vue

@@ -32,6 +32,7 @@ const ItemTaxRef = ref(null);
 const taxesOptions = ref([]);
 
 const submitTaxes = async (data) => {
+    try {
         let payload = data.map((tax) => ({
             id: tax.id,
             taxClassFk: tax.taxClassFk,
@@ -39,6 +40,9 @@ const submitTaxes = async (data) => {
 
         await axios.post(`Items/updateTaxes`, payload);
         notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error saving taxes', err);
+    }
 };
 </script>
 <template>

src/pages/Item/ItemFixedPrice.vue

@@ -221,16 +221,24 @@ const updateMinPrice = async (value, props) => {
 };
 
 const upsertPrice = async (props, resetMinPrice = false) => {
+    try {
         const { row } = props;
         if (tableRef.value.CrudModelRef.getChanges().updates.length > 0) {
             if (resetMinPrice) row.hasMinPrice = 0;
             await upsertFixedPrice(row);
         }
+    } catch (err) {
+        console.error('Error editing price', err);
+    }
 };
 
 async function upsertFixedPrice(row) {
+    try {
         const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
         return data;
+    } catch (err) {
+        console.error('Error editing price', err);
+    }
 }
 
 async function saveOnRowChange(row) {
@@ -313,10 +321,14 @@ const onEditCellDataSaved = async () => {
 };
 
 const removeFuturePrice = async () => {
+    try {
         rowsSelected.value.forEach(({ id }) => {
             const rowIndex = fixedPrices.value.findIndex(({ id }) => id === id);
             removePrice(id, rowIndex);
         });
+    } catch (err) {
+        console.error('Error removing price', err);
+    }
 };
 
 function confirmRemove(item, isFuture) {
@@ -333,9 +345,13 @@ function confirmRemove(item, isFuture) {
 }
 
 const removePrice = async (id) => {
+    try {
         await axios.delete(`FixedPrices/${id}`);
         notify(t('globals.dataSaved'), 'positive');
         tableRef.value.reload({});
+    } catch (err) {
+        console.error('Error removing price', err);
+    }
 };
 const dateStyle = (date) =>
     date

src/pages/Item/ItemListFilter.vue

@@ -55,6 +55,7 @@ const onCategoryChange = async (categoryFk, search) => {
 };
 
 const getSelectedTagValues = async (tag) => {
+    try {
         if (!tag?.selectedTag?.id) return;
         tag.value = null;
         const filter = {
@@ -67,6 +68,9 @@ const getSelectedTagValues = async (tag) => {
             params,
         });
         tag.valueOptions = data;
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
 };
 
 const applyTags = (params, search) => {

src/pages/Item/ItemRequest.vue

@@ -173,6 +173,7 @@ const getBadgeColor = (date) => {
 };
 
 const changeQuantity = async (request) => {
+    try {
         if (request.saleFk) {
             const params = {
                 quantity: request.saleQuantity,
@@ -182,9 +183,13 @@ const changeQuantity = async (request) => {
             notify(t('globals.dataSaved'), 'positive');
             confirmRequest(request);
         } else confirmRequest(request);
+    } catch (error) {
+        console.error('Error changing quantity:: ', error);
+    }
 };
 
 const confirmRequest = async (request) => {
+    try {
         if (request.itemFk && request.saleQuantity) {
             const params = {
                 itemFk: request.itemFk,
@@ -192,11 +197,17 @@ const confirmRequest = async (request) => {
                 attenderFk: request.attenderFk,
             };
 
-        const { data } = await axios.post(`TicketRequests/${request.id}/confirm`, params);
+            const { data } = await axios.post(
+                `TicketRequests/${request.id}/confirm`,
+                params
+            );
             request.itemDescription = data.concept;
             request.isOk = true;
             notify(t('globals.dataSaved'), 'positive');
         }
+    } catch (error) {
+        console.error('Error confirming request:: ', error);
+    }
 };
 
 const getState = (isOk) => {

src/pages/Monitor/MonitorOrders.vue

@@ -103,11 +103,15 @@ const getBadgeColor = (date) => {
 };
 
 const removeOrders = async () => {
+    try {
         const selectedIds = selectedRows.value.map((row) => row.id);
         const params = { deletes: selectedIds };
         await axios.post('SalesMonitors/deleteOrders', params);
         selectedRows.value = [];
         await table.value.reload();
+    } catch (err) {
+        console.error('Error deleting orders', err);
+    }
 };
 
 const openTab = (id) =>

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -350,7 +350,7 @@ const openTab = (id) =>
                 class="q-mr-sm"
                 dense
                 flat
-                @click="tableRef.CrudModelRef.vnPaginateRef.update()"
+                @click="$refs.tableRef.reload()"
             >
                 <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
             </QBtn>

src/pages/Order/Card/OrderBasicData.vue

@@ -22,6 +22,7 @@ const agencyList = ref([]);
 const addressList = ref([]);
 
 const fetchAddressList = async (addressId) => {
+    try {
         const { data } = await axios.get('addresses', {
             params: {
                 filter: JSON.stringify({
@@ -34,12 +35,17 @@ const fetchAddressList = async (addressId) => {
         if (addressList.value?.length === 1) {
             state.get(ORDER_MODEL).addressFk = addressList.value[0].id;
         }
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
 };
 
 const fetchAgencyList = async (landed, addressFk) => {
     if (!landed || !addressFk) {
         return;
     }
+    try {
         const { data } = await axios.get('Agencies/landsThatDay', {
             params: {
                 addressFk,
@@ -47,6 +53,10 @@ const fetchAgencyList = async (landed, addressFk) => {
             },
         });
         agencyList.value = data;
+    } catch (err) {
+        console.error(`Error fetching agencies`, err);
+        return err.response;
+    }
 };
 
 const fetchOrderDetails = (order) => {
@@ -82,8 +92,12 @@ const orderFilter = {
 };
 
 const onClientChange = async (clientId) => {
+    try {
         const { data } = await axios.get(`Clients/${clientId}`);
         await fetchAddressList(data.defaultAddressFk);
+    } catch (error) {
+        console.error('Error al cambiar el cliente:', error);
+    }
 };
 </script>
 

src/pages/Order/Card/OrderCatalog.vue

@@ -1,13 +1,14 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onMounted, onUnmounted, ref, computed, watch } from 'vue';
+import { onBeforeMount, onMounted, onUnmounted, ref, computed, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CatalogItem from 'src/components/ui/CatalogItem.vue';
 import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import getParamWhere from 'src/filters/getParamWhere';
 import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
@@ -17,6 +18,7 @@ const { t } = useI18n();
 const dataKey = 'OrderCatalogList';
 const arrayData = useArrayData(dataKey);
 const store = arrayData.store;
+const showFilter = ref(null);
 const tags = ref([]);
 
 let catalogParams = {
@@ -24,6 +26,27 @@ let catalogParams = {
     orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
 };
 
+onBeforeMount(() => {
+    const whereParams = getParamWhere(route);
+    if (whereParams) {
+        const formattedWhereParams = {};
+        if (whereParams.and) {
+            whereParams.and.forEach((item) => {
+                Object.assign(formattedWhereParams, item);
+            });
+        } else {
+            Object.assign(formattedWhereParams, whereParams);
+        }
+
+        catalogParams = {
+            ...catalogParams,
+            ...formattedWhereParams,
+        };
+    } else {
+        showFilter.value = true;
+    }
+});
+
 onMounted(() => {
     stateStore.rightDrawer = true;
     checkOrderConfirmation();
@@ -67,7 +90,7 @@ function extractValueTags(items) {
     );
     tagValue.value = resultValueTags;
 }
-const autoLoad = computed(() => !!JSON.parse(route?.query.table ?? '{}')?.categoryFk);
+const autoLoad = computed(() => !!catalogParams.categoryFk);
 
 watch(
     () => store.data,
@@ -89,7 +112,7 @@ watch(
         :info="t('You can search items by name or id')"
     />
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+        <QScrollArea v-if="showFilter" class="fit text-grey-8">
             <OrderCatalogFilter
                 :data-key="dataKey"
                 :tag-value="tagValue"
@@ -105,6 +128,8 @@ watch(
                 url="Orders/CatalogFilter"
                 :limit="50"
                 :user-params="catalogParams"
+                @on-fetch="showFilter = true"
+                :update-router="false"
                 :auto-load="autoLoad"
             >
                 <template #body="{ rows }">

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
@@ -8,6 +8,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import getParamWhere from 'src/filters/getParamWhere';
 import CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
 import { useArrayData } from 'composables/useArrayData';
 
@@ -31,8 +32,11 @@ const route = useRoute();
 
 const arrayData = useArrayData(props.dataKey);
 
+const currentParams = ref({});
 const categoryList = ref(null);
+const selectedCategoryFk = ref(null);
 const typeList = ref([]);
+const selectedTypeFk = ref(null);
 const searchByTag = ref(null);
 
 const vnFilterPanelRef = ref();
@@ -49,32 +53,50 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
+onMounted(() => {
+    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
+    selectedTypeFk.value = getParamWhere(route, 'typeFk');
+});
+
 const resetCategory = (params, search) => {
+    selectedCategoryFk.value = null;
     typeList.value = null;
     params.categoryFk = null;
     params.typeFk = null;
     arrayData.store.userFilter = null;
-    search();
+    removeTagGroupParam(search);
 };
 
-const selectCategory = async (params, category, search) => {
+const selectCategory = (params, category, search) => {
-    if (vnFilterPanelRef.value.params.categoryFk === category?.id) {
+    if (params.categoryFk === category?.id) {
         resetCategory(params, search);
         return;
     }
+    selectedCategoryFk.value = category?.id;
+    params.categoryFk = category?.id;
     params.typeFk = null;
-    params.categoryFk = category.id;
+    selectedTypeFk.value = null;
-    await loadTypes(category?.id);
+    loadTypes(category?.id);
-    await search();
+    search();
 };
 
-const loadTypes = async (id) => {
+const loadTypes = async (categoryFk = selectedCategoryFk.value) => {
     const { data } = await axios.get(`Orders/${route.params.id}/getItemTypeAvailable`, {
-        params: { itemCategoryId: id },
+        params: { itemCategoryId: categoryFk },
     });
     typeList.value = data;
 };
 
+const selectedCategory = computed(() => {
+    return (categoryList.value || []).find(
+        (category) => category?.id === selectedCategoryFk.value
+    );
+});
+
+const selectedType = computed(() => {
+    return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
+});
+
 function exprBuilder(param, value) {
     switch (param) {
         case 'categoryFk':
@@ -100,21 +122,21 @@ const applyTags = (tagInfo, params, search) => {
 
 async function onSearchByTag(value) {
     if (!value.target.value) return;
-    if (!vnFilterPanelRef.value.params?.tagGroups) {
+    if (!currentParams.value?.tagGroups) {
-        vnFilterPanelRef.value.params.tagGroups = [];
+        currentParams.value.tagGroups = [];
     }
 
-    vnFilterPanelRef.value.params.tagGroups.push({
+    currentParams.value.tagGroups.push({
         values: [{ value: value.target.value }],
     });
     searchByTag.value = null;
 }
 
-const removeTagGroupParam = (params, search, valIndex) => {
+const removeTagGroupParam = (search, valIndex) => {
     if (!valIndex && valIndex !== 0) {
-        params.tagGroups = null;
+        currentParams.value.tagGroups = null;
     } else {
-        params.tagGroups.splice(valIndex, 1);
+        currentParams.value.tagGroups.splice(valIndex, 1);
     }
 };
 
@@ -126,8 +148,7 @@ const setCategoryList = (data) => {
             icon: `vn:${(category.icon || '').split('-')[1]}`,
         }));
 
-    vnFilterPanelRef.value.params.categoryFk &&
+    selectedCategoryFk.value && loadTypes();
-        loadTypes(vnFilterPanelRef.value.params.categoryFk);
 };
 
 const getCategoryClass = (category, params) => {
@@ -136,6 +157,12 @@ const getCategoryClass = (category, params) => {
     }
 };
 
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
+};
+
 function addOrder(value, field, params) {
     let { orderBy } = params;
     orderBy = JSON.parse(orderBy);
@@ -143,6 +170,11 @@ function addOrder(value, field, params) {
     params.orderBy = JSON.stringify(orderBy);
     vnFilterPanelRef.value.search();
 }
+
+onMounted(() => {
+    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
+    selectedTypeFk.value = getParamWhere(route, 'typeFk');
+});
 </script>
 
 <template>
@@ -150,22 +182,24 @@ function addOrder(value, field, params) {
     <VnFilterPanel
         ref="vnFilterPanelRef"
         :data-key="props.dataKey"
-        :hidden-tags="['filter', 'orderFk', 'orderBy']"
+        :hidden-tags="['orderFk', 'orderBy']"
-        :unremovable-params="['orderFk', 'orderBy']"
+        :un-removable-params="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
+        @remove="clearFilter"
+        v-model="currentParams"
     >
         <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'typeFk' && typeList">
+            <strong v-if="tag.label === 'typeFk'">
-                {{ t(typeList.find((t) => t.id == tag.value)?.name || '') }}
+                {{ t(selectedType?.name || '') }}
             </strong>
             <div v-else class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #customTags="{ params, tags: customTags, searchFn }">
+        <template #customTags="{ tags: customTags, params, searchFn }">
             <template v-for="customTag in customTags" :key="customTag.label">
                 <VnFilterPanelChip
                     v-for="(tag, valIndex) in Array.isArray(customTag.value)
@@ -176,16 +210,11 @@ function addOrder(value, field, params) {
                     @remove="
                         customTag.label === 'categoryFk'
                             ? resetCategory(params, searchFn)
-                            : removeTagGroupParam(params, searchFn, valIndex)
+                            : removeTagGroupParam(searchFn, valIndex)
                     "
                 >
-                    <strong v-if="customTag.label === 'categoryFk' && categoryList">
+                    <strong v-if="customTag.label === 'categoryFk'">
-                        {{
+                        {{ t(selectedCategory?.name || '') }}
-                            t(
-                                categoryList.find((c) => c.id == customTag.value)?.name ||
-                                    ''
-                            )
-                        }}
                     </strong>
                     <strong v-if="tag?.tagSelection?.name" class="q-mr-xs">
                         {{ tag.tagSelection.name }}:
@@ -232,8 +261,13 @@ function addOrder(value, field, params) {
                         emit-value
                         use-input
                         sort-by="name ASC"
-                        :disable="!params.categoryFk"
+                        :disable="!selectedCategoryFk"
-                        @update:model-value="searchFn()"
+                        @update:model-value="
+                            (value) => {
+                                selectedTypeFk = value;
+                                searchFn();
+                            }
+                        "
                     >
                         <template #option="{ itemProps, opt }">
                             <QItem v-bind="itemProps">
@@ -303,7 +337,7 @@ function addOrder(value, field, params) {
                                 style="display: inline-block"
                                 :tags="tags"
                                 @apply-tags="
-                                    ($event) => applyTags($event, params, searchFn)
+                                    ($event) => applyTags($event, currentParams, searchFn)
                                 "
                             />
                         </QPopupProxy>

src/pages/Order/Card/OrderCreateDialog.vue

@@ -20,6 +20,7 @@ const addressList = ref([]);
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
 const fetchAddressList = async (addressId) => {
+    try {
         const { data } = await axios.get('addresses', {
             params: {
                 filter: JSON.stringify({
@@ -32,12 +33,17 @@ const fetchAddressList = async (addressId) => {
         if (addressList.value?.length === 1) {
             state.get(ORDER_MODEL).addressId = addressList.value[0].id;
         }
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
 };
 
 const fetchAgencyList = async (landed, addressFk) => {
     if (!landed || !addressFk) {
         return;
     }
+    try {
         const { data } = await axios.get('Agencies/landsThatDay', {
             params: {
                 addressFk,
@@ -45,6 +51,10 @@ const fetchAgencyList = async (landed, addressFk) => {
             },
         });
         agencyList.value = data;
+    } catch (err) {
+        console.error(`Error fetching agencies`, err);
+        return err.response;
+    }
 };
 
 const $props = defineProps({
@@ -60,8 +70,12 @@ const initialFormState = reactive({
 });
 
 const onClientChange = async (clientId = $props.clientFk) => {
+    try {
         const { data } = await axios.get(`Clients/${clientId}`);
         await fetchAddressList(data.defaultAddressFk);
+    } catch (error) {
+        console.error('Error al cambiar el cliente:', error);
+    }
 };
 
 async function onDataSaved(_, id) {

src/pages/Supplier/Card/SupplierAccounts.vue

@@ -47,6 +47,7 @@ const onChangesSaved = () => {
 };
 
 const setWireTransfer = async () => {
+    try {
         const params = {
             id: route.params.id,
             payMethodFk: wireTransferFk.value,
@@ -54,6 +55,9 @@ const setWireTransfer = async () => {
 
         await axios.patch(`Suppliers/${route.params.id}`, params);
         notify('globals.dataSaved', 'positive');
+    } catch (err) {
+        console.error('Error setting wire transfer', err);
+    }
 };
 </script>
 <template>

src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue

@@ -33,7 +33,6 @@ const canEditZone = useAcl().hasAny([
 const agencyFetchRef = ref();
 const warehousesOptions = ref([]);
 const companiesOptions = ref([]);
-const currenciesOptions = ref([]);
 const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);

src/pages/Ticket/Card/TicketNotes.vue

@@ -49,7 +49,13 @@ async function handleSave() {
 
 <template>
     <FetchData
-        @on-fetch="(data) => (observationTypes = data)"
+        @on-fetch="
+            (data) =>
+                (observationTypes = data.map((type) => {
+                    type.label = t(`ticketNotes.observationTypes.${type.description}`);
+                    return type;
+                }))
+        "
         auto-load
         url="ObservationTypes"
     />
@@ -76,7 +82,7 @@ async function handleSave() {
                             :label="t('ticketNotes.observationType')"
                             :options="observationTypes"
                             hide-selected
-                            option-label="description"
+                            option-label="label"
                             option-value="id"
                             v-model="row.observationTypeFk"
                             :disable="!!row.id"

src/pages/Ticket/Card/TicketPurchaseRequest.vue

@@ -172,9 +172,13 @@ const getRequestState = (state) => {
 const isEditable = (isOk) => isOk !== null;
 
 async function removeLine(id) {
+    try {
         await axios.delete(`TicketRequests/${id}`);
         notify(t('globals.dataSaved'), 'positive');
         location.reload();
+    } catch (err) {
+        console.error('Error ', err);
+    }
 }
 
 onMounted(() => (stateStore.rightDrawer = false));

src/pages/Ticket/Card/TicketSale.vue

@@ -156,11 +156,15 @@ const columns = computed(() => [
 ]);
 
 const getConfig = async () => {
+    try {
         let filter = {
             fields: ['daysForWarningClaim'],
         };
         const { data } = await axios.get(`TicketConfigs`, { filter });
         ticketConfig.value = data;
+    } catch (err) {
+        console.error('Error getting ticket config', err);
+    }
 };
 
 const onSalesFetched = (salesData) => {
@@ -183,12 +187,17 @@ const resetChanges = async () => {
 };
 
 const updateQuantity = async (sale) => {
+    try {
         const payload = { quantity: sale.quantity };
         await axios.post(`Sales/${sale.id}/updateQuantity`, payload);
         notify('globals.dataSaved', 'positive');
+    } catch (err) {
+        console.error('Error updating quantity', err);
+    }
 };
 
 const addSale = async (sale) => {
+    try {
         const payload = {
             barcode: sale.itemFk,
             quantity: sale.quantity,
@@ -210,6 +219,9 @@ const addSale = async (sale) => {
 
         notify('globals.dataSaved', 'positive');
         window.location.reload();
+    } catch (err) {
+        console.error('Error adding sale', err);
+    }
 };
 
 const changeQuantity = async (sale) => {
@@ -228,9 +240,13 @@ const changeQuantity = async (sale) => {
 const updateConcept = async (sale) => {
     canProceed.value = await isSalePrepared(sale);
     if (!canProceed.value) return;
+    try {
         const data = { newConcept: sale.concept };
         await axios.post(`Sales/${sale.id}/updateConcept`, data);
         notify('globals.dataSaved', 'positive');
+    } catch (err) {
+        console.error('Error updating concept', err);
+    }
 };
 
 const DEFAULT_EDIT = {
@@ -286,6 +302,7 @@ const onOpenEditDiscountPopover = async (sale) => {
 const updatePrice = async (sale) => {
     canProceed.value = await isSalePrepared(sale);
     if (!canProceed.value) return;
+    try {
         const newPrice = edit.value.price;
         if (newPrice != null && newPrice != sale.price) {
             await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
@@ -293,8 +310,10 @@ const updatePrice = async (sale) => {
             edit.value = { ...DEFAULT_EDIT };
             notify('globals.dataSaved', 'positive');
         }
-
         await getMana();
+    } catch (err) {
+        console.error('Error updating price', err);
+    }
 };
 
 const changeDiscount = async (sale) => {
@@ -341,11 +360,15 @@ const getNewPrice = computed(() => {
 });
 
 const newOrderFromTicket = async () => {
+    try {
         const { data } = await axios.post(`Orders/newFromTicket`, {
             ticketFk: Number(route.params.id),
         });
         const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
         window.open(routeData.href, '_blank');
+    } catch (err) {
+        console.error('Error creating new order', err);
+    }
 };
 
 const goToLog = (saleId) => {
@@ -360,11 +383,15 @@ const goToLog = (saleId) => {
 };
 
 const changeTicketState = async (val) => {
+    try {
         stateBtnDropdownRef.value.hide();
         const params = { ticketFk: route.params.id, code: val };
         await axios.post('Tickets/state', params);
         notify('globals.dataSaved', 'positive');
         await resetChanges();
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 };
 
 const removeSelectedSales = () => {
@@ -375,22 +402,29 @@ const removeSelectedSales = () => {
 };
 
 const removeSales = async () => {
+    try {
         const params = {
             sales: selectedRows.value.filter((sale) => sale.id),
             ticketId: store.data.id,
         };
         selectedRows.value
             .filter((sale) => !sale.id)
-        .forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
+            .forEach((sale) =>
+                tableRef.value.CrudModelRef.formData.splice(sale.$index, 1)
+            );
 
         if (params.sales.length == 0) return;
         await axios.post('Sales/deleteSales', params);
         removeSelectedSales();
         notify('globals.dataSaved', 'positive');
         window.location.reload();
+    } catch (err) {
+        console.error('Error deleting sales', err);
+    }
 };
 
 const setTransferParams = async () => {
+    try {
         selectedSales.value = selectedValidSales.value;
         const checkedSales = JSON.parse(JSON.stringify(selectedSales.value));
         transfer.value = {
@@ -399,10 +433,16 @@ const setTransferParams = async () => {
         };
 
         const params = { ticketId: store.data.id };
-    const { data } = await axios.get(`clients/${store.data.clientFk}/lastActiveTickets`, {
+        const { data } = await axios.get(
+            `clients/${store.data.clientFk}/lastActiveTickets`,
+            {
                 params,
-    });
+            }
+        );
         transfer.value.lastActiveTickets = data;
+    } catch (err) {
+        console.error('Error setting transfer params', err);
+    }
 };
 
 onMounted(async () => {

src/pages/Ticket/Card/TicketSaleMoreActions.vue

@@ -140,9 +140,13 @@ const createClaim = () => {
 };
 
 const onCreateClaimAccepted = async () => {
+    try {
         const params = { ticketId: ticket.value.id, sales: props.sales };
         const { data } = await axios.post(`Claims/createFromSales`, params);
         push({ name: 'ClaimBasicData', params: { id: data.id } });
+    } catch (error) {
+        console.error('Error creating claim: ', error);
+    }
 };
 
 const setReserved = async (reserved) => {

src/pages/Ticket/Card/TicketSummary.vue

@@ -69,6 +69,7 @@ function isEditable() {
 }
 
 async function changeState(value) {
+    try {
         stateBtnDropdownRef.value?.hide();
         const formData = {
             ticketFk: entityId.value,
@@ -78,6 +79,9 @@ async function changeState(value) {
         notify('globals.dataSaved', 'positive');
         summaryRef.value?.fetch();
         descriptorData.fetch({});
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 }
 
 function toTicketUrl(section) {
@@ -276,8 +280,13 @@ function toTicketUrl(section) {
                         "
                     >
                         <span class="label" style="margin-right: 4px">
-                            ({{ item.observationType.description }}):
+                            ({{
+                                t(
+                                    `ticketNotes.observationTypes.${item.observationType.description}`
+                                )
+                            }}):
                         </span>
+
                         <span>{{ item.description }}</span>
                     </QItem>
                 </QVirtualScroll>

src/pages/Ticket/TicketCreate.vue

@@ -37,6 +37,7 @@ onBeforeMount(async () => {
 });
 
 const fetchClient = async (formData) => {
+    try {
         const filter = {
             include: {
                 relation: 'defaultAddress',
@@ -50,9 +51,13 @@ const fetchClient = async (formData) => {
         const { data } = await axios.get('Clients', { params });
         const [client] = data;
         selectedClient.value = client;
+    } catch (err) {
+        console.error('Error fetching client');
+    }
 };
 
 const fetchAddresses = async (formData) => {
+    try {
         if (!formData.clientId) return;
 
         const filter = {
@@ -68,6 +73,10 @@ const fetchAddresses = async (formData) => {
 
         const { defaultAddress } = selectedClient.value;
         formData.addressId = defaultAddress.id;
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
 };
 
 const onClientSelected = async (formData) => {

src/pages/Ticket/TicketCreateDialog.vue

@@ -37,6 +37,7 @@ onBeforeMount(async () => {
 });
 
 const fetchClient = async (formData) => {
+    try {
         const filter = {
             include: {
                 relation: 'defaultAddress',
@@ -50,9 +51,13 @@ const fetchClient = async (formData) => {
         const { data } = await axios.get('Clients', { params });
         const [client] = data;
         selectedClient.value = client;
+    } catch (err) {
+        console.error('Error fetching client');
+    }
 };
 
 const fetchAddresses = async (formData) => {
+    try {
         if (!formData.clientId) return;
 
         const filter = {
@@ -68,6 +73,10 @@ const fetchAddresses = async (formData) => {
 
         const { defaultAddress } = selectedClient.value;
         formData.addressId = defaultAddress.id;
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
 };
 
 const onClientSelected = async (formData) => {

src/pages/Ticket/TicketFuture.vue

@@ -68,9 +68,13 @@ const params = reactive({
 });
 
 const applyColumnFilter = async (col) => {
+    try {
         const paramKey = col.columnFilter?.filterParamKey || col.field;
         params[paramKey] = col.columnFilter.filterValue;
         await arrayData.addFilter({ params });
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
 };
 
 const getInputEvents = (col) => {
@@ -244,6 +248,7 @@ const totalPriceColor = (totalWithVat) =>
     isLessThan50(totalWithVat) ? 'warning' : 'transparent';
 
 const moveTicketsFuture = async () => {
+    try {
         const ticketsToMove = selectedTickets.value.map((ticket) => ({
             originId: ticket.id,
             destinationId: ticket.futureId,
@@ -257,6 +262,9 @@ const moveTicketsFuture = async () => {
         notify(t('advanceTickets.moveTicketSuccess'), 'positive');
         selectedTickets.value = [];
         arrayData.fetch({ append: false });
+    } catch (error) {
+        console.error('Error moving tickets to future', error);
+    }
 };
 onMounted(async () => {
     await arrayData.fetch({ append: false });

src/pages/Ticket/TicketList.vue

@@ -254,6 +254,7 @@ const fetchAvailableAgencies = async (formData) => {
 };
 
 const fetchClient = async (formData) => {
+    try {
         const filter = {
             include: {
                 relation: 'defaultAddress',
@@ -267,9 +268,13 @@ const fetchClient = async (formData) => {
         const { data } = await axios.get('Clients', { params });
         const [client] = data;
         selectedClient.value = client;
+    } catch (err) {
+        console.error('Error fetching client');
+    }
 };
 
 const fetchAddresses = async (formData) => {
+    try {
         if (!formData.clientId) return;
 
         const filter = {
@@ -282,12 +287,13 @@ const fetchAddresses = async (formData) => {
         });
         addressesOptions.value = data;
 
-    addressesOptions.value = data;
-
         const { defaultAddress } = selectedClient.value;
         formData.addressId = defaultAddress.id;
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
 };
-
 const getColor = (row) => {
     if (row.alertLevelCode === 'OK') return 'bg-success';
     else if (row.alertLevelCode === 'FREE') return 'bg-notice';

src/pages/Ticket/TicketWeekly.vue

@@ -153,16 +153,24 @@ const columns = computed(() => [
 ]);
 
 const deleteWeekly = async (ticketFk) => {
+    try {
         await axios.delete(`TicketWeeklies/${ticketFk}`);
         notify(t('globals.dataSaved'), 'positive');
         const ticketIndex = store.data.findIndex((e) => e.ticketFk == ticketFk);
         store.data.splice(ticketIndex, 1);
         location.reload();
+    } catch (err) {
+        console.error('Error deleting weekly', err);
+    }
 };
 
 const onUpdate = async (ticketFk, field, value) => {
+    try {
         const params = { ticketFk, [field]: value };
         await axios.patch('TicketWeeklies', params);
+    } catch (err) {
+        console.error('Error updating weekly', err);
+    }
 };
 
 onMounted(async () => {

src/pages/Ticket/locale/en.yml

@@ -10,6 +10,16 @@ ticketNotes:
     observationType: Observation type
     removeNote: Remove note
     addNote: Add note
+    observationTypes:
+        ItemPicker: Item picker
+        Packager: Packager
+        Delivery: Delivery
+        SalesPerson: Sales person
+        Administrative: Administrative
+        Weight: Weight
+        InvoiceOut: Invoice Out
+        DropOff: Drop Off
+        Sustitución: Sustitution
 ticketSale:
     visible: Visible
     available: Available

src/pages/Ticket/locale/es.yml

@@ -19,6 +19,18 @@ ticketNotes:
     observationType: Tipo de observación
     removeNote: Quitar nota
     addNote: Añadir nota
+    observationTypes:
+        ItemPicker: Sacador
+        Packager: Encajador
+        Delivery: Envío
+        SalesPerson: Comercial
+        Administrative: Administrativa
+        Weight: Peso
+        InvoiceOut: Facturas
+        DropOff: Despacho
+        Sustitución: Sustitución
+        Accepted: Aceptado
+        Denied: Denegado
 purchaseRequest:
     requester: Solicitante
     atender: Comprador

src/pages/Travel/Card/TravelBasicData.vue

@@ -21,7 +21,12 @@ const agenciesOptions = ref([]);
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
-    <FormModel :url-update="`Travels/${route.params.id}`" model="Travel" auto-load>
+    <FormModel
+        :url="`Travels/${route.params.id}`"
+        :url-update="`Travels/${route.params.id}`"
+        model="Travel"
+        auto-load
+    >
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.ref" :label="t('globals.reference')" />
@@ -73,7 +78,6 @@ const agenciesOptions = ref([]);
                 </VnInput>
             </VnRow>
             <VnRow>
-                <QCheckbox v-model="data.isRaid" :label="t('travel.basicData.isRaid')" />
                 <QCheckbox
                     :label="t('travel.summary.delivered')"
                     v-model="data.isDelivered"
@@ -89,7 +93,7 @@ const agenciesOptions = ref([]);
 
 <i18n>
 es:
-    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si se deja vacio, la fecha no cambiará
+    raidDays: Al rellenarlo, generamos una redada. Indica los días que un travel se moverá automáticamente en el tiempo
 en:
-    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If left empty, the date will stay the same.
+    raidDays: When filling, a raid is generated. Enter the number of days the travel will automatically forward in time
 </i18n>

src/pages/Travel/Card/TravelCard.vue

@@ -1,7 +1,34 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import TravelDescriptor from './TravelDescriptor.vue';
-import filter from './TravelFilter.js';
+
+const filter = {
+    fields: [
+        'id',
+        'ref',
+        'shipped',
+        'landed',
+        'totalEntries',
+        'warehouseInFk',
+        'warehouseOutFk',
+        'cargoSupplierFk',
+        'agencyModeFk',
+    ],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['name'],
+            },
+        },
+        {
+            relation: 'warehouseOut',
+            scope: {
+                fields: ['name'],
+            },
+        },
+    ],
+};
 </script>
 <template>
     <VnCard

src/pages/Travel/Card/TravelDescriptor.vue

@@ -7,7 +7,6 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
-import filter from './TravelFilter.js';
 
 import { toDate } from 'src/filters';
 
@@ -22,6 +21,35 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 
+const filter = {
+    fields: [
+        'id',
+        'ref',
+        'shipped',
+        'landed',
+        'totalEntries',
+        'warehouseInFk',
+        'warehouseOutFk',
+        'cargoSupplierFk',
+        'agencyModeFk',
+        'daysInForward',
+    ],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['name'],
+            },
+        },
+        {
+            relation: 'warehouseOut',
+            scope: {
+                fields: ['name'],
+            },
+        },
+    ],
+};
+
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -37,7 +65,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         :title="data.title"
         :subtitle="data.subtitle"
         :filter="filter"
-        data-key="Travel"
+        data-key="travelData"
         @on-fetch="setData"
     >
         <template #menu="{ entity }">
@@ -52,7 +80,12 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         </template>
         <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-md">
-                <QIcon v-if="entity.isRaid" name="vn:net" color="primary" size="xs">
+                <QIcon
+                    v-if="entity.daysInForward"
+                    name="vn:net"
+                    color="primary"
+                    size="xs"
+                >
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: entity.daysInForward })

src/pages/Travel/Card/TravelDescriptorMenuItems.vue

@@ -32,12 +32,16 @@ const cloneTravel = () => {
 };
 
 const cloneTravelWithEntries = async () => {
+    try {
         const { data } = await axios.post(`Travels/${$props.travel.id}/cloneWithEntries`);
         notify('globals.dataSaved', 'positive');
         router.push({ name: 'TravelBasicData', params: { id: data.id } });
+    } catch (err) {
+        console.error('Error cloning travel with entries');
+    }
 };
 
-const canDelete = computed(() => useAcl().hasAny('Travel', '*', 'WRITE'));
+const canDelete = computed(() => useAcl().hasAny('Travel','*','WRITE'));
 
 const openDeleteEntryDialog = (id) => {
     quasar
@@ -54,9 +58,13 @@ const openDeleteEntryDialog = (id) => {
 };
 
 const deleteTravel = async (id) => {
+    try {
         await axios.delete(`Travels/${id}`);
         router.push({ name: 'TravelList' });
         notify('globals.dataDeleted', 'positive');
+    } catch (err) {
+        console.error('Error deleting travel');
+    }
 };
 </script>
 

src/pages/Travel/Card/TravelFilter.js

@@ -1,29 +0,0 @@
-export default {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-        'isRaid',
-        'daysInForward',
-    ],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};

src/pages/Travel/Card/TravelSummary.vue

@@ -193,11 +193,16 @@ const entriesTotalM3 = computed(() =>
 );
 
 const getTravelEntries = async (id) => {
+    try {
         const { data } = await axios.get(`Travels/${id}/getEntries`);
         entries.value = data;
+    } catch (err) {
+        console.error('Error fetching travel entries');
+    }
 };
 
 const getTravelThermographs = async (id) => {
+    try {
         const filter = {
             include: {
                 relation: 'warehouse',
@@ -212,14 +217,21 @@ const getTravelThermographs = async (id) => {
             params: { filter: JSON.parse(JSON.stringify(filter)) },
         });
         thermographs.value = data;
+    } catch (err) {
+        console.error('Error fetching travel thermographs');
+    }
 };
 
 async function setTravelData(travelData) {
+    try {
         if (travelData) {
             travel.value = travelData;
             await getTravelEntries(travel.value.id);
             await getTravelThermographs(travel.value.id);
         }
+    } catch (err) {
+        console.error(`Error setting travel data`, err);
+    }
 }
 
 const getLink = (param) => `#/travel/${entityId.value}/${param}`;
@@ -256,11 +268,6 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.warehouseOut')"
                     :value="travel.warehouseOut?.name"
                 />
-                <QCheckbox
-                    :label="t('travel.basicData.isRaid')"
-                    v-model="travel.isRaid"
-                    :disable="true"
-                />
                 <QCheckbox
                     :label="t('travel.summary.delivered')"
                     v-model="travel.isDelivered"
@@ -279,10 +286,6 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.warehouseIn')"
                     :value="travel.warehouseIn?.name"
                 />
-                <VnLv
-                    :label="t('travel.basicData.daysInForward')"
-                    :value="travel?.daysInForward"
-                />
                 <QCheckbox
                     :label="t('travel.summary.received')"
                     v-model="travel.isReceived"
@@ -300,6 +303,10 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <VnLv :label="t('globals.reference')" :value="travel.ref" />
                 <VnLv label="m³" :value="travel.m3" />
                 <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
+                <VnLv
+                    :label="t('travel.basicData.daysInForward')"
+                    :value="travel?.daysInForward"
+                />
             </QCard>
             <QCard class="full-width">
                 <VnTitle :text="t('travel.summary.entries')" />

src/pages/Travel/Card/TravelThermographs.vue

@@ -122,9 +122,13 @@ const redirectToThermographForm = (action, id) => {
 };
 
 const removeThermograph = async (id) => {
+    try {
         await axios.delete(`Travels/deleteThermograph?id=${id}`);
         await thermographPaginateRef.value.fetch();
         notify(t('Thermograph removed'), 'positive');
+    } catch (err) {
+        console.error('Error removing termograph');
+    }
 };
 </script>
 

src/pages/Travel/Card/TravelThermographsForm.vue

@@ -56,6 +56,7 @@ onBeforeMount(async () => {
 });
 
 const fetchDmsTypes = async () => {
+    try {
         const params = {
             filter: {
                 where: { code: 'thermograph' },
@@ -63,6 +64,9 @@ const fetchDmsTypes = async () => {
         };
         const { data } = await axios.get('DmsTypes/findOne', { params });
         return data;
+    } catch (err) {
+        console.error('Error fetching Dms Types');
+    }
 };
 
 const setCreateDefaultParams = async () => {

src/pages/Travel/ExtraCommunity.vue

@@ -293,6 +293,7 @@ const openReportPdf = () => {
 };
 
 const saveFieldValue = async (val, field, index) => {
+    try {
         // Evitar la solicitud de guardado si el valor no ha cambiado
         if (originalRowDataCopy.value[index][field] == val) return;
 
@@ -303,6 +304,9 @@ const saveFieldValue = async (val, field, index) => {
         originalRowDataCopy.value[index][field] = val;
 
         await arrayData.fetch({ append: false });
+    } catch (err) {
+        console.error('Error updating travel');
+    }
 };
 
 const stopEventPropagation = (event, col) => {

src/pages/Travel/TravelList.vue

@@ -227,12 +227,10 @@ const columns = computed(() => [
     >
         <template #column-status="{ row }">
             <div class="row">
-                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
+                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
                     <QTooltip>
                         {{
-                            t('globals.raid', {
+                            t('globals.raid', { daysInForward: row.daysInForward })
-                                daysInForward: row.daysInForward,
-                            })
                         }}</QTooltip
                     >
                 </QIcon>

src/pages/Wagon/Type/WagonTypeEdit.vue

@@ -19,10 +19,16 @@ const createTrayFormDialogRef = ref();
 const selectedEntityId = ref();
 
 async function loadTrays() {
+    try {
         const res = await axios.get('WagonTypeTrays');
-    const filteredTrays = res.data.filter((tray) => tray.wagonTypeFk === entityId.value);
+        const filteredTrays = res.data.filter(
+            (tray) => tray.wagonTypeFk === entityId.value
+        );
         wagonTrays.value = filteredTrays;
         return;
+    } catch (err) {
+        console.error('Error loading trays:', err);
+    }
 }
 
 async function addTray(newTray) {

src/pages/Worker/Card/WorkerCalendarItem.vue

@@ -60,18 +60,26 @@ const updateSelectedDate = (year) => {
 };
 
 const createEvent = async (date) => {
+    try {
         const params = {
             dated: date,
             absenceTypeId: props.absenceType.id,
             businessFk: props.businessFk,
         };
 
-    const { data } = await axios.post(`Workers/${route.params.id}/createAbsence`, params);
+        const { data } = await axios.post(
+            `Workers/${route.params.id}/createAbsence`,
+            params
+        );
 
         if (data) emit('refresh');
+    } catch (error) {
+        console.error('error creating event:: ', error);
+    }
 };
 
 const editEvent = async (event) => {
+    try {
         const absenceType = props.absenceType;
         const params = {
             absenceId: event.absenceId,
@@ -83,6 +91,9 @@ const editEvent = async (event) => {
         );
 
         if (data) emit('refresh');
+    } catch (error) {
+        console.error('error editing event:: ', error);
+    }
 };
 
 const deleteEvent = async (event, date) => {

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -39,9 +39,15 @@ const entityId = computed(() => {
 const workerExcluded = ref(false);
 
 const getIsExcluded = async () => {
-    const { data } = await axios.get(`WorkerDisableExcludeds/${entityId.value}/exists`);
+    try {
+        const { data } = await axios.get(
+            `WorkerDisableExcludeds/${entityId.value}/exists`
+        );
         if (!data) return;
         workerExcluded.value = data.exists;
+    } catch (err) {
+        console.error('Error getting worker excluded: ', err);
+    }
 };
 
 const handleExcluded = async () => {

src/pages/Worker/Card/WorkerPda.vue

@@ -32,11 +32,14 @@ const initialData = computed(() => {
 });
 
 const deallocatePDA = async (deviceProductionFk) => {
+    try {
         await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
             pda: deviceProductionFk,
         });
         notify(t('PDA deallocated'), 'positive');
-
+    } catch (err) {
+        console.error('Error deallocating PDA');
+    }
     paginate.value.fetch();
 };
 

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -251,9 +251,13 @@ const addEvents = (data) => {
 };
 
 const fetchHours = async () => {
+    try {
         await workerHoursRef.value.fetch();
         await getWorkedHours(startOfWeek.value, endOfWeek.value);
         await getAbsences();
+    } catch (err) {
+        console.error('Error fetching worker hours');
+    }
 };
 
 const fetchWeekData = async () => {
@@ -261,6 +265,7 @@ const fetchWeekData = async () => {
         year: selectedDate.value.getFullYear(),
         week: selectedWeekNumber.value,
     };
+    try {
         const mail = (
             await axiosNoError.get(`Workers/${route.params.id}/mail`, {
                 params: { filter: { where } },
@@ -276,6 +281,9 @@ const fetchWeekData = async () => {
         canResend.value = !!(
             await axiosNoError.get('WorkerTimeControlMails/count', { params: { where } })
         ).data.count;
+    } catch (err) {
+        console.error('Error fetching week data');
+    }
 };
 
 const setHours = (data) => {
@@ -349,6 +357,7 @@ const showReasonForm = () => {
 };
 
 const updateWorkerTimeControlMail = async (state, reason) => {
+    try {
         const params = {
             year: selectedDate.value.getFullYear(),
             week: selectedWeekNumber.value,
@@ -362,6 +371,9 @@ const updateWorkerTimeControlMail = async (state, reason) => {
         await getMailStates(selectedDate.value);
         await fetchWeekData();
         notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error updating worker time control mail');
+    }
 };
 
 const isSatisfied = async () => {
@@ -377,6 +389,7 @@ const isUnsatisfied = async (reason) => {
 };
 
 const resendEmail = async () => {
+    try {
         const params = {
             recipient: worker.value?.user?.email,
             week: selectedWeekNumber.value,
@@ -387,6 +400,9 @@ const resendEmail = async () => {
         await axios.post('WorkerTimeControls/weekly-hour-record-email', params);
         await getMailStates(selectedDate.value);
         notify(t('Email sended'), 'positive');
+    } catch (err) {
+        console.error('Error sending email');
+    }
 };
 
 onBeforeMount(() => {

src/pages/Worker/Card/WorkerTimeHourChip.vue

@@ -50,11 +50,17 @@ const directionIconName = computed(() => {
 });
 
 const deleteHourEntry = async () => {
-    const { data } = await axios.post(`WorkerTimeControls/${$props.id}/deleteTimeEntry`);
+    try {
+        const { data } = await axios.post(
+            `WorkerTimeControls/${$props.id}/deleteTimeEntry`
+        );
 
         if (!data) return;
         emit('onHourEntryDeleted');
         notify('Entry removed', 'positive');
+    } catch (err) {
+        console.error('Error deleting hour entry');
+    }
 };
 
 const showWorkerTimeForm = () => emit('showWorkerTimeForm');

src/pages/Worker/WorkerDepartmentTree.vue

@@ -33,6 +33,7 @@ const onNodeExpanded = (nodeKeysArray) => {
 };
 
 const fetchNodeLeaves = async (nodeKey) => {
+    try {
         const node = treeRef.value?.getNodeByKey(nodeKey);
 
         if (!node || node.sons === 0) return;
@@ -50,6 +51,10 @@ const fetchNodeLeaves = async (nodeKey) => {
         }
 
         state.set('Tree', node);
+    } catch (err) {
+        console.error('Error fetching department leaves', err);
+        throw new Error();
+    }
 };
 
 const removeNode = (node) => {
@@ -67,11 +72,15 @@ const removeNode = (node) => {
 };
 
 async function remove(id) {
+    try {
         await axios.post(`/Departments/${id}/removeChild`, { id });
         quasar.notify({
             message: t('department.departmentRemoved'),
             type: 'positive',
         });
+    } catch (err) {
+        console.error('Error removing department');
+    }
 }
 
 const showCreateNodeForm = (nodeId) => {

src/pages/Zone/Card/ZoneEventExclusionForm.vue

@@ -43,7 +43,7 @@ const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 
 const isNew = computed(() => props.isNewMode);
-const dated = ref(props.date);
+const dated = ref(null);
 const tickedNodes = ref();
 
 const _excludeType = ref('all');
@@ -57,6 +57,7 @@ const excludeType = computed({
 const arrayData = useArrayData('ZoneEvents');
 
 const exclusionGeoCreate = async () => {
+    try {
         const params = {
             zoneFk: parseInt(route.params.id),
             date: dated.value,
@@ -64,16 +65,26 @@ const exclusionGeoCreate = async () => {
         };
         await axios.post('Zones/exclusionGeo', params);
         await refetchEvents();
+    } catch (err) {
+        console.error('Error creating exclusion geo: ', err);
+    }
 };
 
 const exclusionCreate = async () => {
+    try {
         if (isNew.value)
-        await axios.post(`Zones/${route.params.id}/exclusions`, [{ dated: dated.value }]);
+            await axios.post(`Zones/${route.params.id}/exclusions`, [
+                { dated: dated.value },
+            ]);
         else
             await axios.post(`Zones/${route.params.id}/exclusions`, {
                 dated: dated.value,
             });
+
         await refetchEvents();
+    } catch (err) {
+        console.error('Error creating exclusion: ', err);
+    }
 };
 
 const onSubmit = async () => {
@@ -82,9 +93,13 @@ const onSubmit = async () => {
 };
 
 const deleteEvent = async () => {
+    try {
         if (!props.event) return;
         await axios.delete(`Zones/${route.params.id}/exclusions`);
         await refetchEvents();
+    } catch (err) {
+        console.error('Error deleting event: ', err);
+    }
 };
 
 const closeForm = () => emit('closeForm');
@@ -114,14 +129,13 @@ onMounted(() => {
         @on-submit="onSubmit()"
         :default-cancel-button="false"
         :default-submit-button="false"
-        :submit-on-enter="false"
     >
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-lg">
                 <VnInputDate
                     :label="t('eventsInclusionForm.day')"
                     v-model="dated"
-                    :required="true"
+                    :model-value="props.date"
                 />
             </VnRow>
             <div class="column q-gutter-y-sm q-mb-md">
@@ -182,7 +196,6 @@ onMounted(() => {
                 :label="isNew ? t('globals.add') : t('globals.save')"
                 type="submit"
                 color="primary"
-                @click="onSubmit()"
             />
         </template>
     </FormPopup>

src/pages/Zone/Card/ZoneEventInclusionForm.vue

@@ -57,6 +57,7 @@ const inclusionType = computed({
 const arrayData = useArrayData('ZoneEvents');
 
 const createEvent = async () => {
+    try {
         eventInclusionFormData.value.weekDays = weekdayStore.toSet(
             eventInclusionFormData.value.wdays
         );
@@ -70,7 +71,10 @@ const createEvent = async () => {
         }
 
         if (isNew.value)
-        await axios.post(`Zones/${route.params.id}/events`, eventInclusionFormData.value);
+            await axios.post(
+                `Zones/${route.params.id}/events`,
+                eventInclusionFormData.value
+            );
         else
             await axios.put(
                 `Zones/${route.params.id}/events/${props.event?.id}`,
@@ -79,12 +83,19 @@ const createEvent = async () => {
 
         await refetchEvents();
         emit('onSubmit');
+    } catch (err) {
+        console.error('Error creating event', err);
+    }
 };
 
 const deleteEvent = async () => {
+    try {
         if (!props.event) return;
         await axios.delete(`Zones/${route.params.id}/events/${props.event?.id}`);
         await refetchEvents();
+    } catch (err) {
+        console.error('Error deleting event: ', err);
+    }
 };
 
 const closeForm = () => {

src/pages/Zone/Card/ZoneEventsPanel.vue

@@ -57,11 +57,15 @@ const arrayData = useArrayData('ZoneEvents', {
 });
 
 const fetchData = async () => {
+    try {
         if (!params.value.zoneFk || !params.value.started || !params.value.ended) return;
 
         await arrayData.applyFilter({
             params: params.value,
         });
+    } catch (err) {
+        console.error('Error fetching events: ', err);
+    }
 };
 
 watch(
@@ -83,9 +87,13 @@ const formatWdays = (event) => {
 };
 
 const deleteEvent = async (id) => {
+    try {
         if (!id) return;
         await axios.delete(`Zones/${route.params.id}/events/${id}`);
         await fetchData();
+    } catch (err) {
+        console.error('Error deleting event: ', err);
+    }
 };
 
 const openInclusionForm = (event) => {

src/pages/Zone/Card/ZoneLocations.vue

@@ -10,9 +10,13 @@ const { t } = useI18n();
 const route = useRoute();
 
 const onSelected = async (val, node) => {
+    try {
         if (val === null) val = undefined;
         const params = { geoId: node.id, isIncluded: val };
         await axios.post(`Zones/${route.params.id}/toggleIsIncluded`, params);
+    } catch (err) {
+        console.error('Error updating included', err);
+    }
 };
 </script>
 

src/pages/Zone/Card/ZoneLocationsTree.vue

@@ -38,7 +38,6 @@ const datakey = 'ZoneLocations';
 const url = computed(() => `Zones/${route.params.id}/getLeaves`);
 const arrayData = useArrayData(datakey, {
     url: url.value,
-    limit: null,
 });
 const store = arrayData.store;
 
@@ -75,7 +74,6 @@ const onNodeExpanded = async (nodeKeysArray) => {
         if (response.data) {
             node.childs = response.data.map((n) => {
                 if (n.sons > 0) n.childs = [{}];
-                n.selected = isSelected(n.selected);
                 return n;
             });
         }
@@ -92,16 +90,21 @@ const onNodeExpanded = async (nodeKeysArray) => {
     previousExpandedNodes.value = nodeKeysSet;
 };
 
+const formatNodeSelected = (node) => {
+    if (node.selected === 1) node.selected = true;
+    else if (node.selected === 0) node.selected = false;
+
+    if (node.sons > 0 && !node.childs) node.childs = [{}];
+};
+
 const fetchNodeLeaves = async (nodeKey) => {
     if (!treeRef.value) return;
     const node = treeRef.value?.getNodeByKey(nodeKey);
-    if (typeof node.selected === 'number') node.selected = !!node.selected;
+    if (node.selected === 1) node.selected = true;
-    if (node.sons > 0 && !node.childs) {
+    else if (node.selected === 0) node.selected = false;
-        node.childs = [{}];
-        const index = expanded.value.indexOf(node.id);
-        expanded.value.splice(index, 1);
-    }
     if (!node || node.sons === 0) return;
+
+    state.set('Tree', node);
 };
 
 function getNodeIds(node) {
@@ -116,10 +119,6 @@ function getNodeIds(node) {
     return ids;
 }
 
-function isSelected(selected) {
-    if (typeof selected === 'number') return !!selected;
-}
-
 watch(
     () => store.data,
     async (val) => {
@@ -129,21 +128,32 @@ watch(
         nodes.value[0].childs = [...val];
         const fetchedNodeKeys = val.flatMap(getNodeIds);
         state.set('Tree', [...fetchedNodeKeys]);
-        expanded.value = [null, ...fetchedNodeKeys];
+
+        if (!store.userParams?.search) {
+            val.forEach((n) => {
+                formatNodeSelected(n);
+            });
+            store.data = null;
+            expanded.value = [null];
+        } else {
             for (let n of state.get('Tree')) {
                 await fetchNodeLeaves(n);
             }
+            expanded.value = [null, ...fetchedNodeKeys];
+        }
         previousExpandedNodes.value = new Set(expanded.value);
     },
     { immediate: true }
 );
 
 const reFetch = async () => {
-    await arrayData.fetch({});
+    const { data } = await arrayData.fetch({ append: false });
+    nodes.value = data;
+    expanded.value = [null];
 };
 
 onMounted(async () => {
-    await reFetch();
+    if (store.userParams?.search) await arrayData.fetch({});
 });
 
 onUnmounted(() => {
@@ -157,13 +167,13 @@ onUnmounted(() => {
         v-if="showSearchBar"
         v-model="store.userParams.search"
         :placeholder="$t('globals.search')"
-        @keydown.enter.stop.prevent="reFetch"
+        @update:model-value="reFetch()"
     >
         <template #prepend>
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
         </template>
     </VnInput>
-    <VnSearchbar v-if="!showSearchBar" :data-key="datakey" :url="url" :redirect="false" />
+    <VnSearchbar :data-key="datakey" :url="url" :redirect="false" />
     <QTree
         ref="treeRef"
         :nodes="nodes"

src/pages/Zone/ZoneDeliveryPanel.vue

@@ -21,6 +21,7 @@ const arrayData = useArrayData('ZoneDeliveryDays', {
 
 const deliveryMethodsConfig = { pickUp: ['PICKUP'], delivery: ['AGENCY', 'DELIVERY'] };
 const fetchData = async (params) => {
+    try {
         const { data } = params
             ? await arrayData.applyFilter({
                   params,
@@ -28,6 +29,9 @@ const fetchData = async (params) => {
             : await arrayData.fetch({ append: false });
         if (!data.events || !data.events.length)
             notify(t('deliveryPanel.noEventsWarning'), 'warning');
+    } catch (err) {
+        console.error('Error fetching events: ', err);
+    }
 };
 
 const onSubmit = async () => {

test/cypress/integration/vnComponent/vnLocation.spec.js

@@ -99,7 +99,7 @@ describe('VnLocation', () => {
         });
 
         it('Create postCode', () => {
-            const postCode = Math.floor(100000 + Math.random() * 900000);
+            const postCode = '1234475';
             const province = 'Valencia';
             cy.get(createLocationButton).click();
             cy.get('.q-card > h1').should('have.text', 'New postcode');
@@ -115,68 +115,20 @@ describe('VnLocation', () => {
 
             checkVnLocation(postCode, province);
         });
-
+        it('Create city', () => {
-        it('Create city without country', () => {
+            const postCode = '9011';
-            const cityName = 'Saskatchew'.concat(Math.random(1 * 100));
+            const province = 'Saskatchew';
             cy.get(createLocationButton).click();
+            cy.get(dialogInputs).eq(0).type(postCode);
             cy.get(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
             ).click();
             cy.selectOption('#q-portal--dialog--3 .q-select', 'one');
-            cy.get('#q-portal--dialog--3 .q-input').type(cityName);
+            cy.get('#q-portal--dialog--3 .q-input').type(province);
             cy.get('#q-portal--dialog--3 .q-btn--standard').click();
-        });
+            cy.get('#q-portal--dialog--1 .q-btn--standard').click();
-
+            cy.waitForElement('.q-form');
-        it('Create province without country', () => {
+            checkVnLocation(postCode, province);
-            const provinceName = 'Saskatchew'.concat(Math.random(1 * 100));
-            cy.get(createLocationButton).click();
-            cy.get(
-                `${createForm.prefix} > :nth-child(5) > .q-select > ${createForm.sufix} > :nth-child(2) `
-            )
-                .eq(0)
-                .click();
-            cy.selectOption('#q-portal--dialog--3 .q-select', 'one');
-            cy.countSelectOptions('#q-portal--dialog--3 .q-select', 4);
-            cy.get('#q-portal--dialog--3 .q-input').type(provinceName);
-
-            cy.get('#q-portal--dialog--3 .q-btn--standard').click();
-        });
-
-        it('Create city with country', () => {
-            const cityName = 'Saskatchew'.concat(Math.random(1 * 100));
-            cy.get(createLocationButton).click();
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
-                'Italia'
-            );
-            cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
-            ).click();
-            cy.selectOption('#q-portal--dialog--4 .q-select', 'Province four');
-            cy.countSelectOptions('#q-portal--dialog--4 .q-select', 1);
-
-            cy.get('#q-portal--dialog--4 .q-input').type(cityName);
-            cy.get('#q-portal--dialog--4 .q-btn--standard').click();
-        });
-
-        it('Create province with country', () => {
-            const provinceName = 'Saskatchew'.concat(Math.random(1 * 100));
-            cy.get(createLocationButton).click();
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
-                'España'
-            );
-            cy.get(
-                `${createForm.prefix} > :nth-child(5) > .q-select > ${createForm.sufix} > :nth-child(2) `
-            )
-                .eq(0)
-                .click();
-
-            cy.selectOption('#q-portal--dialog--4 .q-select', 'one');
-            cy.countSelectOptions('#q-portal--dialog--4 .q-select', 2);
-
-            cy.get('#q-portal--dialog--4 .q-input').type(provinceName);
-            cy.get('#q-portal--dialog--4 .q-btn--standard').click();
         });
 
         function checkVnLocation(postCode, province) {

test/cypress/support/commands.js

@@ -91,11 +91,6 @@ Cypress.Commands.add('selectOption', (selector, option) => {
     cy.get(selector).click();
     cy.get('.q-menu .q-item').contains(option).click();
 });
-Cypress.Commands.add('countSelectOptions', (selector, option) => {
-    cy.waitForElement(selector);
-    cy.get(selector).click();
-    cy.get('.q-menu .q-item').should('have.length', option);
-});
 
 Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => {
     cy.waitForElement('.q-form > .q-card');

test/vitest/__tests__/composables/downloadFile.spec.js

@@ -1,36 +1,25 @@
-import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
+import { vi, describe, expect, it } from 'vitest';
 import { axios } from 'app/test/vitest/helper';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useSession } from 'src/composables/useSession';
+
 const session = useSession();
 const token = session.getToken();
 
 describe('downloadFile', () => {
-    const baseUrl = 'http://localhost:9000';
-    let defaulCreateObjectURL;
-
-    beforeAll(() => {
-        defaulCreateObjectURL = window.URL.createObjectURL;
-        window.URL.createObjectURL = vi.fn(() => 'blob:http://localhost:9000/blob-id');
-    });
-
-    afterAll(() => (window.URL.createObjectURL = defaulCreateObjectURL));
-
     it('should open a new window to download the file', async () => {
-        const res = {
+        const url = 'http://localhost:9000';
-            data: new Blob(['file content'], { type: 'application/octet-stream' }),
+
-            headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
+        vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: url });
-        };
+
-        vi.spyOn(axios, 'get').mockImplementation((url) => {
+        const mockWindowOpen = vi.spyOn(window, 'open');
-            if (url == 'Urls/getUrl') return Promise.resolve({ data: baseUrl });
-            else if (url.includes('downloadFile')) return Promise.resolve(res);
-        });
 
         await downloadFile(1);
 
-        expect(axios.get).toHaveBeenCalledWith(
+        expect(mockWindowOpen).toHaveBeenCalledWith(
-            `${baseUrl}/dms/1/downloadFile?access_token=${token}`,
+            `${url}/api/dms/1/downloadFile?access_token=${token}`
-            { responseType: 'blob' }
         );
+
+        mockWindowOpen.mockRestore();
     });
 });