fix: CLIN-2916 fix saving custom filter after adding saved custom pil…

…l to it
Ferlab-Ste-Justine · Aug 7, 2024 · d00bd7e · d00bd7e
1 parent ac3b78e
commit d00bd7e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/packages/ui/Release.md b/packages/ui/Release.md
@@ -1,3 +1,6 @@
+### 10.4.7-rc1 2024-08-07
+- fix: CLIN-2916 saving custom filter after adding saved custom pill to it
+
 ### 10.4.6 2024-08-07
 - feat: CQDG-830 add pattern restriction for name of Sets and Filters
 
@@ -36,7 +39,7 @@
 - fix: SKFP-1172 Improve performance for big datasets
 
 ### 10.0.0 2024-07-03
-- feat: FLUI-132 remove sass, migrate to vanilla css and custom properties 
+- feat: FLUI-132 remove sass, migrate to vanilla css and custom properties
 
 ### 9.21.4 2024-07-04
 - fix: SKFP-1134 Adjust chart bar width for smaller dataset

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

diff --git a/packages/ui/src/components/QueryBuilder/utils/useQueryBuilderState.tsx b/packages/ui/src/components/QueryBuilder/utils/useQueryBuilderState.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { isEmpty } from 'lodash';
+import { get, isEmpty } from 'lodash';
 import { v4 } from 'uuid';
 
 import { BooleanOperators, RangeOperators, TermOperators } from '../../../data/sqon/operators';
@@ -17,6 +17,7 @@ import {
     getDefaultSyntheticSqon,
     getUpdatedActiveQuery,
     getUpdatedActiveQueryByFilterGroup,
+    isBooleanOperator,
     removeFieldFromActiveQuery,
 } from '../../../data/sqon/utils';
 import { IFilter, IFilterGroup } from '../../filters/types';
@@ -215,7 +216,11 @@ export const removePillFromQueryBuilder = (pillId: string, queryBuilderId: strin
 
 export const addPillToQueryBuilder = (pill: IValueQuery, queryBuilderId: string): void => {
     const activeQuery = getActiveQuery(queryBuilderId);
-    updateQuery({ query: { ...activeQuery, content: [...activeQuery.content, pill] }, queryBuilderId });
+    let newPill = pill;
+    if (isBooleanOperator(pill) && pill.content.length === 1) {
+        newPill = { ...pill, content: get(pill.content[0], 'content', []) };
+    }
+    updateQuery({ query: { ...activeQuery, content: [...activeQuery.content, newPill] }, queryBuilderId });
 };
 
 /**