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

@@ -1,145 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import axios from 'axios';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-const props = defineProps({
-    tags: {
-        type: Array,
-        default: () => [],
-    },
-});
-
-const emit = defineEmits(['applyTags']);
-const { t } = useI18n();
-
-const tagValues = ref([{}]);
-const tagOptions = ref([]);
-const selectedTag = ref(null);
-
-const applyTags = () => {
-    if (tagValues.value.some((tag) => !tag.value)) return;
-    const tagInfo = {
-        values: [...tagValues.value],
-        tagFk: selectedTag?.value?.id,
-        tagSelection: {
-            name: selectedTag?.value?.name,
-        },
-    };
-    emit('applyTags', tagInfo);
-};
-
-const getSelectedTagValues = async (tag) => {
-    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;
-};
-</script>
-
-<template>
-    <QForm @submit="applyTags()" class="all-pointer-events">
-        <QCard class="q-pa-sm column q-pa-lg">
-            <VnSelect
-                :label="t('params.tag')"
-                v-model="selectedTag"
-                :options="props.tags"
-                option-value="id"
-                option-label="name"
-                dense
-                outlined
-                class="q-mb-md"
-                rounded
-                :emit-value="false"
-                use-input
-                @update:model-value="getSelectedTagValues"
-            />
-            <div
-                v-for="(value, index) in tagValues"
-                :key="value"
-                class="filter-value column align-left"
-            >
-                <div class="col row q-mb-md">
-                    <VnSelect
-                        v-if="!selectedTag?.isFree && tagOptions"
-                        :label="t('components.itemsFilterPanel.value')"
-                        v-model="value.value"
-                        :options="tagOptions"
-                        option-value="value"
-                        option-label="value"
-                        dense
-                        outlined
-                        rounded
-                        emit-value
-                        use-input
-                        :disable="!value || !selectedTag"
-                        :is-clearable="false"
-                        class="col"
-                    />
-                    <VnInput
-                        v-else
-                        v-model="value.value"
-                        :label="t('components.itemsFilterPanel.value')"
-                        :disable="!value"
-                        is-outlined
-                        class="col"
-                    />
-                    <QBtn
-                        icon="delete"
-                        size="md"
-                        outlined
-                        dense
-                        rounded
-                        flat
-                        class="filter-icon col-2"
-                        @click="tagValues.splice(index, 1)"
-                    />
-                </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>
-
-<style scoped lang="scss">
-.filter-icon {
-    font-size: 24px;
-    color: $primary;
-    padding: 0 4px;
-    cursor: pointer;
-}
-</style>
-
-<i18n>
-en:
-    params:
-        tag: Tag
-es:
-    params:
-        tag: Etiqueta
-</i18n>

src/pages/Order/Card/OrderCatalog.vue

@@ -1,59 +1,31 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onBeforeMount, onMounted, onUnmounted, ref, computed, watch } from 'vue';
+import { onMounted, onUnmounted, ref } 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';
 
 const route = useRoute();
 const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const dataKey = 'OrderCatalogList';
-const arrayData = useArrayData(dataKey);
-const store = arrayData.store;
-const showFilter = ref(null);
 const tags = ref([]);
 
-let catalogParams = {
-    orderFk: route.params.id,
-    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();
 });
-
 onUnmounted(() => (stateStore.rightDrawer = false));
 
