From 1ac0a8596916c920f842516015a7baba5742f6d8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 23 Jul 2024 15:09:42 +0200
Subject: [PATCH] updates

---
 src/components/ui/VnFilterPanel.vue         |  4 ++--
 src/pages/Order/Card/OrderCatalog.vue       | 22 ++++++++++-----------
 src/pages/Order/Card/OrderCatalogFilter.vue | 12 +++++++++--
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index f79852a9d..2dce3228c 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -95,8 +95,8 @@ watch(
 );
 
 watch(
-    () => arrayData.store.userParams,
-    (val) => setUserParams(val)
+    () => [store.userParams, store.userFilter],
+    ([userParams, userFilter]) => setUserParams({ ...userParams, filter: userFilter })
 );
 
 watch(
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index d1479e3c3..cb3e9a8eb 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -54,17 +54,17 @@ function extractValueTags(items) {
 
 <template>
     <!-- TODO Sobreescribir la barra de búsqueda -->
-    <Teleport to="#searchbar">
-        <VnSearchbar
-            data-key="OrderCatalogList"
-            :user-params="catalogParams"
-            :static-params="['orderFk', 'orderBy']"
-            :redirect="false"
-            url="Orders/CatalogFilter"
-            :label="t('Search items')"
-            :info="t('You can search orders by reference')"
-        />
-    </Teleport>
+    <!-- <Teleport to="#searchbar"> -->
+    <VnSearchbar
+        data-key="OrderCatalogList"
+        :user-params="catalogParams"
+        :static-params="['orderFk', 'orderBy']"
+        :redirect="false"
+        url="Orders/CatalogFilter"
+        :label="t('Search items')"
+        :info="t('You can search orders by reference')"
+    />
+    <!-- </Teleport> -->
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <OrderCatalogFilter
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 8d96fe93a..d9447e530 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -29,7 +29,7 @@ const props = defineProps({
 });
 const categoryList = ref(null);
 const selectedCategoryFk = ref(null);
-const typeList = ref(null);
+const typeList = ref([]);
 const selectedTypeFk = ref(null);
 const validationsStore = useValidator();
 const selectedOrder = ref(null);
@@ -165,7 +165,8 @@ const onOrderFieldChange = (value, params) => {
             break;
     }
 };
-
+const getCategory = (fk) =>
+    (categoryList.value || []).find((category) => category?.id === fk);
 const _moreFields = ['ASC', 'DESC'];
 const _moreFieldsTypes = ['Relevancy', 'ColorAndPrice', 'Name', 'Price'];
 const setCategoryList = (data) => {
@@ -177,6 +178,13 @@ const setCategoryList = (data) => {
         }));
     moreFields.value = useLang(_moreFields);
     moreFieldsOrder.value = useLang(_moreFieldsTypes);
+    const { categoryFk } = JSON.parse(JSON.parse(route.query.params).filter).where;
+
+    if (!selectedCategoryFk.value) {
+        selectedCategoryFk.value = categoryFk;
+        selectedCategory.value = getCategory(categoryFk);
+        loadTypes(categoryFk);
+    }
 };
 
 const getCategoryClass = (category, params) => {