Merge pull request #3566 from bettyblocks/fix/filter-on-checkbox-prop…

…-with-filter-comp-results-in-error-PAGE-4963 Fix/filter on checkbox prop with filter comp results in error page 4963
bettyblocks · Jan 13, 2025 · 866f2d7 · 866f2d7
2 parents 5175a6b + 202a603
commit 866f2d7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/components/filterComponent.js b/src/components/filterComponent.js
@@ -198,8 +198,6 @@
     const filterProps = (properties, id) => {
       return Object.values(properties).filter((prop) => {
         return (
-          // Always add the id
-          (prop.modelId === id && prop.name === 'id') ||
           // Add all properties besides the forbidden
           (prop.modelId === id &&
             !forbiddenKinds.includes(prop.kind) &&
@@ -363,6 +361,10 @@
         if (isNumberType) return 'number';
         return 'text';
       };
+
+      if (isBooleanType && row.rightValue === '') {
+        setGroups(updateRowProperty(row.rowId, groups, 'rightValue', false));
+      }
       const isTextType =
         !isSpecialType && !isBooleanType && !isDateTimeType && !isDateType;
       return (