From 2d8322c6da3f53e322fc0577889f42be32cf7a2f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 11 Sep 2024 09:20:54 +0200
Subject: [PATCH] fix: remove FIXME

---
 src/composables/useArrayData.js | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 32b91b115c..651bcefb03 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -86,26 +86,12 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(filter, store.userFilter, exprFilter);
         let where;
-        //FIXME: ARRAY DATA FALLA AL JUNTAR WHERE'S
-        // console.log(
-        //     'userParams?.filter?.where: ',
-        //     userParams?.filter?.where,
-        //     filter?.where,
-        //     store.filter?.where
-        // );
-        if ((userParams?.filter?.where, filter?.where || store.filter?.where))
-            where = Object.assign(
-                userParams?.filter?.where ?? {},
-                filter?.where ?? {},
-                store.filter?.where ?? {}
-            );
+        if (filter?.where || store.filter?.where)
+            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
         Object.assign(filter, store.filter);
         filter.where = where;
-        // console.log('where: ', where);
         const params = { filter };
-        // console.log('params: ', params);
 
-        delete userParams?.filter;
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
         if (store.order && store.order.length) params.filter.order = store.order;