+const catalogParams = {
+    orderFk: route.params.id,
+    orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
+};
+
 async function checkOrderConfirmation() {
     const response = await axios.get(`Orders/${route.params.id}`);
     if (response.data.isConfirmed === 1) {
@@ -62,7 +34,6 @@ async function checkOrderConfirmation() {
 }
 
 function extractTags(items) {
-    if (!items || !items.length) return;
     const resultTags = [];
     (items || []).forEach((item) => {
         (item.tags || []).forEach((tag) => {
@@ -90,20 +61,11 @@ function extractValueTags(items) {
     );
     tagValue.value = resultValueTags;
 }
-const autoLoad = computed(() => !!catalogParams.categoryFk);
-
-watch(
-    () => store.data,
-    (val) => {
-        extractTags(val);
-    },
-    { immediate: true }
-);
 </script>
 
 <template>
     <VnSearchbar
-        :data-key="dataKey"
+        data-key="OrderCatalogList"
         :user-params="catalogParams"
         :static-params="['orderFk', 'orderBy']"
         :redirect="false"
@@ -112,25 +74,23 @@ watch(
         :info="t('You can search items by name or id')"
     />
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea v-if="showFilter" class="fit text-grey-8">
+        <QScrollArea class="fit text-grey-8">
             <OrderCatalogFilter
-                :data-key="dataKey"
+                data-key="OrderCatalogList"
                 :tag-value="tagValue"
                 :tags="tags"
-                :initial-catalog-params="catalogParams"
             />
         </QScrollArea>
     </QDrawer>
     <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"
-                @on-fetch="showFilter = true"
+                @on-fetch="extractTags"
                 :update-router="false"
-                :auto-load="autoLoad"
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">
@@ -142,7 +102,6 @@ watch(
                             :key="row.id"
                             :item="row"
                             is-catalog
-                            class="fill-icon"
                         />
                     </div>
                 </template>

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
@@ -9,9 +9,10 @@ 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';
 
+const { t } = useI18n();
+
+const route = useRoute();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -26,19 +27,13 @@ const props = defineProps({
         required: true,
     },
 });
-
-const { t } = useI18n();
-const route = useRoute();
-
-const arrayData = useArrayData(props.dataKey);
-
-const currentParams = ref({});
 const categoryList = ref(null);
-const selectedCategoryFk = ref(null);
+const selectedCategoryFk = ref(getParamWhere(route, 'categoryFk'));
 const typeList = ref([]);
 const selectedTypeFk = ref(null);
-const searchByTag = ref(null);
-
+const selectedTag = ref(null);
+const tagValues = ref([{}]);
+const tagOptions = ref([]);
 const vnFilterPanelRef = ref();
 const orderByList = ref([
     { id: 'relevancy DESC, name', name: t('params.relevancy'), priority: 999 },
@@ -53,30 +48,34 @@ 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) => {
+const createValue = (val, done) => {
+    if (val.length > 2) {
+        if (!tagOptions.value.includes(val)) {
+            done(tagOptions.value, 'add-unique');
+        }
+        tagValues.value.push({ value: val });
+    }
+};
+const resetCategory = () => {
     selectedCategoryFk.value = null;
     typeList.value = null;
-    params.categoryFk = null;
-    params.typeFk = null;
-    arrayData.store.userFilter = null;
-    removeTagGroupParam(search);
+};
+
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
 };
 
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
-        resetCategory(params, search);
-        return;
-    }
+        resetCategory();
+        params.categoryFk = null;
+    } else {
         selectedCategoryFk.value = category?.id;
         params.categoryFk = category?.id;
-    params.typeFk = null;
-    selectedTypeFk.value = null;
         loadTypes(category?.id);
+    }
     search();
 };
 
@@ -87,12 +86,19 @@ const loadTypes = async (categoryFk = selectedCategoryFk.value) => {
     typeList.value = data;
 };
 
-const selectedCategory = computed(() => {
-    return (categoryList.value || []).find(
+const selectedCategory = computed(() =>
+    (categoryList.value || []).find(
         (category) => category?.id === selectedCategoryFk.value
+    )
+);
+function filterFn(val, update) {
+    update(() => {
+        const needle = val.toLowerCase();
+        tagOptions.value = props.tagValue.filter(
+            (v) => v.toLowerCase().indexOf(needle) > -1
         );
-});
-
+    });
+}
 const selectedType = computed(() => {
     return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
 });
@@ -108,35 +114,35 @@ function exprBuilder(param, value) {
     }
 }
 
-const applyTags = (tagInfo, params, search) => {
-    if (!tagInfo || !tagInfo.values.length) {
+const applyTagFilter = (params, search) => {
+    if (!tagValues.value?.length) {
         params.tagGroups = null;
         search();
         return;
     }
-
-    if (!params.tagGroups) params.tagGroups = [];
-    params.tagGroups.push(tagInfo);
+    if (!params.tagGroups) {
+        params.tagGroups = [];
+    }
+    params.tagGroups.push(
+        JSON.stringify({
+            values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
+            tagSelection: {
+                ...selectedTag.value,
+                orgShowField: selectedTag?.value?.name,
+            },
+            tagFk: selectedTag?.value?.tagFk,
+        })
+    );
     search();
+    selectedTag.value = null;
+    tagValues.value = [{}];
 };
 
-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;
-    } else {
-        currentParams.value.tagGroups.splice(valIndex, 1);
+const removeTagChip = (selection, params, search) => {
+    if (params.tagGroups) {
+        params.tagGroups = (params.tagGroups || []).filter(
+            (value) => value !== selection
+        );
     }
     search();
 };
@@ -158,12 +164,6 @@ const getCategoryClass = (category, params) => {
     }
 };
 
-const clearFilter = (key) => {
-    if (key === 'categoryFk') {
-        resetCategory();
-    }
-};
-
 function addOrder(value, field, params) {
     let { orderBy } = params;
     orderBy = JSON.parse(orderBy);
@@ -174,20 +174,23 @@ function addOrder(value, field, params) {
 </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"
         :hidden-tags="['orderFk', 'orderBy']"
         :un-removable-params="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
-        :custom-tags="['tagGroups', 'categoryFk']"
-        :redirect="false"
+        :custom-tags="['tagGroups']"
         @remove="clearFilter"
-        v-model="currentParams"
+        :redirect="false"
+        search-url="params"
     >
         <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'typeFk'">
+            <strong v-if="tag.label === 'categoryFk'">
+                {{ t(selectedCategory?.name || '') }}
+            </strong>
+            <strong v-else-if="tag.label === 'typeFk'">
                 {{ t(selectedType?.name || '') }}
             </strong>
             <div v-else class="q-gutter-x-xs">
@@ -196,35 +199,24 @@ function addOrder(value, field, params) {
             </div>
         </template>
         <template #customTags="{ tags: customTags, params, searchFn }">
-            <template v-for="customTag in customTags" :key="customTag.label">
+            <template v-for="tag in customTags" :key="tag.label">
+                <template v-if="tag.label === 'tagGroups'">
                     <VnFilterPanelChip
-                    v-for="(tag, valIndex) in Array.isArray(customTag.value)
-                        ? customTag.value
-                        : 1"
-                    :key="valIndex"
+                        v-for="chip in tag.value"
+                        :key="chip"
                         removable
-                    @remove="
-                        customTag.label === 'categoryFk'
-                            ? resetCategory(params, searchFn)
-                            : removeTagGroupParam(searchFn, valIndex)
-                    "
+                        @remove="removeTagChip(chip, params, searchFn)"
                     >
-                    <strong v-if="customTag.label === 'categoryFk'">
-                        {{ t(selectedCategory?.name || '') }}
-                    </strong>
-                    <strong v-if="tag?.tagSelection?.name" class="q-mr-xs">
-                        {{ tag.tagSelection.name }}:
-                    </strong>
-                    <span>
-                        {{
-                            (tag?.values || [])
-                                .map((item) => `"${item.value}"`)
-                                .join(', ')
-                        }}
-                    </span>
+                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
+                        <span>{{
+                            (JSON.parse(chip).values || [])
+                                .map((item) => item.value)
+                                .join(' | ')
+                        }}</span>
                     </VnFilterPanelChip>
                 </template>
             </template>
+        </template>
         <template #body="{ params, searchFn }">
             <QItem class="category-filter q-mt-md">
                 <div
@@ -306,39 +298,91 @@ function addOrder(value, field, params) {
                 </QItemSection>
             </QItem>
             <QSeparator />
-            <QItem class="q-mt-lg q-pa-none">
-                <VnInput
-                    :label="t('components.itemsFilterPanel.value')"
+            <QItem class="q-mt-md">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.tag')"
+                        v-model="selectedTag"
+                        :options="props.tags || []"
+                        option-value="id"
+                        option-label="name"
                         dense
                         outlined
                         rounded
-                    :is-clearable="false"
-                    v-model="searchByTag"
-                    @keyup.enter="(val) => onSearchByTag(val, params)"
+                        :emit-value="false"
+                        use-input
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-for="(value, index) in tagValues"
+                :key="value"
+                class="q-mt-md filter-value"
             >
-                    <template #prepend>
-                        <QIcon name="search" />
-                    </template>
-                    <template #append>
+                <FetchData
+                    v-if="selectedTag"
+                    :url="`Tags/${selectedTag}/filterValue`"
+                    limit="30"
+                    auto-load
+                    @on-fetch="(data) => (tagOptions = data)"
+                />
+                <VnSelect
+                    v-if="!selectedTag"
+                    :label="t('params.value')"
+                    v-model="value.value"
+                    :options="tagOptions || []"
+                    option-value="value"
+                    option-label="value"
+                    dense
+                    outlined
+                    rounded
+                    emit-value
+                    use-input
+                    class="filter-input"
+                    @new-value="createValue"
+                    @filter="filterFn"
+                    @update:model-value="applyTagFilter(params, searchFn)"
+                />
+                <VnSelect
+                    v-else-if="selectedTag === 1"
+                    :label="t('params.value')"
+                    v-model="value.value"
+                    :options="tagOptions || []"
+                    option-value="value"
+                    option-label="value"
+                    dense
+                    outlined
+                    rounded
+                    emit-value
+                    use-input
+                    class="filter-input"
+                    @new-value="createValue"
+                    @update:model-value="applyTagFilter(params, searchFn)"
+                />
+                <VnInput
+                    v-else
+                    :label="t('params.value')"
+                    v-model="value.value"
+                    dense
+                    outlined
+                    rounded
+                    class="filter-input"
+                    @keyup.enter="applyTagFilter(params, searchFn)"
+                />
+                <QIcon
+                    name="delete"
+                    class="filter-icon"
+                    @click="(tagValues || []).splice(index, 1)"
+                />
+            </QItem>
+            <QItem class="q-mt-lg">
                 <QBtn
                     icon="add_circle"
                     shortcut="+"
                     flat
-                            color="primary"
-                            size="md"
-                            dense
+                    class="filter-icon"
+                    @click="tagValues.push({})"
                 />
-                        <QPopupProxy>
-                            <CatalogFilterValueDialog
-                                style="display: inline-block"
-                                :tags="tags"
-                                @apply-tags="
-                                    ($event) => applyTags($event, currentParams, searchFn)
-                                "
-                            />
-                        </QPopupProxy>
-                    </template>
-                </VnInput>
             </QItem>
             <QSeparator />
         </template>
@@ -373,6 +417,23 @@ function addOrder(value, field, params) {
         cursor: pointer;
     }
 }
+
+.filter-icon {
+    font-size: 24px;
+    color: $primary;
+    padding: 0 4px;
+    cursor: pointer;
+}
+
+.filter-input {
+    flex-shrink: 1;
+    min-width: 0;
+}
+
+.filter-value {
+    display: flex;
+    align-items: center;
+}
 </style>
 
 <i18n>

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;
+    try {
         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;
 
+        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
+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) {
+    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);
-            }
+        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 () => {
     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>