Merge branch 'main' into unify-the-units

gridsuite · Jan 14, 2025 · 680731f · 680731f
2 parents b88ce31 + 6048ada
commit 680731f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.76.2",
+    "version": "0.77.0",
     "description": "common react components for gridsuite applications",
     "engines": {
         "npm": ">=9",

diff --git a/src/components/filter/expert/expertFilterUtils.ts b/src/components/filter/expert/expertFilterUtils.ts
@@ -473,9 +473,6 @@ export const queryValidator: QueryValidator = (query) => {
     };
     const validateGroup = (ruleGroup: RuleGroupTypeAny) => {
         const reasons: any[] = [];
-        if (ruleGroup.rules.length === 0) {
-            reasons.push(RULES.EMPTY_GROUP);
-        }
         if (ruleGroup.id) {
             if (reasons.length) {
                 result[ruleGroup.id] = { valid: false, reasons };

diff --git a/src/components/inputs/reactQueryBuilder/RemoveButton.tsx b/src/components/inputs/reactQueryBuilder/RemoveButton.tsx
@@ -10,7 +10,7 @@ import IconButton from '@mui/material/IconButton';
 import DeleteIcon from '@mui/icons-material/Delete';
 import { useController } from 'react-hook-form';
 
-import { getNumberOfSiblings, recursiveRemove } from '../../filter/expert/expertFilterUtils';
+import { recursiveRemove } from '../../filter/expert/expertFilterUtils';
 
 const EXPERT_FILTER_QUERY = 'rules';
 
@@ -26,11 +26,9 @@ export function RemoveButton(props: ActionWithRulesProps) {
         onChange(recursiveRemove(query, path));
     }
 
-    const isLastRuleOrGroup = path.toString() === [0].toString() && getNumberOfSiblings(path, query) === 1;
-
     return (
         <IconButton size="small" onClick={() => handleDelete()} className={className} title={title}>
-            {!isLastRuleOrGroup && <DeleteIcon />}
+            <DeleteIcon />
         </IconButton>
     );
 }