From c2db7be8cd20311d2ae467dd44127c1676fa9a36 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 15:06:09 +0100
Subject: [PATCH 1/5] fix(orderCatalogFilter): fix searchByTag

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 297 ++++++++------------
 1 file changed, 116 insertions(+), 181 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 4c018bbb1..68764c1a5 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
@@ -9,10 +9,9 @@ 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,
@@ -27,13 +26,19 @@ 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(getParamWhere(route, 'categoryFk'));
+const selectedCategoryFk = ref(null);
 const typeList = ref([]);
 const selectedTypeFk = ref(null);
-const selectedTag = ref(null);
-const tagValues = ref([{}]);
-const tagOptions = ref([]);
+const searchByTag = ref(null);
+
 const vnFilterPanelRef = ref();
 const orderByList = ref([
     { id: 'relevancy DESC, name', name: t('params.relevancy'), priority: 999 },
@@ -48,32 +53,24 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
-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 = () => {
+const resetCategory = (params, search) => {
     selectedCategoryFk.value = null;
     typeList.value = null;
-};
-
-const clearFilter = (key) => {
-    if (key === 'categoryFk') {
-        resetCategory();
-    }
+    params.categoryFk = null;
+    params.typeFk = null;
+    arrayData.store.userFilter = null;
+    removeTagGroupParam(params, search);
 };
 
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
-        resetCategory();
+        resetCategory(params, search);
         params.categoryFk = null;
     } else {
         selectedCategoryFk.value = category?.id;
         params.categoryFk = category?.id;
+        params.typeFk = null;
+        selectedTypeFk.value = null;
         loadTypes(category?.id);
     }
     search();
@@ -86,19 +83,12 @@ const loadTypes = async (categoryFk = selectedCategoryFk.value) => {
     typeList.value = data;
 };
 
-const selectedCategory = computed(() =>
-    (categoryList.value || []).find(
+const selectedCategory = computed(() => {
+    return (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);
 });
@@ -114,37 +104,38 @@ function exprBuilder(param, value) {
     }
 }
 
-const applyTagFilter = (params, search) => {
-    if (!tagValues.value?.length) {
+const applyTags = (tagInfo, params, search) => {
+    if (!tagInfo || !tagInfo.values.length) {
         params.tagGroups = null;
         search();
         return;
     }
-    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,
-        })
-    );
+
+    if (!params.tagGroups) params.tagGroups = [];
+    params.tagGroups.push(tagInfo);
     search();
-    selectedTag.value = null;
-    tagValues.value = [{}];
 };
 
-const removeTagChip = (selection, params, search) => {
-    if (params.tagGroups) {
-        params.tagGroups = (params.tagGroups || []).filter(
-            (value) => value !== selection
-        );
+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 = (params, search, valIndex = null) => {
+    if (!valIndex) {
+        params.tagGroups = null;
+        search();
+    } else {
+        params.tagGroups.splice(valIndex, 1);
+        search();
     }
-    search();
 };
 
 const setCategoryList = (data) => {
@@ -171,26 +162,27 @@ 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>
-    <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
+    <FetchData url="ItemCategories" 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']"
-        @remove="clearFilter"
+        :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
-        search-url="params"
+        v-model="currentParams"
     >
         <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'categoryFk'">
-                {{ t(selectedCategory?.name || '') }}
-            </strong>
-            <strong v-else-if="tag.label === 'typeFk'">
+            <strong v-if="tag.label === 'typeFk'">
                 {{ t(selectedType?.name || '') }}
             </strong>
             <div v-else class="q-gutter-x-xs">
@@ -199,25 +191,37 @@ function addOrder(value, field, params) {
             </div>
         </template>
         <template #customTags="{ tags: customTags, params, searchFn }">
-            <template v-for="tag in customTags" :key="tag.label">
-                <template v-if="tag.label === 'tagGroups'">
-                    <VnFilterPanelChip
-                        v-for="chip in tag.value"
-                        :key="chip"
-                        removable
-                        @remove="removeTagChip(chip, params, searchFn)"
-                    >
-                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
-                        <span>{{
-                            (JSON.parse(chip).values || [])
-                                .map((item) => item.value)
-                                .join(' | ')
-                        }}</span>
-                    </VnFilterPanelChip>
-                </template>
+            <template v-for="customTag in customTags" :key="customTag.label">
+                <VnFilterPanelChip
+                    v-for="(tag, valIndex) in Array.isArray(customTag.value)
+                        ? customTag.value
+                        : 1"
+                    :key="valIndex"
+                    removable
+                    @remove="
+                        customTag.label === 'categoryFk'
+                            ? resetCategory(params, searchFn)
+                            : removeTagGroupParam(params, searchFn, valIndex)
+                    "
+                >
+                    <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>
+                </VnFilterPanelChip>
             </template>
         </template>
         <template #body="{ params, searchFn }">
+            {{ params }}
             <QItem class="category-filter q-mt-md">
                 <div
                     v-for="category in categoryList"
@@ -298,91 +302,39 @@ function addOrder(value, field, params) {
                 </QItemSection>
             </QItem>
             <QSeparator />
-            <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
-                        :emit-value="false"
-                        use-input
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-for="(value, index) in tagValues"
-                :key="value"
-                class="q-mt-md filter-value"
-            >
-                <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)"
-                />
+            <QItem class="q-mt-lg q-pa-none">
                 <VnInput
-                    v-else
-                    :label="t('params.value')"
-                    v-model="value.value"
+                    :label="t('components.itemsFilterPanel.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
-                    class="filter-icon"
-                    @click="tagValues.push({})"
-                />
+                    :is-clearable="false"
+                    v-model="searchByTag"
+                    @keyup.enter="(val) => onSearchByTag(val, params)"
+                >
+                    <template #prepend>
+                        <QIcon name="search" />
+                    </template>
+                    <template #append>
+                        <QBtn
+                            icon="add_circle"
+                            shortcut="+"
+                            flat
+                            color="primary"
+                            size="md"
+                            dense
+                        />
+                        <QPopupProxy>
+                            <!-- <CatalogFilterValueDialog
+                                style="display: inline-block"
+                                :tags="tags"
+                                @apply-tags="
+                                    ($event) => applyTags($event, params, searchFn)
+                                "
+                            /> -->
+                        </QPopupProxy>
+                    </template>
+                </VnInput>
             </QItem>
             <QSeparator />
         </template>
@@ -417,23 +369,6 @@ 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>

From 32fdc836f9923df5308586c5eae3b6f557ebcc73 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 09:26:38 +0100
Subject: [PATCH 2/5] fix(OrderCatalogFilter): fix field value

---
 .../Order/Card/CatalogFilterValueDialog.vue   | 159 ++++++++++++++++++
 src/pages/Order/Card/OrderCatalogFilter.vue   |  17 +-
 2 files changed, 167 insertions(+), 9 deletions(-)
 create mode 100644 src/pages/Order/Card/CatalogFilterValueDialog.vue

diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
new file mode 100644
index 000000000..120e2fb72
--- /dev/null
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -0,0 +1,159 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import VnSelect from '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 removeTagGroupParam = (valIndex = null) => {
+    if (!valIndex) {
+        tagValues.value = [{}];
+    } else {
+        (tagValues.value || []).splice(valIndex, 1);
+    }
+};
+
+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(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"
+                :options="props.tags"
+                option-value="id"
+                option-label="name"
+                dense
+                outlined
+                class="q-mb-md"
+                rounded
+                :emit-value="false"
+                use-input
+                @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"
+                :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
+                        :is-clearable="false"
+                        class="col"
+                    />
+                    <QBtn
+                        icon="delete"
+                        size="md"
+                        outlined
+                        dense
+                        rounded
+                        flat
+                        class="filter-icon col-2"
+                        :disabled="!value.value"
+                        @click="removeTagGroupParam(index)"
+                    />
+                </div>
+            </div>
+        </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>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 68764c1a5..381a0516a 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -9,7 +9,7 @@ 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 CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
 import { useArrayData } from 'composables/useArrayData';
 
 const props = defineProps({
@@ -128,12 +128,12 @@ async function onSearchByTag(value) {
     searchByTag.value = null;
 }
 
-const removeTagGroupParam = (params, search, valIndex = null) => {
-    if (!valIndex) {
-        params.tagGroups = null;
+const removeTagGroupParam = (search, valIndex) => {
+    if (!valIndex && valIndex !== 0) {
+        currentParams.value.tagGroups = null;
         search();
     } else {
-        params.tagGroups.splice(valIndex, 1);
+        currentParams.value.tagGroups.splice(valIndex, 1);
         search();
     }
 };
@@ -201,7 +201,7 @@ onMounted(() => {
                     @remove="
                         customTag.label === 'categoryFk'
                             ? resetCategory(params, searchFn)
-                            : removeTagGroupParam(params, searchFn, valIndex)
+                            : removeTagGroupParam(searchFn, valIndex)
                     "
                 >
                     <strong v-if="customTag.label === 'categoryFk'">
@@ -221,7 +221,6 @@ onMounted(() => {
             </template>
         </template>
         <template #body="{ params, searchFn }">
-            {{ params }}
             <QItem class="category-filter q-mt-md">
                 <div
                     v-for="category in categoryList"
@@ -325,13 +324,13 @@ onMounted(() => {
                             dense
                         />
                         <QPopupProxy>
-                            <!-- <CatalogFilterValueDialog
+                            <CatalogFilterValueDialog
                                 style="display: inline-block"
                                 :tags="tags"
                                 @apply-tags="
                                     ($event) => applyTags($event, params, searchFn)
                                 "
-                            /> -->
+                            />
                         </QPopupProxy>
                     </template>
                 </VnInput>

From abd79283ff907b0896acee009115ea38af3967b5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 13:38:22 +0100
Subject: [PATCH 3/5] fix(CatalogFilterValueDialog): from dev and fix

---
 .../Order/Card/CatalogFilterValueDialog.vue   | 38 ++++++-------
 src/pages/Order/Card/OrderCatalog.vue         | 56 ++++++++++++++++---
 src/pages/Order/Card/OrderCatalogFilter.vue   | 23 +++++---
 3 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
index 120e2fb72..2cc6c74d3 100644
--- a/src/pages/Order/Card/CatalogFilterValueDialog.vue
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -59,15 +59,6 @@ const getSelectedTagValues = async (tag) => {
 <template>
     <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"
@@ -82,16 +73,6 @@ const getSelectedTagValues = async (tag) => {
                 use-input
                 @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"
                 :key="value"
@@ -120,7 +101,6 @@ const getSelectedTagValues = async (tag) => {
                         :label="t('components.itemsFilterPanel.value')"
                         :disable="!value"
                         is-outlined
-                        :is-clearable="false"
                         class="col"
                     />
                     <QBtn
@@ -131,11 +111,25 @@ const getSelectedTagValues = async (tag) => {
                         rounded
                         flat
                         class="filter-icon col-2"
-                        :disabled="!value.value"
-                        @click="removeTagGroupParam(index)"
+                        @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>
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index b13e8661d..a266fc3d4 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -1,30 +1,57 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onBeforeMount, onMounted, onUnmounted, ref, computed, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 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 'composables/useArrayData';
 
 const route = useRoute();
 const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
+const arrayData = useArrayData('OrderCatalogList');
+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 }),
-};
+onUnmounted(() => (stateStore.rightDrawer = false));
 
 async function checkOrderConfirmation() {
     const response = await axios.get(`Orders/${route.params.id}`);
@@ -34,6 +61,7 @@ async function checkOrderConfirmation() {
 }
 
 function extractTags(items) {
+    if (!items || !items.length) return;
     const resultTags = [];
     (items || []).forEach((item) => {
         (item.tags || []).forEach((tag) => {
@@ -61,6 +89,15 @@ function extractValueTags(items) {
     );
     tagValue.value = resultValueTags;
 }
+const autoLoad = computed(() => !!catalogParams.categoryFk);
+
+watch(
+    () => store.data,
+    (val) => {
+        extractTags(val);
+    },
+    { immediate: true }
+);
 </script>
 
 <template>
@@ -74,11 +111,12 @@ function extractValueTags(items) {
         :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="OrderCatalogList"
                 :tag-value="tagValue"
                 :tags="tags"
+                :initial-catalog-params="catalogParams"
             />
         </QScrollArea>
     </QDrawer>
@@ -89,8 +127,9 @@ function extractValueTags(items) {
                 url="Orders/CatalogFilter"
                 :limit="50"
                 :user-params="catalogParams"
-                @on-fetch="extractTags"
+                @on-fetch="showFilter = true"
                 :update-router="false"
+                :auto-load="autoLoad"
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">
@@ -102,6 +141,7 @@ function extractValueTags(items) {
                             :key="row.id"
                             :item="row"
                             is-catalog
+                            class="fill-icon"
                         />
                     </div>
                 </template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 381a0516a..8d5f2c1ca 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -59,20 +59,20 @@ const resetCategory = (params, search) => {
     params.categoryFk = null;
     params.typeFk = null;
     arrayData.store.userFilter = null;
-    removeTagGroupParam(params, search);
+    removeTagGroupParam(search);
 };
 
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
         resetCategory(params, search);
         params.categoryFk = null;
-    } else {
-        selectedCategoryFk.value = category?.id;
-        params.categoryFk = category?.id;
-        params.typeFk = null;
-        selectedTypeFk.value = null;
-        loadTypes(category?.id);
+        return;
     }
+    selectedCategoryFk.value = category?.id;
+    params.categoryFk = category?.id;
+    params.typeFk = null;
+    selectedTypeFk.value = null;
+    loadTypes(category?.id);
     search();
 };
 
@@ -155,6 +155,12 @@ const getCategoryClass = (category, params) => {
     }
 };
 
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
+};
+
 function addOrder(value, field, params) {
     let { orderBy } = params;
     orderBy = JSON.parse(orderBy);
@@ -179,6 +185,7 @@ onMounted(() => {
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
+        @remove="clearFilter"
         v-model="currentParams"
     >
         <template #tags="{ tag, formatFn }">
@@ -328,7 +335,7 @@ onMounted(() => {
                                 style="display: inline-block"
                                 :tags="tags"
                                 @apply-tags="
-                                    ($event) => applyTags($event, params, searchFn)
+                                    ($event) => applyTags($event, currentParams, searchFn)
                                 "
                             />
                         </QPopupProxy>

From c5acde22a32779d84d5c0f13f1021dce002d1ea2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 21 Nov 2024 07:42:00 +0100
Subject: [PATCH 4/5] chore: requested changes

---
 .../Order/Card/CatalogFilterValueDialog.vue     | 16 ++++------------
 src/pages/Order/Card/OrderCatalog.vue           | 17 +++++++++--------
 src/pages/Order/Card/OrderCatalogFilter.vue     | 14 ++++++--------
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
index 2cc6c74d3..9593e08c4 100644
--- a/src/pages/Order/Card/CatalogFilterValueDialog.vue
+++ b/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 'components/common/VnSelect.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const props = defineProps({
@@ -31,14 +31,6 @@ const applyTags = () => {
     emit('applyTags', tagInfo);
 };
 
-const removeTagGroupParam = (valIndex = null) => {
-    if (!valIndex) {
-        tagValues.value = [{}];
-    } else {
-        (tagValues.value || []).splice(valIndex, 1);
-    }
-};
-
 const getSelectedTagValues = async (tag) => {
     if (!tag?.id) return;
     const filter = {
@@ -57,7 +49,7 @@ const getSelectedTagValues = async (tag) => {
 </script>
 
 <template>
-    <QForm @submit="applyTags(tagValues)" class="all-pointer-events">
+    <QForm @submit="applyTags()" class="all-pointer-events">
         <QCard class="q-pa-sm column q-pa-lg">
             <VnSelect
                 :label="t('params.tag')"
@@ -71,7 +63,7 @@ const getSelectedTagValues = async (tag) => {
                 rounded
                 :emit-value="false"
                 use-input
-                @update:model-value="($event) => getSelectedTagValues($event)"
+                @update:model-value="getSelectedTagValues"
             />
             <div
                 v-for="(value, index) in tagValues"
@@ -83,7 +75,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
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index a266fc3d4..b65f6bcd1 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -4,18 +4,19 @@ 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 'components/ui/VnPaginate.vue';
-import CatalogItem from 'components/ui/CatalogItem.vue';
-import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
+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 'composables/useArrayData';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
 const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const arrayData = useArrayData('OrderCatalogList');
+const dataKey = 'OrderCatalogList';
+const arrayData = useArrayData('dataKey');
 const store = arrayData.store;
 const showFilter = ref(null);
 const tags = ref([]);
@@ -102,7 +103,7 @@ watch(
 
 <template>
     <VnSearchbar
-        data-key="OrderCatalogList"
+        :data-key="dataKey"
         :user-params="catalogParams"
         :static-params="['orderFk', 'orderBy']"
         :redirect="false"
@@ -113,7 +114,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="OrderCatalogList"
+                :data-key="dataKey"
                 :tag-value="tagValue"
                 :tags="tags"
                 :initial-catalog-params="catalogParams"
@@ -123,7 +124,7 @@ watch(
     <QPage class="column items-center q-pa-md">
         <div class="full-width">
             <VnPaginate
-                data-key="OrderCatalogList"
+                :data-key="dataKey"
                 url="Orders/CatalogFilter"
                 :limit="50"
                 :user-params="catalogParams"
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 8d5f2c1ca..8aa88da0d 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -53,6 +53,11 @@ 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;
@@ -65,7 +70,6 @@ const resetCategory = (params, search) => {
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
         resetCategory(params, search);
-        params.categoryFk = null;
         return;
     }
     selectedCategoryFk.value = category?.id;
@@ -131,11 +135,10 @@ async function onSearchByTag(value) {
 const removeTagGroupParam = (search, valIndex) => {
     if (!valIndex && valIndex !== 0) {
         currentParams.value.tagGroups = null;
-        search();
     } else {
         currentParams.value.tagGroups.splice(valIndex, 1);
-        search();
     }
+    search();
 };
 
 const setCategoryList = (data) => {
@@ -168,11 +171,6 @@ 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>

From 44f2ecca286f8a4d20a3352eebf990126031b1bf Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 21 Nov 2024 07:49:10 +0100
Subject: [PATCH 5/5] chore: requested changes

---
 src/components/ui/VnToSummary.vue     | 1 -
 src/pages/Order/Card/OrderCatalog.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ui/VnToSummary.vue b/src/components/ui/VnToSummary.vue
index 1c7d6cf01..305d65e02 100644
--- a/src/components/ui/VnToSummary.vue
+++ b/src/components/ui/VnToSummary.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { defineProps } from 'vue';
 
 const props = defineProps({
     routeName: {
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index b65f6bcd1..66a1a132d 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -16,7 +16,7 @@ const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const dataKey = 'OrderCatalogList';
-const arrayData = useArrayData('dataKey');
+const arrayData = useArrayData(dataKey);
 const store = arrayData.store;
 const showFilter = ref(null);
 const tags = ref([]);