Merge pull request 'hotFix(orderCatalogFilter): fix searchByTag' (!961) from hotFix_orderCatalogFilter_values into master

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

src/components/ui/VnToSummary.vue

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

src/pages/Order/Card/CatalogFilterValueDialog.vue

@@ -0,0 +1,145 @@
+<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,30 +1,58 @@
 <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 VnPaginate from 'src/components/ui/VnPaginate.vue';
-import CatalogItem from 'components/ui/CatalogItem.vue';
+import CatalogItem from 'src/components/ui/CatalogItem.vue';
-import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
+import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import getParamWhere from 'src/filters/getParamWhere';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
 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 = {
+onUnmounted(() => (stateStore.rightDrawer = false));
-    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}`);
@@ -34,6 +62,7 @@ async function checkOrderConfirmation() {
 }
 
 function extractTags(items) {
+    if (!items || !items.length) return;
     const resultTags = [];
     (items || []).forEach((item) => {
         (item.tags || []).forEach((tag) => {
@@ -61,11 +90,20 @@ function extractValueTags(items) {
     );
     tagValue.value = resultValueTags;
 }
+const autoLoad = computed(() => !!catalogParams.categoryFk);
+
+watch(
+    () => store.data,
+    (val) => {
+        extractTags(val);
+    },
+    { immediate: true }
+);
 </script>
 
 <template>
     <VnSearchbar
-        data-key="OrderCatalogList"
+        :data-key="dataKey"
         :user-params="catalogParams"
         :static-params="['orderFk', 'orderBy']"
         :redirect="false"
@@ -74,23 +112,25 @@ 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"
+                :data-key="dataKey"
                 :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="OrderCatalogList"
+                :data-key="dataKey"
                 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 +142,7 @@ function extractValueTags(items) {
                             :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 } 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 searchByTag = ref(null);
-const tagValues = ref([{}]);
+
-const tagOptions = ref([]);
 const vnFilterPanelRef = ref();
 const orderByList = ref([
     { id: 'relevancy DESC, name', name: t('params.relevancy'), priority: 999 },
@@ -48,34 +53,30 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
-const createValue = (val, done) => {
+onMounted(() => {
-    if (val.length > 2) {
+    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
-        if (!tagOptions.value.includes(val)) {
+    selectedTypeFk.value = getParamWhere(route, 'typeFk');
-            done(tagOptions.value, 'add-unique');
+});
-        }
+
-        tagValues.value.push({ value: val });
+const resetCategory = (params, search) => {
-    }
-};
-const resetCategory = () => {
     selectedCategoryFk.value = null;
     typeList.value = null;
-};
+    params.categoryFk = null;
-
+    params.typeFk = null;
-const clearFilter = (key) => {
+    arrayData.store.userFilter = null;
-    if (key === 'categoryFk') {
+    removeTagGroupParam(search);
-        resetCategory();
-    }
 };
 
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
-        resetCategory();
+        resetCategory(params, search);
-        params.categoryFk = null;
+        return;
-    } else {
+    }
     selectedCategoryFk.value = category?.id;
     params.categoryFk = category?.id;
+    params.typeFk = null;
+    selectedTypeFk.value = null;
     loadTypes(category?.id);
-    }
     search();
 };
 
@@ -86,19 +87,12 @@ const loadTypes = async (categoryFk = selectedCategoryFk.value) => {
     typeList.value = data;
 };
 
-const selectedCategory = computed(() =>
+const selectedCategory = computed(() => {
-    (categoryList.value || []).find(
+    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,35 +108,35 @@ function exprBuilder(param, value) {
     }
 }
 
-const applyTagFilter = (params, search) => {
+const applyTags = (tagInfo, params, search) => {
-    if (!tagValues.value?.length) {
+    if (!tagInfo || !tagInfo.values.length) {
         params.tagGroups = null;
         search();
         return;
     }
-    if (!params.tagGroups) {
+
-        params.tagGroups = [];
+    if (!params.tagGroups) params.tagGroups = [];
-    }
+    params.tagGroups.push(tagInfo);
-    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 = [{}];
 };
 
-const removeTagChip = (selection, params, search) => {
+async function onSearchByTag(value) {
-    if (params.tagGroups) {
+    if (!value.target.value) return;
-        params.tagGroups = (params.tagGroups || []).filter(
+    if (!currentParams.value?.tagGroups) {
-            (value) => value !== selection
+        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);
     }
     search();
 };
@@ -164,6 +158,12 @@ const getCategoryClass = (category, params) => {
     }
 };
 
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
+};
+
 function addOrder(value, field, params) {
     let { orderBy } = params;
     orderBy = JSON.parse(orderBy);
@@ -174,23 +174,20 @@ function addOrder(value, field, params) {
 </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']"
+        :custom-tags="['tagGroups', 'categoryFk']"
-        @remove="clearFilter"
         :redirect="false"
-        search-url="params"
+        @remove="clearFilter"
+        v-model="currentParams"
     >
         <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'categoryFk'">
+            <strong v-if="tag.label === 'typeFk'">
-                {{ t(selectedCategory?.name || '') }}
-            </strong>
-            <strong v-else-if="tag.label === 'typeFk'">
                 {{ t(selectedType?.name || '') }}
             </strong>
             <div v-else class="q-gutter-x-xs">
@@ -199,24 +196,35 @@ function addOrder(value, field, params) {
             </div>
         </template>
         <template #customTags="{ tags: customTags, params, searchFn }">
-            <template v-for="tag in customTags" :key="tag.label">
+            <template v-for="customTag in customTags" :key="customTag.label">
-                <template v-if="tag.label === 'tagGroups'">
                 <VnFilterPanelChip
-                        v-for="chip in tag.value"
+                    v-for="(tag, valIndex) in Array.isArray(customTag.value)
-                        :key="chip"
+                        ? customTag.value
+                        : 1"
+                    :key="valIndex"
                     removable
-                        @remove="removeTagChip(chip, params, searchFn)"
+                    @remove="
+                        customTag.label === 'categoryFk'
+                            ? resetCategory(params, searchFn)
+                            : removeTagGroupParam(searchFn, valIndex)
+                    "
                 >
-                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
+                    <strong v-if="customTag.label === 'categoryFk'">
-                        <span>{{
+                        {{ t(selectedCategory?.name || '') }}
-                            (JSON.parse(chip).values || [])
+                    </strong>
-                                .map((item) => item.value)
+                    <strong v-if="tag?.tagSelection?.name" class="q-mr-xs">
-                                .join(' | ')
+                        {{ tag.tagSelection.name }}:
-                        }}</span>
+                    </strong>
+                    <span>
+                        {{
+                            (tag?.values || [])
+                                .map((item) => `"${item.value}"`)
+                                .join(', ')
+                        }}
+                    </span>
                 </VnFilterPanelChip>
             </template>
         </template>
-        </template>
         <template #body="{ params, searchFn }">
             <QItem class="category-filter q-mt-md">
                 <div
@@ -298,91 +306,39 @@ function addOrder(value, field, params) {
                 </QItemSection>
             </QItem>
             <QSeparator />
-            <QItem class="q-mt-md">
+            <QItem class="q-mt-lg q-pa-none">
-                <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)"
-                />
                 <VnInput
-                    v-else
+                    :label="t('components.itemsFilterPanel.value')"
-                    :label="t('params.value')"
-                    v-model="value.value"
                     dense
                     outlined
                     rounded
-                    class="filter-input"
+                    :is-clearable="false"
-                    @keyup.enter="applyTagFilter(params, searchFn)"
+                    v-model="searchByTag"
-                />
+                    @keyup.enter="(val) => onSearchByTag(val, params)"
-                <QIcon
+                >
-                    name="delete"
+                    <template #prepend>
-                    class="filter-icon"
+                        <QIcon name="search" />
-                    @click="(tagValues || []).splice(index, 1)"
+                    </template>
-                />
+                    <template #append>
-            </QItem>
-            <QItem class="q-mt-lg">
                         <QBtn
                             icon="add_circle"
                             shortcut="+"
                             flat
-                    class="filter-icon"
+                            color="primary"
-                    @click="tagValues.push({})"
+                            size="md"
+                            dense
                         />
+                        <QPopupProxy>
+                            <CatalogFilterValueDialog
+                                style="display: inline-block"
+                                :tags="tags"
+                                @apply-tags="
+                                    ($event) => applyTags($event, currentParams, searchFn)
+                                "
+                            />
+                        </QPopupProxy>
+                    </template>
+                </VnInput>
             </QItem>
             <QSeparator />
         </template>
@@ -417,23 +373,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>