Merge pull request 'refactor: refs #7524 remove limit and sort parameters from FetchData components' (!1344) from 7524-hotfix-removeFetchData into master

Reviewed-on: #1344
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

src/components/CreateNewPostcodeForm.vue

@@ -2,7 +2,6 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectProvince from 'src/components/VnSelectProvince.vue';
@@ -21,14 +20,11 @@ const postcodeFormData = reactive({
     provinceFk: null,
     townFk: null,
 });
-const townsFetchDataRef = ref(false);
 const townFilter = ref({});
 
 const countriesRef = ref(false);
 const provincesOptions = ref([]);
-const townsOptions = ref([]);
 const town = ref({});
-const countryFilter = ref({});
 
 function onDataSaved(formData) {
     const newPostcode = {
@@ -51,7 +47,6 @@ async function setCountry(countryFk, data) {
     data.townFk = null;
     data.provinceFk = null;
     data.countryFk = countryFk;
-    await fetchTowns();
 }
 
 // Province
@@ -60,22 +55,11 @@ async function setProvince(id, data) {
     const newProvince = provincesOptions.value.find((province) => province.id == id);
     if (newProvince) data.countryFk = newProvince.countryFk;
     postcodeFormData.provinceFk = id;
-    await fetchTowns();
 }
 
 async function onProvinceCreated(data) {
     postcodeFormData.provinceFk = data.id;
 }
-function provinceByCountry(countryFk = postcodeFormData.countryFk) {
-    return provincesOptions.value
-        .filter((province) => province.countryFk === countryFk)
-        .map(({ id }) => id);
-}
-
-// Town
-async function handleTowns(data) {
-    townsOptions.value = data;
-}
 function setTown(newTown, data) {
     town.value = newTown;
     data.provinceFk = newTown?.provinceFk ?? newTown;
@@ -88,18 +72,6 @@ async function onCityCreated(newTown, formData) {
     formData.townFk = newTown;
     setTown(newTown, formData);
 }
-async function fetchTowns(countryFk = postcodeFormData.countryFk) {
-    if (!countryFk) return;
-    const provinces = postcodeFormData.provinceFk
-        ? [postcodeFormData.provinceFk]
-        : provinceByCountry();
-    townFilter.value.where = {
-        provinceFk: {
-            inq: provinces,
-        },
-    };
-    await townsFetchDataRef.value?.fetch();
-}
 
 async function filterTowns(name) {
     if (name !== '') {
@@ -108,22 +80,11 @@ async function filterTowns(name) {
                 like: `%${name}%`,
             },
         };
-        await townsFetchDataRef.value?.fetch();
     }
 }
 </script>
 
 <template>
-    <FetchData
-        ref="townsFetchDataRef"
-        :sort-by="['name ASC']"
-        :limit="30"
-        :filter="townFilter"
-        @on-fetch="handleTowns"
-        auto-load
-        url="Towns/location"
-    />
-
     <FormModelPopup
         url-create="postcodes"
         model="postcode"
@@ -149,14 +110,13 @@ async function filterTowns(name) {
                     @filter="filterTowns"
                     :tooltip="t('Create city')"
                     v-model="data.townFk"
-                    :options="townsOptions"
-                    option-label="name"
-                    option-value="id"
+                    url="Towns/location"
                     :rules="validate('postcode.city')"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
                     required
                     data-cy="locationTown"
+                    sort-by="name ASC"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -197,16 +157,12 @@ async function filterTowns(name) {
                 />
                 <VnSelect
                     ref="countriesRef"
-                    :limit="30"
-                    :filter="countryFilter"
                     :sort-by="['name ASC']"
                     auto-load
                     url="Countries"
                     required
                     :label="t('Country')"
                     hide-selected
-                    option-label="name"
-                    option-value="id"
                     v-model="data.countryFk"
                     :rules="validate('postcode.countryFk')"
                     @update:model-value="(value) => setCountry(value, data)"

src/components/CreateNewProvinceForm.vue

@@ -62,12 +62,9 @@ const where = computed(() => {
                     auto-load
                     :where="where"
                     url="Autonomies/location"
-                    :sort-by="['name ASC']"
-                    :limit="30"
+                    sort-by="name ASC"
                     :label="t('Autonomy')"
                     hide-selected
-                    option-label="name"
-                    option-value="id"
                     v-model="data.autonomyFk"
                     :rules="validate('province.autonomyFk')"
                 >

src/components/FilterItemForm.vue

@@ -42,7 +42,6 @@ const itemFilter = {
 const itemFilterParams = reactive({});
 const closeButton = ref(null);
 const isLoading = ref(false);
-const producersOptions = ref([]);
 const ItemTypesOptions = ref([]);
 const InksOptions = ref([]);
 const tableRows = ref([]);
@@ -121,23 +120,17 @@ const selectItem = ({ id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="Producers"
-        @on-fetch="(data) => (producersOptions = data)"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-        auto-load
-    />
     <FetchData
         url="ItemTypes"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-        order="name"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        order="name ASC"
         @on-fetch="(data) => (ItemTypesOptions = data)"
         auto-load
     />
     <FetchData
         url="Inks"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-        order="name"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        order="name ASC"
         @on-fetch="(data) => (InksOptions = data)"
         auto-load
     />
@@ -152,11 +145,11 @@ const selectItem = ({ id }) => {
                 <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
                 <VnSelect
                     :label="t('globals.producer')"
-                    :options="producersOptions"
                     hide-selected
-                    option-label="name"
-                    option-value="id"
                     v-model="itemFilterParams.producerFk"
+                    url="Producers"
+                    :fields="['id', 'name']"
+                    sort-by="name ASC"
                 />
                 <VnSelect
                     :label="t('globals.type')"

src/components/FilterTravelForm.vue

@@ -124,7 +124,7 @@ const selectTravel = ({ id }) => {
     <FetchData
         url="AgencyModes"
         @on-fetch="(data) => (agenciesOptions = data)"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
         auto-load
     />
     <FetchData

src/components/ItemsFilterPanel.vue

@@ -31,7 +31,6 @@ const props = defineProps({
 const route = useRoute();
 
 const itemTypesOptions = ref([]);
-const suppliersOptions = ref([]);
 const tagOptions = ref([]);
 const tagValues = ref([]);
 const categoryList = ref(null);
@@ -123,7 +122,6 @@ const removeTag = (index, params, search) => {
 };
 const setCategoryList = (data) => {
     categoryList.value = (data || [])
-        .filter((category) => category.display)
         .map((category) => ({
             ...category,
             icon: `vn:${(category.icon || '').split('-')[1]}`,
@@ -133,19 +131,11 @@ const setCategoryList = (data) => {
 </script>
 
 <template>
-    <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
-    <FetchData
-        url="Suppliers"
-        limit="30"
-        auto-load
-        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (suppliersOptions = data)"
-    />
+    <FetchData url="ItemCategories" auto-load @on-fetch="setCategoryList" :where="{display: {neq: 0}}"/>
     <FetchData
         url="Tags"
         :filter="{ fields: ['id', 'name', 'isFree'] }"
         auto-load
-        limit="30"
         @on-fetch="(data) => (tagOptions = data)"
     />
     <VnFilterPanel
@@ -203,8 +193,6 @@ const setCategoryList = (data) => {
                         :label="t('components.itemsFilterPanel.typeFk')"
                         v-model="params.typeFk"
                         :options="itemTypesOptions"
-                        option-value="id"
-                        option-label="name"
                         dense
                         outlined
                         rounded
@@ -242,7 +230,6 @@ const setCategoryList = (data) => {
                         :label="t('globals.tag')"
                         v-model="value.selectedTag"
                         :options="tagOptions"
-                        option-label="name"
                         dense
                         outlined
                         rounded

src/pages/Claim/Card/ClaimPhoto.vue

@@ -156,7 +156,6 @@ function onDrag() {
         url="Claims"
         :filter="claimDmsFilter"
         @on-fetch="([data]) => setClaimDms(data)"
-        limit="20"
         auto-load
         ref="claimDmsRef"
     />

src/pages/Customer/Card/CustomerBillingData.vue

@@ -17,8 +17,7 @@ const bankEntitiesRef = ref(null);
 
 const filter = {
     fields: ['id', 'bic', 'name'],
-    order: 'bic ASC',
-    limit: 30,
+    order: 'bic ASC'
 };
 
 const getBankEntities = (data, formData) => {

src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue

@@ -87,7 +87,7 @@ onMounted(async () => {
     <FetchData
         url="Campaigns/latest"
         @on-fetch="(data) => (campaignsOptions = data)"
-        :filter="{ fields: ['id', 'code', 'dated'], order: 'code ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'code', 'dated'], order: 'code ASC' }"
         auto-load
     />
     <FetchData

src/pages/Entry/EntryLatestBuysFilter.vue

@@ -1,8 +1,6 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnSelect from 'components/common/VnSelect.vue';
@@ -17,26 +15,10 @@ defineProps({
     },
 });
 
-const itemTypeWorkersOptions = ref([]);
-const suppliersOptions = ref([]);
 const tagValues = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="TicketRequests/getItemTypeWorker"
-        limit="30"
-        auto-load
-        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
-        @on-fetch="(data) => (itemTypeWorkersOptions = data)"
-    />
-    <FetchData
-        url="Suppliers"
-        limit="30"
-        auto-load
-        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (suppliersOptions = data)"
-    />
     <ItemsFilterPanel :data-key="dataKey" :custom-tags="['tags']">
         <template #body="{ params, searchFn }">
             <QItem class="q-my-md">
@@ -44,9 +26,10 @@ const tagValues = ref([]);
                     <VnSelect
                         :label="t('components.itemsFilterPanel.salesPersonFk')"
                         v-model="params.salesPersonFk"
-                        :options="itemTypeWorkersOptions"
-                        option-value="id"
+                        url="TicketRequests/getItemTypeWorker"
                         option-label="nickname"
+                        :fields=" ['id', 'nickname']"
+                        sort-by="nickname ASC"
                         dense
                         outlined
                         rounded
@@ -60,9 +43,9 @@ const tagValues = ref([]);
                     <VnSelect
                         :label="t('globals.params.supplierFk')"
                         v-model="params.supplierFk"
-                        :options="suppliersOptions"
-                        option-value="id"
-                        option-label="name"
+                        url="Suppliers"
+                        :fields="['id', 'name', 'nickname']"
+                        sort-by="name ASC"
                         dense
                         outlined
                         rounded

src/pages/InvoiceIn/Card/InvoiceInDueDay.vue

@@ -7,7 +7,6 @@ import { toDate } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getTotal } from 'src/composables/getTotal';
 import CrudModel from 'src/components/CrudModel.vue';
-import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify.js';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -21,7 +20,6 @@ const invoiceIn = computed(() => arrayData.store.data);
 const currency = computed(() => invoiceIn.value?.currency?.code);
 
 const rowsSelected = ref([]);
-const banks = ref([]);
 const invoiceInFormRef = ref();
 const invoiceId = +route.params.id;
 const filter = { where: { invoiceInFk: invoiceId } };
@@ -40,10 +38,9 @@ const columns = computed(() => [
         name: 'bank',
         label: t('Bank'),
         field: (row) => row.bankFk,
-        options: banks.value,
         model: 'bankFk',
-        optionValue: 'id',
         optionLabel: 'bank',
+        url: 'Accountings',
         sortable: true,
         tabIndex: 2,
         align: 'left',
@@ -75,12 +72,6 @@ async function insert() {
 }
 </script>
 <template>
-    <FetchData
-        url="Accountings"
-        auto-load
-        limit="30"
-        @on-fetch="(data) => (banks = data)"
-    />
     <CrudModel
         v-if="invoiceIn"
         ref="invoiceInFormRef"
@@ -110,9 +101,9 @@ async function insert() {
                     <QTd>
                         <VnSelect
                             v-model="row[col.model]"
-                            :options="col.options"
-                            :option-value="col.optionValue"
+                            :url="col.url"
                             :option-label="col.optionLabel"
+                            :option-value="col.optionValue"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -186,8 +177,7 @@ async function insert() {
                                         :label="t('Bank')"
                                         class="full-width"
                                         v-model="props.row['bankFk']"
-                                        :options="banks"
-                                        option-value="id"
+                                        url="Accountings"
                                         option-label="bank"
                                     >
                                         <template #option="scope">

src/pages/Item/ItemFixedPriceFilter.vue

@@ -1,8 +1,6 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
@@ -16,17 +14,9 @@ const props = defineProps({
     },
 });
 
-const itemTypeWorkersOptions = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="TicketRequests/getItemTypeWorker"
-        limit="30"
-        auto-load
-        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
-        @on-fetch="(data) => (itemTypeWorkersOptions = data)"
-    />
     <ItemsFilterPanel :data-key="props.dataKey" :custom-tags="['tags']">
         <template #body="{ params, searchFn }">
             <QItem class="q-my-md">
@@ -34,14 +24,15 @@ const itemTypeWorkersOptions = ref([]);
                     <VnSelect
                         :label="t('params.buyerFk')"
                         v-model="params.buyerFk"
-                        :options="itemTypeWorkersOptions"
-                        option-value="id"
+                        url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
                         option-label="nickname"
                         dense
                         outlined
                         rounded
                         use-input
                         @update:model-value="searchFn()"
+                        sort-by="nickname ASC"
                     />
                 </QItemSection>
             </QItem>
@@ -50,11 +41,10 @@ const itemTypeWorkersOptions = ref([]);
                     <VnSelect
                         url="Warehouses"
                         auto-load
-                        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
                         :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
-                        option-label="name"
-                        option-value="id"
                         dense
                         outlined
                         rounded

src/pages/Route/Card/RouteAutonomousFilter.vue

@@ -19,7 +19,6 @@ const emit = defineEmits(['search']);
 
 const agencyList = ref([]);
 const agencyAgreementList = ref([]);
-const supplierList = ref([]);
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -46,7 +45,6 @@ const exprBuilder = (param, value) => {
         url="AgencyModes"
         :filter="{ fields: ['id', 'name'] }"
         sort-by="name ASC"
-        limit="30"
         @on-fetch="(data) => (agencyList = data)"
         auto-load
     />
@@ -54,18 +52,9 @@ const exprBuilder = (param, value) => {
         url="Agencies"
         :filter="{ fields: ['id', 'name'] }"
         sort-by="name ASC"
-        limit="30"
         @on-fetch="(data) => (agencyAgreementList = data)"
         auto-load
     />
-    <FetchData
-        url="Suppliers"
-        :filter="{ fields: ['name'] }"
-        sort-by="name ASC"
-        limit="30"
-        @on-fetch="(data) => (supplierList = data)"
-        auto-load
-    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :expr-builder="exprBuilder"
@@ -123,12 +112,14 @@ const exprBuilder = (param, value) => {
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-my-sm" v-if="supplierList">
+                <QItem class="q-my-sm">
                     <QItemSection>
                         <VnSelect
                             :label="t('Autonomous')"
                             v-model="params.supplierFk"
-                            :options="supplierList"
+                            url="Suppliers"
+                            :fields="['name']"
+                            sort-by="name ASC"
                             option-value="name"
                             option-label="name"
                             dense

src/pages/Route/Roadmap/RoadmapAddStopForm.vue

@@ -48,7 +48,6 @@ const onFetch = (data) => {
                 },
             ],
         }"
-        limit="30"
         @on-fetch="onFetch"
     />
     <div :class="[isDialog ? 'column' : 'form-gap', 'full-width flex']">

src/pages/Route/Roadmap/RoadmapBasicData.vue

@@ -1,36 +1,24 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnSelect from 'components/common/VnSelect.vue';
-import FetchData from 'components/FetchData.vue';
-import { ref } from 'vue';
 
 const { t } = useI18n();
 const router = useRouter();
-const route = useRoute();
 
-const supplierList = ref([]);
 const filter = { include: [{ relation: 'supplier' }] };
 const onSave = (data, response) => {
     router.push({ name: 'RoadmapSummary', params: { id: response?.id } });
 };
 </script>
 <template>
-    <FetchData
-        url="Suppliers"
-        auto-load
-        :filter="{ fields: ['id', 'nickname'] }"
-        sort-by="nickname"
-        limit="30"
-        @on-fetch="(data) => (supplierList = data)"
-    />
     <FormModel
-        :url="`Roadmaps/${route.params?.id}`"
+        :url="`Roadmaps/${$route.params?.id}`"
         observe-form-changes
         :filter="filter"
         model="roadmap"
@@ -59,8 +47,8 @@ const onSave = (data, response) => {
                 <VnSelect
                     :label="t('Carrier')"
                     v-model="data.supplierFk"
-                    :options="supplierList"
-                    option-value="id"
+                    url="Suppliers"
+                    :fields="['id', 'nickname']"
                     option-label="nickname"
                     emit-value
                     map-options

src/pages/Route/Roadmap/RoadmapFilter.vue

@@ -1,7 +1,5 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
@@ -17,7 +15,6 @@ const props = defineProps({
 
 const emit = defineEmits(['search']);
 
-const supplierList = ref([]);
 const exprBuilder = (param, value) => {
     switch (param) {
         case 'tractorPlate':
@@ -37,14 +34,6 @@ const exprBuilder = (param, value) => {
 </script>
 
 <template>
-    <FetchData
-        url="Suppliers"
-        :filter="{ fields: ['id', 'nickname'] }"
-        sort-by="nickname"
-        limit="30"
-        @on-fetch="(data) => (supplierList = data)"
-        auto-load
-    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
@@ -88,13 +77,14 @@ const exprBuilder = (param, value) => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem v-if="supplierList" class="q-my-sm">
+            <QItem class="q-my-sm">
                 <QItemSection>
                     <VnSelect
                         :label="t('Carrier')"
+                        :fields="['id', 'nickname']"
                         v-model="params.supplierFk"
-                        :options="supplierList"
-                        option-value="id"
+                        url="Suppliers"
+                        sort-by="nickname ASC"
                         option-label="nickname"
                         dense
                         outlined

src/pages/Ticket/Card/TicketPackage.vue

@@ -49,7 +49,7 @@ watch(
     <FetchData
         @on-fetch="(data) => (listPackagingsOptions = data)"
         auto-load
-        :filter="{ fields: ['packagingFk', 'name'], order: 'name ASC', limit: 30 }"
+        :filter="{ fields: ['packagingFk', 'name'], order: 'name ASC' }"
         url="Packagings/listPackaging"
     />
     <div class="flex justify-center">