src/components/ui/VnToSummary.vue

@@ -1,5 +1,6 @@
 <script setup>
 import { useRoute } from 'vue-router';
+import { defineProps } from 'vue';
 
 const props = defineProps({
     routeName: {

src/pages/Order/Card/CatalogFilterValueDialog.vue

@@ -2,7 +2,7 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const props = defineProps({
@@ -31,26 +31,47 @@ const applyTags = () => {
     emit('applyTags', tagInfo);
 };
 
-const getSelectedTagValues = async (tag) => {
-    if (!tag?.id) return;
-    const filter = {
-        fields: ['value'],
-        order: 'value ASC',
-        limit: 30,
-    };
+const removeTagGroupParam = (valIndex = null) => {
+    if (!valIndex) {
+        tagValues.value = [{}];
+    } else {
+        (tagValues.value || []).splice(valIndex, 1);
+    }
+};
 
-    const url = `Tags/${tag?.id}/filterValue`;
-    const params = { filter: JSON.stringify(filter) };
-    const { data } = await axios.get(url, {
-        params,
-    });
-    tagOptions.value = data;
+const getSelectedTagValues = async (tag) => {
+    try {
+        if (!tag?.id) return;
+        const filter = {
+            fields: ['value'],
+            order: 'value ASC',
+            limit: 30,
+        };
+
+        const url = `Tags/${tag?.id}/filterValue`;
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get(url, {
+            params,
+        });
+        tagOptions.value = data;
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
 };
 </script>
 
 <template>
-    <QForm @submit="applyTags()" class="all-pointer-events">
+    <QForm @submit="applyTags(tagValues)" class="all-pointer-events">
         <QCard class="q-pa-sm column q-pa-lg">
+            <QBtn
+                round
+                color="primary"
+                style="position: absolute; z-index: 1; right: 0; top: 0"
+                icon="search"
+                type="submit"
+            >
+            </QBtn>
+
             <VnSelect
                 :label="t('params.tag')"
                 v-model="selectedTag"
@@ -63,7 +84,17 @@ const getSelectedTagValues = async (tag) => {
                 rounded
                 :emit-value="false"
                 use-input
-                @update:model-value="getSelectedTagValues"
+                @update:model-value="($event) => getSelectedTagValues($event)"
+            />
+            <QBtn
+                icon="add_circle"
+                shortcut="+"
+                flat
+                class="filter-icon q-mb-md"
+                size="md"
+                dense
+                :disabled="!selectedTag || !tagValues[0].value"
+                @click="tagValues.unshift({})"
             />
             <div
                 v-for="(value, index) in tagValues"
@@ -75,7 +106,7 @@ const getSelectedTagValues = async (tag) => {
                         v-if="!selectedTag?.isFree && tagOptions"
                         :label="t('components.itemsFilterPanel.value')"
                         v-model="value.value"
-                        :options="tagOptions"
+                        :options="tagOptions || []"
                         option-value="value"
                         option-label="value"
                         dense
@@ -93,6 +124,7 @@ const getSelectedTagValues = async (tag) => {
                         :label="t('components.itemsFilterPanel.value')"
                         :disable="!value"
                         is-outlined
+                        :is-clearable="false"
                         class="col"
                     />
                     <QBtn
@@ -103,25 +135,11 @@ const getSelectedTagValues = async (tag) => {
                         rounded
                         flat
                         class="filter-icon col-2"
-                        @click="tagValues.splice(index, 1)"
+                        :disabled="!value.value"
+                        @click="removeTagGroupParam(index)"
                     />
                 </div>
             </div>
-            <QBtn
-                icon="add_circle"
-                shortcut="+"
-                flat
-                class="filter-icon q-mb-md"
-                size="md"
-                dense
-                @click="tagValues.push({})"
-            />
-            <QBtn
-                color="primary"
-                icon="search"
-                type="submit"
-                :label="$t('globals.search')"
-            />
         </QCard>
     </QForm>
 </template>

src/pages/Order/Card/OrderCatalog.vue

@@ -4,19 +4,18 @@ import { useRoute, useRouter } from 'vue-router';
 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 VnPaginate from 'components/ui/VnPaginate.vue';
+import CatalogItem from 'components/ui/CatalogItem.vue';
+import OrderCatalogFilter from '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';
+import { useArrayData } from 'composables/useArrayData';
 
 const route = useRoute();
 const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const dataKey = 'OrderCatalogList';
-const arrayData = useArrayData(dataKey);
+const arrayData = useArrayData('OrderCatalogList');
 const store = arrayData.store;
 const showFilter = ref(null);
 const tags = ref([]);
@@ -103,7 +102,7 @@ watch(
 
 <template>
     <VnSearchbar
-        :data-key="dataKey"
+        data-key="OrderCatalogList"
         :user-params="catalogParams"
         :static-params="['orderFk', 'orderBy']"
         :redirect="false"
@@ -114,7 +113,7 @@ watch(
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea v-if="showFilter" class="fit text-grey-8">
             <OrderCatalogFilter
-                :data-key="dataKey"
+                data-key="OrderCatalogList"
                 :tag-value="tagValue"
                 :tags="tags"
                 :initial-catalog-params="catalogParams"
@@ -124,7 +123,7 @@ watch(
     <QPage class="column items-center q-pa-md">
         <div class="full-width">
             <VnPaginate
-                :data-key="dataKey"
+                data-key="OrderCatalogList"
                 url="Orders/CatalogFilter"
                 :limit="50"
                 :user-params="catalogParams"

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -32,12 +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 generalSearchParam = ref(null);
 
 const vnFilterPanelRef = ref();
 const orderByList = ref([
@@ -53,30 +52,26 @@ 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;
-    removeTagGroupParam(search);
+    removeTagGroupParam(params, search);
 };
 
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
         resetCategory(params, search);
-        return;
+        params.categoryFk = null;
+    } else {
+        selectedCategoryFk.value = category?.id;
+        params.categoryFk = category?.id;
+        params.typeFk = null;
+        selectedTypeFk.value = null;
+        loadTypes(category?.id);
     }
-    selectedCategoryFk.value = category?.id;
-    params.categoryFk = category?.id;
-    params.typeFk = null;
-    selectedTypeFk.value = null;
-    loadTypes(category?.id);
     search();
 };
 
@@ -120,23 +115,13 @@ const applyTags = (tagInfo, params, search) => {
     search();
 };
 
-async function onSearchByTag(value) {
-    if (!value.target.value) return;
-    if (!currentParams.value?.tagGroups) {
-        currentParams.value.tagGroups = [];
-    }
-
-    currentParams.value.tagGroups.push({
-        values: [{ value: value.target.value }],
-    });
-    searchByTag.value = null;
-}
-
-const removeTagGroupParam = (search, valIndex) => {
-    if (!valIndex && valIndex !== 0) {
-        currentParams.value.tagGroups = null;
+const removeTagGroupParam = (params, search, valIndex = null) => {
+    if (!valIndex) {
+        params.tagGroups = null;
+        search();
     } else {
-        currentParams.value.tagGroups.splice(valIndex, 1);
+        params.tagGroups.splice(valIndex, 1);
+        search();
     }
 };
 
@@ -157,12 +142,6 @@ const getCategoryClass = (category, params) => {
     }
 };
 
-const clearFilter = (key) => {
-    if (key === 'categoryFk') {
-        resetCategory();
-    }
-};
-
 function addOrder(value, field, params) {
     let { orderBy } = params;
     orderBy = JSON.parse(orderBy);
@@ -178,7 +157,7 @@ onMounted(() => {
 </script>
 
 <template>
-    <FetchData url="ItemCategories" auto-load @on-fetch="setCategoryList" />
+    <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
     <VnFilterPanel
         ref="vnFilterPanelRef"
         :data-key="props.dataKey"
@@ -187,8 +166,7 @@ onMounted(() => {
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
-        @remove="clearFilter"
-        v-model="currentParams"
+        search-url="params"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'typeFk'">
@@ -210,7 +188,7 @@ onMounted(() => {
                     @remove="
                         customTag.label === 'categoryFk'
                             ? resetCategory(params, searchFn)
-                            : removeTagGroupParam(searchFn, valIndex)
+                            : removeTagGroupParam(params, searchFn, valIndex)
                     "
                 >
                     <strong v-if="customTag.label === 'categoryFk'">
@@ -310,39 +288,46 @@ onMounted(() => {
                 </QItemSection>
             </QItem>
             <QSeparator />
-            <QItem class="q-mt-lg q-pa-none">
-                <VnInput
+
+            <QItem class="q-mt-lg">
+                <VnSelect
                     :label="t('components.itemsFilterPanel.value')"
+                    :options="props.tagValue"
                     dense
                     outlined
                     rounded
                     :is-clearable="false"
-                    v-model="searchByTag"
-                    @keyup.enter="(val) => onSearchByTag(val, params)"
+                    v-model="generalSearchParam"
+                    @update:model-value="
+                        applyTags(
+                            { values: [{ value: generalSearchParam }] },
+                            params,
+                            searchFn
+                        )
+                    "
                 >
                     <template #prepend>
                         <QIcon name="search" />
                     </template>
-                    <template #append>
+                    <template #after>
                         <QBtn
                             icon="add_circle"
                             shortcut="+"
                             flat
                             color="primary"
                             size="md"
-                            dense
                         />
                         <QPopupProxy>
                             <CatalogFilterValueDialog
                                 style="display: inline-block"
                                 :tags="tags"
                                 @apply-tags="
-                                    ($event) => applyTags($event, currentParams, searchFn)
+                                    ($event) => applyTags($event, params, searchFn)
                                 "
                             />
                         </QPopupProxy>
                     </template>
-                </VnInput>
+                </VnSelect>
             </QItem>
             <QSeparator />
         </template>

src/pages/Zone/Card/ZoneCard.vue

@@ -24,6 +24,7 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
         :descriptor="ZoneDescriptor"
         :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
         :search-data-key="notIsLocations('ZoneList', undefined)"
+        :custom-url="`Zones/${route.params?.id}/getLeaves`"
         :searchbar-props="{
             url: notIsLocations('Zones', 'ZoneLocations'),
             label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),

src/pages/Zone/Card/ZoneLocationsTree.vue

@@ -39,7 +39,8 @@ const url = computed(() => `Zones/${route.params.id}/getLeaves`);
 const arrayData = useArrayData(datakey, {
     url: url.value,
 });
-const store = arrayData.store;
+const { store } = arrayData;
+const storeData = computed(() => store.data);
 
 const defaultNode = {
     id: null,
@@ -65,20 +66,8 @@ const onNodeExpanded = async (nodeKeysArray) => {
     if (!nodeKeysSet.has(null)) return;
 
     const wasExpanded = !previousExpandedNodes.value.has(lastNodeKey);
-    if (wasExpanded && treeRef.value) {
-        const node = treeRef.value?.getNodeByKey(lastNodeKey);
-        const params = { parentId: node.id };
-        const response = await axios.get(`Zones/${route.params.id}/getLeaves`, {
-            params,
-        });
-        if (response.data) {
-            node.childs = response.data.map((n) => {
-                if (n.sons > 0) n.childs = [{}];
-                return n;
-            });
-        }
-        await fetchNodeLeaves(lastNodeKey, true);
-    } else {
+    if (wasExpanded) await fetchNodeLeaves(lastNodeKey);
+    else {
         const difference = new Set(
             [...previousExpandedNodes.value].filter((x) => !nodeKeysSet.has(x))
         );
@@ -94,21 +83,41 @@ const formatNodeSelected = (node) => {
     if (node.selected === 1) node.selected = true;
     else if (node.selected === 0) node.selected = false;
 
+    if (node.childs && node.childs.length > 0) {
+        expanded.value.push(node.id);
+
+        node.childs.forEach((childNode) => {
+            formatNodeSelected(childNode);
+        });
+    }
+
     if (node.sons > 0 && !node.childs) node.childs = [{}];
 };
 
 const fetchNodeLeaves = async (nodeKey) => {
-    if (!treeRef.value) return;
-    const node = treeRef.value?.getNodeByKey(nodeKey);
-    if (node.selected === 1) node.selected = true;
-    else if (node.selected === 0) node.selected = false;
-    if (!node || node.sons === 0) return;
+    try {
+        const node = treeRef.value?.getNodeByKey(nodeKey);
+        if (!node || node.sons === 0) return;
 
-    state.set('Tree', node);
+        const params = { parentId: node.id };
+        const response = await axios.get(`Zones/${route.params.id}/getLeaves`, {
+            params,
+        });
+        if (response.data) {
+            node.childs = response.data.map((n) => {
+                formatNodeSelected(n);
+                return n;
+            });
+        }
+
+        state.set('Tree', node);
+    } catch (err) {
+        console.error('Error fetching department leaves', err);
+        throw new Error();
+    }
 };
 
 function getNodeIds(node) {
-    if (!node) return [];
     let ids = [];
     if (node.id) ids.push(node.id);
 
@@ -119,46 +128,60 @@ function getNodeIds(node) {
     return ids;
 }
 
-watch(
-    () => store.data,
-    async (val) => {
-        if (!val) return;
-        // // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
-        if (!nodes.value[0]) nodes.value = [defaultNode];
-        nodes.value[0].childs = [...val];
-        const fetchedNodeKeys = val.flatMap(getNodeIds);
-        state.set('Tree', [...fetchedNodeKeys]);
+watch(storeData, async (val) => {
+    // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
+    if (!nodes.value[0]) nodes.value = [defaultNode];
+    nodes.value[0].childs = [...val];
+    const fetchedNodeKeys = val.flatMap(getNodeIds);
+    state.set('Tree', [...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 }
-);
+    if (store.userParams?.search === '') {
+        val.forEach((n) => {
+            formatNodeSelected(n);
+        });
+    } else {
+        for (let n of state.get('Tree')) await fetchNodeLeaves(n);
+        expanded.value = [null, ...fetchedNodeKeys];
+    }
+    previousExpandedNodes.value = new Set(expanded.value);
+});
 
 const reFetch = async () => {
     const { data } = await arrayData.fetch({ append: false });
     nodes.value = data;
-    expanded.value = [null];
 };
 
 onMounted(async () => {
-    if (store.userParams?.search) await arrayData.fetch({});
+    if (store.userParams?.search && !props.showSearchBar) {
+        await reFetch();
+        return;
+    }
+    const stateTree = state.get('Tree');
+    const tree = stateTree ? [...state.get('Tree')] : [null];
+    const lastStateTree = state.get('TreeState');
+    if (tree) {
+        for (let n of tree) {
+            await fetchNodeLeaves(n);
+        }
+
+        if (lastStateTree) {
+            tree.push(lastStateTree);
+            await fetchNodeLeaves(lastStateTree);
+        }
+    }
+
+    setTimeout(() => {
+        if (lastStateTree) {
+            document.getElementById(lastStateTree).scrollIntoView();
+        }
+    }, 1000);
+
+    expanded.value.unshift(null);
+    previousExpandedNodes.value = new Set(expanded.value);
 });
 
 onUnmounted(() => {
     state.set('Tree', undefined);
-    arrayData.destroy();
 });
 </script>