fix: CLIN-3284 fix erreur 500

Ferlab-Ste-Justine · Oct 16, 2024 · 375e2d9 · 375e2d9
1 parent 4335ba8
commit 375e2d9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/packages/ui/Release.md b/packages/ui/Release.md
@@ -1,3 +1,6 @@
+### 10.10.8 2024-10-16
+- fix: CLIN-3284 fix error 500 query
+
 ### 10.10.7 2024-10-11
 - feat: CLIN-2989 Filter flag dropdown and querybuilder not includes tablefitler
 

diff --git a/packages/ui/package-lock.json b/packages/ui/package-lock.json
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ferlab/ui",
-    "version": "10.10.7",
+    "version": "10.10.8",
     "description": "Core components for scientific research data portals",
     "publishConfig": {
         "access": "public"

diff --git a/packages/ui/src/components/QueryBuilder/utils/helper.ts b/packages/ui/src/components/QueryBuilder/utils/helper.ts
@@ -28,18 +28,31 @@ export const removeIgnoreFieldFromQueryContent = (
 ): ISyntheticSqon => {
     const queryToRemove = query.content.filter((c) => {
         let toKeep = false;
-        if (((c as IValueFilter).content as unknown as IValueContent[]).length !== 0) {
-            if (!filterQueryToIgnore?.includes(((c as IValueFilter).content as IValueContent).field)) {
+        console.log('filter query', query);
+        if (!Array.isArray((c as IValueFilter).content)) {
+            console.log('filter c', c);
+            if ((c as IValueFilter).content) {
+                if (!filterQueryToIgnore?.includes(((c as IValueFilter).content as IValueContent).field)) {
+                    toKeep = true;
+                }
+            } else {
                 toKeep = true;
             }
-            if (Array.isArray((c as IValueFilter).content)) {
-                const { field } = ((c as IValueFilter).content as unknown as IValueFilter[])[0]
-                    .content as IValueContent;
-                if (filterQueryToIgnore?.includes(field)) {
-                    toKeep = false;
+        } else {
+            if (((c as IValueFilter).content as unknown as IValueContent[]).length !== 0) {
+                if (!filterQueryToIgnore?.includes(((c as IValueFilter).content as IValueContent).field)) {
+                    toKeep = true;
+                }
+                if (Array.isArray((c as IValueFilter).content)) {
+                    const { field } = ((c as IValueFilter).content as unknown as IValueFilter[])[0]
+                        .content as IValueContent;
+                    if (filterQueryToIgnore?.includes(field)) {
+                        toKeep = false;
+                    }
                 }
             }
         }
+
         return toKeep;
     });
     return {