fix(tables): retain deferred filter conditions

Author: j15z

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.test.tsx

@@ -184,6 +184,46 @@ describe('TableFilter', () => {
     })
   })
 
+  it('keeps a deferred condition applied while another rule is removed', () => {
+    const onChange = vi.fn()
+    renderFilter(onChange, {
+      any: [
+        { all: [{ field: 'col-name', op: 'eq', value: 'Ada' }] },
+        {
+          all: [
+            { field: 'col-name', op: 'isEmpty' },
+            { field: 'col-name', op: 'eq', value: 'Linus' },
+          ],
+        },
+      ],
+    })
+
+    const operatorTrigger = Array.from(container.querySelectorAll('button')).find(
+      (button) => button.textContent?.trim() === 'is empty'
+    )
+    act(() => {
+      operatorTrigger?.dispatchEvent(new MouseEvent('pointerdown', { bubbles: true, button: 0 }))
+    })
+    const equalsOption = Array.from(
+      document.querySelectorAll<HTMLElement>('[role="menuitem"]')
+    ).find((item) => item.textContent?.trim() === 'equals')
+    act(() => equalsOption?.click())
+
+    expect(onChange).not.toHaveBeenCalled()
+
+    const removeButtons = container.querySelectorAll<HTMLButtonElement>(
+      'button[aria-label="Remove filter"]'
+    )
+    act(() => removeButtons[2]?.click())
+
+    expect(onChange).toHaveBeenCalledWith({
+      any: [
+        { all: [{ field: 'col-name', op: 'eq', value: 'Ada' }] },
+        { all: [{ field: 'col-name', op: 'isEmpty' }] },
+      ],
+    })
+  })
+
   it('loads a saved OR filter verbatim without an unsolicited autosave', () => {
     const onChange = vi.fn()
     renderFilter(onChange, {

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx

@@ -59,6 +59,7 @@ export function TableFilter({
   onClose,
 }: TableFilterProps) {
   const lastAppliedFilterRef = useRef<string | undefined>(undefined)
+  const deferredAppliedRulesRef = useRef<Map<string, FilterRule>>(new Map())
   const [rules, setRules] = useState<FilterRule[]>(() => {
     const fromFilter = predicateToFilterRules(filter)
     return fromFilter.length > 0 ? fromFilter : [createRule(columns)]
@@ -75,15 +76,39 @@ export function TableFilter({
 
   const applyRules = useCallback(
     (update: (current: FilterRule[]) => FilterRule[], deferIncompleteRuleId?: string) => {
-      const nextRules = update(rulesRef.current)
+      const currentRules = rulesRef.current
+      const nextRules = update(currentRules)
       rulesRef.current = nextRules
       setRules(nextRules)
       if (!autoApply) return
 
       const deferredRule = nextRules.find((rule) => rule.id === deferIncompleteRuleId)
-      if (deferredRule && !isCompleteRule(deferredRule)) return
+      if (deferredRule && !isCompleteRule(deferredRule)) {
+        const previouslyAppliedRule = currentRules.find((rule) => rule.id === deferredRule.id)
+        if (previouslyAppliedRule && isCompleteRule(previouslyAppliedRule)) {
+          const deferredRules = deferredAppliedRulesRef.current
+          if (!deferredRules.has(deferredRule.id)) {
+            deferredRules.set(deferredRule.id, previouslyAppliedRule)
+          }
+        }
+      }
+
+      const nextRulesById = new Map(nextRules.map((rule) => [rule.id, rule]))
+      for (const [id] of deferredAppliedRulesRef.current) {
+        const nextRule = nextRulesById.get(id)
+        if (!nextRule || isCompleteRule(nextRule)) {
+          deferredAppliedRulesRef.current.delete(id)
+        }
+      }
+
+      const appliedRules = nextRules.map((rule) => {
+        const deferredRule = deferredAppliedRulesRef.current.get(rule.id)
+        return deferredRule && !isCompleteRule(rule)
+          ? { ...deferredRule, logicalOperator: rule.logicalOperator }
+          : rule
+      })
 
-      const nextFilter = toAppliedPredicate(nextRules, columns, true)
+      const nextFilter = toAppliedPredicate(appliedRules, columns, true)
       const signature = JSON.stringify(nextFilter)
       if (signature === lastAppliedFilterRef.current) return
       lastAppliedFilterRef.current = signature