From 9fb56aeaf5bf22d3ec88c861015a004ceb86b4e1 Mon Sep 17 00:00:00 2001 From: Justin Blumencranz <96924014+j15z@users.noreply.github.com> Date: Fri, 14 Aug 2026 19:29:35 -0700 Subject: [PATCH 1/5] feat(tables): improve view and filter controls --- .../columns-menu/columns-menu.test.tsx | 55 ++++++ .../components/columns-menu/columns-menu.tsx | 51 +++--- .../components/table-filter/index.ts | 2 +- .../table-filter/table-filter.test.tsx | 162 ++++++++++++++++++ .../components/table-filter/table-filter.tsx | 143 +++++++++------- .../components/views-menu/views-menu.test.tsx | 43 +++++ .../components/views-menu/views-menu.tsx | 13 +- .../[workspaceId]/tables/[tableId]/table.tsx | 33 +++- apps/sim/hooks/queries/tables.test.ts | 32 ++++ apps/sim/hooks/queries/tables.ts | 3 + 10 files changed, 433 insertions(+), 104 deletions(-) create mode 100644 apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.test.tsx create mode 100644 apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.test.tsx diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.test.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.test.tsx new file mode 100644 index 00000000000..28f246a05a4 --- /dev/null +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.test.tsx @@ -0,0 +1,55 @@ +/** + * @vitest-environment jsdom + */ +import { act } from 'react' +import { createRoot, type Root } from 'react-dom/client' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { ColumnsMenu } from '@/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu' + +let container: HTMLDivElement +let root: Root + +beforeEach(() => { + globalThis.IS_REACT_ACT_ENVIRONMENT = true + container = document.createElement('div') + document.body.appendChild(container) + root = createRoot(container) +}) + +afterEach(() => { + act(() => root.unmount()) + container.remove() +}) + +describe('ColumnsMenu', () => { + it('uses the app menu typography and icon sizing shared by Sort', () => { + const onChange = vi.fn() + act(() => { + root.render( + + ) + }) + act(() => { + container + .querySelector('button') + ?.dispatchEvent(new MouseEvent('pointerdown', { bubbles: true, button: 0 })) + }) + + const item = document.body.querySelector('[role="menuitem"]') + expect(item).not.toBeNull() + expect(item).toHaveClass('text-small') + expect(item?.querySelector('svg')).toHaveClass('size-[14px]') + + act(() => item?.click()) + expect(onChange).toHaveBeenCalledWith(['col-name']) + expect(document.body.querySelector('[role="menuitem"]')).not.toBeNull() + }) +}) diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.tsx index 0409ee2cf6a..a7bbb0f9f95 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.tsx @@ -4,12 +4,10 @@ import { memo, useMemo, useState } from 'react' import { Chip, cn, - POPOVER_ANIMATION_CLASSES, - Popover, - PopoverContent, - PopoverItem, - PopoverSection, - PopoverTrigger, + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuTrigger, } from '@sim/emcn' import { Columns3, Eye, EyeOff } from '@sim/emcn/icons' import type { ColumnDefinition, WorkflowGroup } from '@/lib/table' @@ -78,30 +76,18 @@ export const ColumnsMenu = memo(function ColumnsMenu({ const hiddenCount = hiddenColumns.length return ( - - + + {/* `active` alone signals that something is hidden — the label stays fixed so the bar doesn't reflow as columns are toggled. */} 0} leftIcon={Columns3}> Columns - - + - - Columns -
{plain.map((col) => { const id = getColumnId(col) @@ -144,8 +130,8 @@ export const ColumnsMenu = memo(function ColumnsMenu({ ) })}
- - + + ) }) @@ -164,14 +150,17 @@ function ColumnToggleRow({ label, visible, partial, indented, onToggle }: Column const showing = visible || partial const Icon = showing ? Eye : EyeOff return ( - onToggle(!visible)} - className={cn('h-7 items-center gap-1.5 px-1.5 py-0 text-xs', indented && 'pl-5')} + { + event.preventDefault() + onToggle(!visible) + }} + className={cn(indented && 'pl-7')} > {label} - + ) } diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/index.ts b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/index.ts index 8cd08769fea..50e871c271a 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/index.ts +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/index.ts @@ -1 +1 @@ -export { TableFilter } from './table-filter' +export { TableFilter, type TableFilterHandle } from './table-filter' diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.test.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.test.tsx new file mode 100644 index 00000000000..1e9baccc51d --- /dev/null +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.test.tsx @@ -0,0 +1,162 @@ +/** + * @vitest-environment jsdom + */ +import { act, createRef, type Ref } from 'react' +import { createRoot, type Root } from 'react-dom/client' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import type { ColumnDefinition, TablePredicate } from '@/lib/table' +import { + FILTER_DEBOUNCE_MS, + TableFilter, + type TableFilterHandle, +} from '@/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter' + +const COLUMNS: ColumnDefinition[] = [{ id: 'col-name', name: 'Name', type: 'string' }] + +let container: HTMLDivElement +let root: Root + +beforeEach(() => { + globalThis.IS_REACT_ACT_ENVIRONMENT = true + vi.useFakeTimers() + container = document.createElement('div') + document.body.appendChild(container) + root = createRoot(container) +}) + +afterEach(() => { + act(() => root.unmount()) + container.remove() + vi.useRealTimers() +}) + +function renderFilter( + onChange: (filter: TablePredicate | null) => void, + filter: TablePredicate | null = null, + ref?: Ref +) { + act(() => { + root.render() + }) +} + +describe('TableFilter', () => { + it('applies text filters after a short typing delay', () => { + const onApply = vi.fn() + renderFilter(onApply) + const input = container.querySelector('input[placeholder="Enter a value"]') + expect(input).not.toBeNull() + + act(() => { + if (!input) return + Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')?.set?.call(input, 'Ada') + input.dispatchEvent(new Event('input', { bubbles: true })) + }) + + expect(onApply).not.toHaveBeenCalled() + act(() => vi.advanceTimersByTime(FILTER_DEBOUNCE_MS - 1)) + expect(onApply).not.toHaveBeenCalled() + act(() => vi.advanceTimersByTime(1)) + expect(onApply).toHaveBeenCalledWith({ + all: [{ field: 'col-name', op: 'eq', value: 'Ada' }], + }) + }) + + it('uses fixed AND conjunctions without apply or clear actions', () => { + renderFilter(vi.fn()) + const addFilter = Array.from(container.querySelectorAll('button')).find((button) => + button.textContent?.includes('Add filter') + ) + + act(() => addFilter?.click()) + + const conjunction = Array.from(container.querySelectorAll('*')).find( + (element) => element.textContent?.trim() === 'and' + ) + expect(conjunction).toBeDefined() + expect(conjunction?.closest('button')).toBeNull() + expect(container.textContent).not.toContain('Apply filter') + expect(container.textContent).not.toContain('Clear filters') + }) + + it('flushes the pending filter when the panel closes before the delay', () => { + const onChange = vi.fn() + const filterRef = createRef() + renderFilter(onChange, null, filterRef) + const input = container.querySelector('input[placeholder="Enter a value"]') + + act(() => { + if (!input) return + Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')?.set?.call(input, 'Ada') + input.dispatchEvent(new Event('input', { bubbles: true })) + }) + act(() => { + filterRef.current?.flush() + }) + + expect(onChange).toHaveBeenCalledTimes(1) + expect(onChange).toHaveBeenCalledWith({ + all: [{ field: 'col-name', op: 'eq', value: 'Ada' }], + }) + act(() => vi.advanceTimersByTime(FILTER_DEBOUNCE_MS)) + expect(onChange).toHaveBeenCalledTimes(1) + }) + + it('cancels the previous debounce when typing continues', () => { + const onChange = vi.fn() + renderFilter(onChange) + const input = container.querySelector('input[placeholder="Enter a value"]') + const setInput = (value: string) => { + if (!input) return + Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')?.set?.call(input, value) + input.dispatchEvent(new Event('input', { bubbles: true })) + } + + act(() => setInput('Ada')) + act(() => vi.advanceTimersByTime(FILTER_DEBOUNCE_MS - 1)) + act(() => setInput('Grace')) + act(() => vi.advanceTimersByTime(FILTER_DEBOUNCE_MS)) + + expect(onChange).toHaveBeenCalledTimes(1) + expect(onChange).toHaveBeenCalledWith({ + all: [{ field: 'col-name', op: 'eq', value: 'Grace' }], + }) + }) + + it('clears the active filter when its last rule is removed', () => { + const onChange = vi.fn() + renderFilter(onChange, { + all: [{ field: 'col-name', op: 'eq', value: 'Ada' }], + }) + + const removeButton = container.querySelector( + 'button[aria-label="Remove filter"]' + ) + act(() => removeButton?.click()) + act(() => vi.advanceTimersByTime(FILTER_DEBOUNCE_MS)) + + expect(onChange).toHaveBeenCalledWith(null) + expect( + container.querySelector('input[placeholder="Enter a value"]')?.value + ).toBe('') + }) + + it('normalizes a previously saved OR filter to AND', () => { + const onChange = vi.fn() + renderFilter(onChange, { + any: [ + { all: [{ field: 'col-name', op: 'eq', value: 'Ada' }] }, + { all: [{ field: 'col-name', op: 'eq', value: 'Grace' }] }, + ], + }) + + act(() => vi.advanceTimersByTime(FILTER_DEBOUNCE_MS)) + + expect(onChange).toHaveBeenCalledWith({ + all: [ + { field: 'col-name', op: 'eq', value: 'Ada' }, + { field: 'col-name', op: 'eq', value: 'Grace' }, + ], + }) + }) +}) diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx index 7ce7cc200f3..b3bc0887e3d 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx @@ -1,6 +1,15 @@ 'use client' -import { memo, useCallback, useMemo, useRef, useState } from 'react' +import { + forwardRef, + memo, + useCallback, + useEffect, + useImperativeHandle, + useMemo, + useRef, + useState, +} from 'react' import { Button, ChipDropdown, ChipInput } from '@sim/emcn' import { Plus, X } from '@sim/emcn/icons' import { generateShortId } from '@sim/utils/id' @@ -24,6 +33,8 @@ const MULTI_SELECT_COMPARISON_OPERATORS = COMPARISON_OPERATORS.filter((o) => MULTI_SELECT_FILTER_OPERATORS.has(o.value) ) +export const FILTER_DEBOUNCE_MS = 250 + function selectFilterOperators(column: ColumnDefinition | undefined): Set { return column?.multiple ? MULTI_SELECT_FILTER_OPERATORS : SINGLE_SELECT_FILTER_OPERATORS } @@ -31,18 +42,34 @@ function selectFilterOperators(column: ColumnDefinition | undefined): Set void - onClose: () => void + onChange: (filter: TablePredicate | null) => void +} + +export interface TableFilterHandle { + flush: () => void +} + +interface PendingFilter { + filter: TablePredicate | null + signature: string } -export function TableFilter({ columns, filter, onApply, onClose }: TableFilterProps) { +export const TableFilter = forwardRef(function TableFilter( + { columns, filter, onChange }, + ref +) { + const lastAppliedFilterRef = useRef(JSON.stringify(filter)) + const onChangeRef = useRef(onChange) + const pendingFilterRef = useRef(null) + const timeoutRef = useRef | null>(null) const [rules, setRules] = useState(() => { - const fromFilter = predicateToFilterRules(filter) + const fromFilter = predicateToFilterRules(filter).map((rule) => ({ + ...rule, + logicalOperator: 'and' as const, + })) return fromFilter.length > 0 ? fromFilter : [createRule(columns)] }) - - const rulesRef = useRef(rules) - rulesRef.current = rules + onChangeRef.current = onChange // `value` is the filter field key (column id); `label` is what the user sees. const columnOptions = useMemo( @@ -61,16 +88,12 @@ export function TableFilter({ columns, filter, onApply, onClose }: TableFilterPr const handleRemove = useCallback( (id: string) => { - const next = rulesRef.current.filter((r) => r.id !== id) - if (next.length === 0) { - onApply(null) - onClose() - setRules([createRule(columns)]) - } else { - setRules(next) - } + setRules((prev) => { + const next = prev.filter((rule) => rule.id !== id) + return next.length > 0 ? next : [createRule(columns)] + }) }, - [columns, onApply, onClose] + [columns] ) const handleUpdate = useCallback((id: string, field: keyof FilterRule, value: string) => { @@ -103,25 +126,44 @@ export function TableFilter({ columns, filter, onApply, onClose }: TableFilterPr [columnById] ) - const handleToggleLogical = useCallback((id: string) => { - setRules((prev) => - prev.map((r) => - r.id === id ? { ...r, logicalOperator: r.logicalOperator === 'and' ? 'or' : 'and' } : r - ) - ) + const flush = useCallback(() => { + const pending = pendingFilterRef.current + if (!pending) return + + if (timeoutRef.current) clearTimeout(timeoutRef.current) + timeoutRef.current = null + pendingFilterRef.current = null + lastAppliedFilterRef.current = pending.signature + onChangeRef.current(pending.filter) }, []) - const handleApply = useCallback(() => { - const validRules = rulesRef.current.filter( - (r) => r.column && (r.value || VALUELESS_OPERATORS.has(r.operator)) + useImperativeHandle(ref, () => ({ flush }), [flush]) + + useEffect(() => { + const validRules = rules.filter( + (rule) => rule.column && (rule.value || VALUELESS_OPERATORS.has(rule.operator)) ) - onApply(filterRulesToPredicate(validRules, columns)) - }, [columns, onApply]) + const nextFilter = filterRulesToPredicate(validRules, columns) + const signature = JSON.stringify(nextFilter) + if (signature === lastAppliedFilterRef.current) { + pendingFilterRef.current = null + return + } + + const pending = { filter: nextFilter, signature } + pendingFilterRef.current = pending + const timeout = setTimeout(() => { + if (pendingFilterRef.current !== pending) return + timeoutRef.current = null + flush() + }, FILTER_DEBOUNCE_MS) + timeoutRef.current = timeout - const handleClear = useCallback(() => { - setRules([createRule(columns)]) - onApply(null) - }, [columns, onApply]) + return () => { + clearTimeout(timeout) + if (timeoutRef.current === timeout) timeoutRef.current = null + } + }, [rules, columns, flush]) return (
@@ -136,12 +178,10 @@ export function TableFilter({ columns, filter, onApply, onClose }: TableFilterPr onUpdate={handleUpdate} onColumnChange={handleColumnChange} onRemove={handleRemove} - onApply={handleApply} - onToggleLogical={handleToggleLogical} /> ))} -
+
-
- {filter !== null && ( - - )} - -
) -} +}) interface FilterRuleRowProps { rule: FilterRule @@ -180,8 +205,6 @@ interface FilterRuleRowProps { onUpdate: (id: string, field: keyof FilterRule, value: string) => void onColumnChange: (id: string, columnId: string) => void onRemove: (id: string) => void - onApply: () => void - onToggleLogical: (id: string) => void } const FilterRuleRow = memo(function FilterRuleRow({ @@ -192,8 +215,6 @@ const FilterRuleRow = memo(function FilterRuleRow({ onUpdate, onColumnChange, onRemove, - onApply, - onToggleLogical, }: FilterRuleRowProps) { // Keep a stale column id selectable/visible (e.g. after the column was // removed) instead of falling back to the placeholder while the rule still @@ -226,12 +247,9 @@ const FilterRuleRow = memo(function FilterRuleRow({ {isFirst ? ( Where ) : ( - + + and + )} onUpdate(rule.id, 'value', e.target.value)} - onKeyDown={(e) => { - if (e.key === 'Enter') onApply() - }} placeholder='Enter a value' className='flex-1' /> diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx index b583ae03cce..a9a81054421 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx @@ -1,6 +1,8 @@ /** * @vitest-environment jsdom */ +import { act } from 'react' +import { createRoot } from 'react-dom/client' import { renderToStaticMarkup } from 'react-dom/server' import { describe, expect, it, vi } from 'vitest' import type { TableViewWire } from '@/lib/api/contracts/tables' @@ -17,6 +19,13 @@ const DEFAULT_VIEW: TableViewWire = { updatedAt: new Date('2026-08-15T01:00:00.000Z'), } +const SECOND_VIEW: TableViewWire = { + ...DEFAULT_VIEW, + id: 'view-second', + name: 'Second view', + isDefault: false, +} + function renderMenu(views: TableViewWire[], activeViewId: string | null): string { return renderToStaticMarkup( { expect(markup).toContain('All') expect(markup).not.toContain('>View<') }) + + it('offers a set-default action only for non-default views', () => { + const container = document.createElement('div') + document.body.appendChild(container) + const root = createRoot(container) + const onSetDefault = vi.fn() + + act(() => { + root.render( + + ) + }) + act(() => container.querySelector('button[aria-label="Views"]')?.click()) + + const actions = document.body.querySelectorAll( + 'button[aria-label="Set as default"]' + ) + expect(actions).toHaveLength(1) + act(() => actions[0]?.click()) + expect(onSetDefault).toHaveBeenCalledWith(SECOND_VIEW.id) + + act(() => root.unmount()) + container.remove() + }) }) diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx index 335bea769ef..94ceef62f84 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx @@ -13,7 +13,7 @@ import { PopoverItem, PopoverSection, } from '@sim/emcn' -import { Check, Pencil, Plus, Trash } from '@sim/emcn/icons' +import { Check, Pencil, Pin, Plus, Trash } from '@sim/emcn/icons' import type { TableViewWire } from '@/lib/api/contracts/tables' import { resolveTableViewSelection } from '@/app/workspace/[workspaceId]/tables/[tableId]/view-state' @@ -34,6 +34,7 @@ interface ViewsMenuProps { activeViewId: string | null onSelect: (viewId: string | null) => void onRename: (viewId: string) => void + onSetDefault: (viewId: string) => void onDelete: (viewId: string) => void /** Starts a blank view — named first, configured after. */ onNewView: () => void @@ -53,6 +54,7 @@ export const ViewsMenu = memo(function ViewsMenu({ activeViewId, onSelect, onRename, + onSetDefault, onDelete, onNewView, canEdit, @@ -151,6 +153,15 @@ export const ViewsMenu = memo(function ViewsMenu({ actions={ canEdit ? [ + ...(view.isDefault + ? [] + : [ + { + icon: Pin, + label: 'Set as default', + onClick: () => runAndClose(() => onSetDefault(view.id)), + }, + ]), { icon: Pencil, label: 'Rename', diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx index 812b5eb3209..968f2f5955d 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx @@ -80,6 +80,7 @@ import { type SelectionSnapshot, TableActionBar, TableFilter, + type TableFilterHandle, TableGrid, ViewsMenu, type WorkflowConfig, @@ -240,6 +241,7 @@ export function Table({ }) const [filter, setFilter] = useState(null) const [filterOpen, setFilterOpen] = useState(false) + const tableFilterRef = useRef(null) /** Bumped whenever the filter is replaced from outside the panel, to re-seed * its rule rows. See {@link replaceFilter}. */ const [filterSeed, setFilterSeed] = useState(0) @@ -669,6 +671,7 @@ export function Table({ const handleSelectView = useCallback( (viewId: string | null) => { + tableFilterRef.current?.flush() setTableParams({ view: viewId ?? ALL_VIEW_PARAM }) }, [setTableParams] @@ -678,6 +681,15 @@ export function Table({ setViewModal({ mode: 'rename', viewId }) }, []) + const handleSetDefaultView = useCallback((viewId: string) => { + updateViewMutation.mutate( + { viewId, isDefault: true }, + { + onError: (error) => toast.error(getErrorMessage(error, 'Failed to set default view')), + } + ) + }, []) + const handleNewView = useCallback(() => { setViewModal({ mode: 'new' }) }, []) @@ -1089,10 +1101,13 @@ export function Table({ [columnOptions, sortColumn, sortDirection, handleSortColumn, handleClearSort] ) - const handleFilterApply = (next: TablePredicate | null) => { - setFilter(next) - persistActiveViewConfig({ filter: next }) - } + const handleFilterChange = useCallback( + (next: TablePredicate | null) => { + setFilter(next) + persistActiveViewConfig({ filter: next }) + }, + [persistActiveViewConfig] + ) const handleHiddenColumnsChange = (next: string[]) => { setHiddenColumns(next) @@ -1329,7 +1344,10 @@ export function Table({ // Stable identity so the memoized Resource.Options can bail — an inline // object literal (with an inline arrow) would defeat its memo every render. - const handleToggleFilter = useCallback(() => setFilterOpen((prev) => !prev), []) + const handleToggleFilter = useCallback(() => { + if (filterOpen) tableFilterRef.current?.flush() + setFilterOpen(!filterOpen) + }, [filterOpen]) const filterConfig = useMemo( () => ({ mode: 'toggle' as const, @@ -1404,6 +1422,7 @@ export function Table({ activeViewId={activeView?.id ?? null} onSelect={handleSelectView} onRename={handleRenameView} + onSetDefault={handleSetDefaultView} onDelete={handleDeleteView} onNewView={handleNewView} canEdit={userPermissions.canEdit} @@ -1424,11 +1443,11 @@ export function Table({ /> {filterOpen && ( setFilterOpen(false)} + onChange={handleFilterChange} /> )} ({ toast: { error: vi.fn(), success: vi.fn() }, })) +import type { TableViewWire } from '@/lib/api/contracts/tables' import { tableRowsInfiniteOptions, tableRowsParamsKey, @@ -105,6 +106,37 @@ describe('useUpdateTableView autosave ordering', () => { queryKey: tableKeys.views(TABLE_ID), }) }) + + it('optimistically demotes the previous default when a view is promoted', () => { + const previousDefault: TableViewWire = { + id: 'view-default', + tableId: TABLE_ID, + name: 'Default', + config: {}, + isDefault: true, + createdBy: 'user-1', + createdAt: new Date('2026-08-15T01:00:00.000Z'), + updatedAt: new Date('2026-08-15T01:00:00.000Z'), + } + const promoted: TableViewWire = { + ...previousDefault, + id: 'view-promoted', + name: 'My view', + updatedAt: new Date('2026-08-15T02:00:00.000Z'), + } + setCache(tableKeys.views(TABLE_ID), [ + previousDefault, + { ...promoted, isDefault: false, updatedAt: previousDefault.updatedAt }, + ]) + + const hook = useUpdateTableView({ workspaceId: WORKSPACE_ID, tableId: TABLE_ID }) + hook.onSuccess?.(promoted, { viewId: promoted.id, isDefault: true }, undefined, undefined) + + expect(getCache(tableKeys.views(TABLE_ID))).toEqual([ + { ...previousDefault, isDefault: false }, + promoted, + ]) + }) }) describe('useDeleteColumn optimistic update', () => { diff --git a/apps/sim/hooks/queries/tables.ts b/apps/sim/hooks/queries/tables.ts index c2c9c4651d8..8198e79829f 100644 --- a/apps/sim/hooks/queries/tables.ts +++ b/apps/sim/hooks/queries/tables.ts @@ -1565,6 +1565,9 @@ export function useUpdateTableView({ workspaceId, tableId }: RowMutationContext) onSuccess: (view) => { queryClient.setQueryData(tableKeys.views(tableId), (prev) => prev?.map((existing) => { + if (view.isDefault && existing.id !== view.id && existing.isDefault) { + return { ...existing, isDefault: false } + } if (existing.id !== view.id) return existing // Layout and view controls auto-save concurrently, and their // responses can arrive out of order. The DB merge is authoritative, so From 5a1ffbd9fac48001c5e5007c8ad35712dbc265dd Mon Sep 17 00:00:00 2001 From: Justin Blumencranz <96924014+j15z@users.noreply.github.com> Date: Fri, 14 Aug 2026 19:58:17 -0700 Subject: [PATCH 2/5] fix(tables): keep menu actions open --- .../resource-options.test.tsx | 31 +++++ .../resource-options/resource-options.tsx | 10 +- .../columns-menu/columns-menu.test.tsx | 52 +++++--- .../components/views-menu/views-menu.test.tsx | 114 ++++++++++++++++-- .../components/views-menu/views-menu.tsx | 73 ++++++----- 5 files changed, 221 insertions(+), 59 deletions(-) diff --git a/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-options/resource-options.test.tsx b/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-options/resource-options.test.tsx index 7a8e6682153..bb825f886c5 100644 --- a/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-options/resource-options.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-options/resource-options.test.tsx @@ -67,4 +67,35 @@ describe('SortDropdown', () => { expect(item?.querySelector('[data-testid="column-icon"]')).not.toBeNull() expect(item?.querySelectorAll('svg')).toHaveLength(2) }) + + it('keeps the popup open while changing or clearing the sort', () => { + const onOpenChange = vi.fn() + const onSort = vi.fn() + const onClear = vi.fn() + act(() => { + root.render( + + ) + }) + + const items = document.body.querySelectorAll('[role="menuitem"]') + expect(items).toHaveLength(2) + + act(() => items[1]?.click()) + expect(onSort).toHaveBeenCalledWith('name', 'desc') + + act(() => items[0]?.click()) + expect(onClear).toHaveBeenCalledOnce() + expect(onOpenChange).not.toHaveBeenCalledWith(false) + expect(document.body.querySelectorAll('[role="menuitem"]')).toHaveLength(2) + }) }) diff --git a/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-options/resource-options.tsx b/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-options/resource-options.tsx index 101acc67ee8..3b4b44c370c 100644 --- a/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-options/resource-options.tsx +++ b/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-options/resource-options.tsx @@ -290,7 +290,12 @@ export const SortDropdown = memo(function SortDropdown({ > {active && onClear && ( <> - + { + event.preventDefault() + onClear() + }} + > Clear sort @@ -305,7 +310,8 @@ export const SortDropdown = memo(function SortDropdown({ return ( { + onSelect={(event) => { + event.preventDefault() if (isActive) { onSort(option.id, active.direction === 'asc' ? 'desc' : 'asc') } else { diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.test.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.test.tsx index 28f246a05a4..3c812909631 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu.test.tsx @@ -1,7 +1,7 @@ /** * @vitest-environment jsdom */ -import { act } from 'react' +import { act, useState } from 'react' import { createRoot, type Root } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { ColumnsMenu } from '@/app/workspace/[workspaceId]/tables/[tableId]/components/columns-menu/columns-menu' @@ -9,6 +9,26 @@ import { ColumnsMenu } from '@/app/workspace/[workspaceId]/tables/[tableId]/comp let container: HTMLDivElement let root: Root +function ColumnsMenuHarness({ onChange }: { onChange: (hiddenColumns: string[]) => void }) { + const [hiddenColumns, setHiddenColumns] = useState([]) + + return ( + { + setHiddenColumns(nextHiddenColumns) + onChange(nextHiddenColumns) + }} + /> + ) +} + beforeEach(() => { globalThis.IS_REACT_ACT_ENVIRONMENT = true container = document.createElement('div') @@ -22,20 +42,10 @@ afterEach(() => { }) describe('ColumnsMenu', () => { - it('uses the app menu typography and icon sizing shared by Sort', () => { + it('uses the app menu styling and stays open across column changes', () => { const onChange = vi.fn() act(() => { - root.render( - - ) + root.render() }) act(() => { container @@ -43,13 +53,17 @@ describe('ColumnsMenu', () => { ?.dispatchEvent(new MouseEvent('pointerdown', { bubbles: true, button: 0 })) }) - const item = document.body.querySelector('[role="menuitem"]') - expect(item).not.toBeNull() - expect(item).toHaveClass('text-small') - expect(item?.querySelector('svg')).toHaveClass('size-[14px]') + const items = document.body.querySelectorAll('[role="menuitem"]') + expect(items).toHaveLength(3) + expect(items[0]).toHaveClass('text-small') + expect(items[0]?.querySelector('svg')).toHaveClass('size-[14px]') - act(() => item?.click()) + act(() => items[0]?.click()) expect(onChange).toHaveBeenCalledWith(['col-name']) - expect(document.body.querySelector('[role="menuitem"]')).not.toBeNull() + + const remainingItems = document.body.querySelectorAll('[role="menuitem"]') + expect(remainingItems).toHaveLength(3) + act(() => remainingItems[1]?.click()) + expect(onChange).toHaveBeenLastCalledWith(['col-name', 'col-email']) }) }) diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx index a9a81054421..614ad42650e 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx @@ -4,7 +4,7 @@ import { act } from 'react' import { createRoot } from 'react-dom/client' import { renderToStaticMarkup } from 'react-dom/server' -import { describe, expect, it, vi } from 'vitest' +import { afterEach, describe, expect, it, vi } from 'vitest' import type { TableViewWire } from '@/lib/api/contracts/tables' import { ViewsMenu } from '@/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu' @@ -26,6 +26,15 @@ const SECOND_VIEW: TableViewWire = { isDefault: false, } +const PRIMARY_VIEW: TableViewWire = { + ...DEFAULT_VIEW, + name: 'Primary view', +} + +afterEach(() => { + vi.useRealTimers() +}) + function renderMenu(views: TableViewWire[], activeViewId: string | null): string { return renderToStaticMarkup( { expect(markup).not.toContain('>View<') }) - it('offers a set-default action only for non-default views', () => { + it('shows filled and outline pins without a Default badge and keeps the menu open', () => { const container = document.createElement('div') document.body.appendChild(container) const root = createRoot(container) @@ -65,8 +74,8 @@ describe('ViewsMenu', () => { act(() => { root.render( { }) act(() => container.querySelector('button[aria-label="Views"]')?.click()) - const actions = document.body.querySelectorAll( + const defaultPin = document.body.querySelector( + 'button[aria-label="Current default view"]' + ) + const setDefaultPin = document.body.querySelector( 'button[aria-label="Set as default"]' ) - expect(actions).toHaveLength(1) - act(() => actions[0]?.click()) + + expect(defaultPin?.querySelector('svg')).toHaveClass('fill-current') + expect(setDefaultPin?.querySelector('svg')).not.toHaveClass('fill-current') + expect(document.body).not.toHaveTextContent('Default') + + act(() => setDefaultPin?.click()) expect(onSetDefault).toHaveBeenCalledWith(SECOND_VIEW.id) + expect(document.body).toHaveTextContent('New view') + + act(() => root.unmount()) + container.remove() + }) + + it('keeps the menu open when keyboard focus moves from the trigger to the default pin', () => { + vi.useFakeTimers() + const container = document.createElement('div') + document.body.appendChild(container) + const root = createRoot(container) + + act(() => { + root.render( + + ) + }) + + const trigger = container.querySelector('button[aria-label="Views"]') + act(() => trigger?.focus()) + + const setDefaultPin = document.body.querySelector( + 'button[aria-label="Set as default"]' + ) + expect(setDefaultPin).not.toBeNull() + act(() => { + setDefaultPin?.focus() + vi.advanceTimersByTime(121) + }) + + expect(document.activeElement).toBe(setDefaultPin) + expect(document.body).toHaveTextContent('New view') + expect(document.body.querySelector('[data-native-surface-overlay]')).not.toBeNull() + + act(() => root.unmount()) + container.remove() + }) + + it('shows disabled pins without closing the menu for read-only members', () => { + const container = document.createElement('div') + document.body.appendChild(container) + const root = createRoot(container) + const onSetDefault = vi.fn() + + act(() => { + root.render( + + ) + }) + act(() => container.querySelector('button[aria-label="Views"]')?.click()) + + const defaultPin = document.body.querySelector( + 'button[aria-label="Current default view"]' + ) + const setDefaultPin = document.body.querySelector( + 'button[aria-label="Set as default"]' + ) + + expect(defaultPin?.querySelector('svg')).toHaveClass('fill-current') + expect(setDefaultPin?.querySelector('svg')).not.toHaveClass('fill-current') + expect(setDefaultPin).toBeDisabled() + + act(() => setDefaultPin?.click()) + + expect(onSetDefault).not.toHaveBeenCalled() + expect(document.body.querySelector('[data-native-surface-overlay]')).not.toBeNull() act(() => root.unmount()) container.remove() diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx index 94ceef62f84..b49f3d03bfe 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx @@ -23,11 +23,6 @@ export const ALL_ROWS_VIEW_LABEL = 'All' /** Matches the breadcrumb location popover's hover-intent grace period. */ const POPOVER_CLOSE_DELAY_MS = 120 -/** Rendered width of one action button (`p-1` + `size-3` glyph) plus its `gap-0.5`. - * The row reserves `actions.length` of these, so keep it in step with the button - * classes below — the overlay is absolutely positioned and can't size the spacer. */ -const VIEW_ACTION_SLOT_PX = 22 - interface ViewsMenuProps { views: TableViewWire[] /** `null` selects the legacy "All" state while a table awaits backfill. */ @@ -131,6 +126,7 @@ export const ViewsMenu = memo(function ViewsMenu({ )} onMouseEnter={openPopover} onMouseLeave={scheduleClose} + onFocusCapture={cancelScheduledClose} > Views @@ -148,20 +144,20 @@ export const ViewsMenu = memo(function ViewsMenu({ key={view.id} label={view.name} isActive={view.id === activeViewId} - isDefault={view.isDefault} onSelect={() => runAndClose(() => onSelect(view.id))} + defaultState={{ + isDefault: view.isDefault, + onSetDefault: + canEdit && !view.isDefault + ? () => { + cancelScheduledClose() + onSetDefault(view.id) + } + : undefined, + }} actions={ canEdit ? [ - ...(view.isDefault - ? [] - : [ - { - icon: Pin, - label: 'Set as default', - onClick: () => runAndClose(() => onSetDefault(view.id)), - }, - ]), { icon: Pencil, label: 'Rename', @@ -203,11 +199,16 @@ interface ViewRowAction { onClick: () => void } +interface ViewRowDefaultState { + isDefault: boolean + onSetDefault?: () => void +} + interface ViewRowProps { label: string isActive: boolean - isDefault?: boolean onSelect: () => void + defaultState?: ViewRowDefaultState actions?: ViewRowAction[] } @@ -217,7 +218,9 @@ interface ViewRowProps { * on hover via opacity, not `display`) so the name never reflows or sits * underneath them. */ -function ViewRow({ label, isActive, isDefault, onSelect, actions }: ViewRowProps) { +function ViewRow({ label, isActive, onSelect, defaultState, actions }: ViewRowProps) { + const actionCount = (actions?.length ?? 0) + (defaultState ? 1 : 0) + return (
} {label} - {isDefault && ( - - Default - - )} - {actions && ( + {actionCount > 0 && ( )} - {actions && ( -
- {actions.map((action) => ( + {actionCount > 0 && ( +
+ {actions?.map((action) => ( ))} + {defaultState && ( + + )}
)}
From e080527384a539860b020b51616d07ad401bf816 Mon Sep 17 00:00:00 2001 From: Justin Blumencranz <96924014+j15z@users.noreply.github.com> Date: Sat, 15 Aug 2026 19:47:47 -0700 Subject: [PATCH 3/5] fix(tables): guard view autosave against echo remounts and stale responses Co-Authored-By: Claude Fable 5 --- .../[workspaceId]/tables/[tableId]/table.tsx | 23 +++++++---- apps/sim/hooks/queries/tables.test.ts | 38 +++++++++++++++++++ apps/sim/hooks/queries/tables.ts | 23 ++++++----- 3 files changed, 68 insertions(+), 16 deletions(-) diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx index 968f2f5955d..3adec02dde8 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx @@ -252,8 +252,8 @@ export function Table({ const [{ sort: sortColumn, dir: sortDirection, view: activeViewId }, setTableParams] = useQueryStates(tableDetailParsers, tableDetailUrlKeys) - // Read-only mirrors for the resolve effect: it must know whether the user has - // already applied a filter / hidden columns without re-running when they change. + // Read-only mirrors for the resolve effect and replaceFilter's echo check: + // both must read the current values without re-running when they change. const filterRef = useRef(filter) filterRef.current = filter const hiddenColumnsRef = useRef(hiddenColumns) @@ -404,9 +404,13 @@ export function Table({ * this an open panel keeps showing the rules of the filter it replaced. * * The remount discards an unapplied draft, which is the point — the rules on - * screen must be the rules in effect. + * screen must be the rules in effect. An incoming filter identical to the + * current one is skipped entirely: the resolve effect re-applies the config + * after this client's own autosave settles, and letting that echo remount an + * open panel would wipe keystrokes typed since the flush and steal focus. */ const replaceFilter = useCallback((next: TablePredicate | null) => { + if (JSON.stringify(next) === JSON.stringify(filterRef.current)) return setFilter(next) setFilterSeed((seed) => seed + 1) }, []) @@ -1118,10 +1122,14 @@ export function Table({ * "Filter by cell value" from the grid's cell context menu. Narrows the * PRUNED filter, so a condition the current schema already invalidated is not * resurrected, and opens the panel — a silently narrowed table would leave the - * user no way to see what was applied. + * user no way to see what was applied. Persists explicitly: the reseeded + * panel starts signature-matched to this filter, so its debounce alone would + * never save it. */ const handleFilterByCellValue = (conditions: readonly Predicate[]) => { - replaceFilter(withCellValueFilter(effectiveFilter, conditions)) + const next = withCellValueFilter(effectiveFilter, conditions) + replaceFilter(next) + persistActiveViewConfig({ filter: next }) setFilterOpen(true) } @@ -1342,8 +1350,9 @@ export function Table({ // a one-line query forward. const { data: executionLog } = useLogByExecutionId(workspaceId, executionId) - // Stable identity so the memoized Resource.Options can bail — an inline - // object literal (with an inline arrow) would defeat its memo every render. + // Identity only changes with filterOpen (the flush targets the open panel), + // so unrelated parent re-renders still let the memoized Resource.Options + // bail; filterConfig below re-memoizes on filterOpen anyway. const handleToggleFilter = useCallback(() => { if (filterOpen) tableFilterRef.current?.flush() setFilterOpen(!filterOpen) diff --git a/apps/sim/hooks/queries/tables.test.ts b/apps/sim/hooks/queries/tables.test.ts index d0e63a31d86..0cdf1ea939d 100644 --- a/apps/sim/hooks/queries/tables.test.ts +++ b/apps/sim/hooks/queries/tables.test.ts @@ -137,6 +137,44 @@ describe('useUpdateTableView autosave ordering', () => { promoted, ]) }) + + it('ignores a stale promotion response instead of demoting the newer default', () => { + const newerDefault: TableViewWire = { + id: 'view-newer-default', + tableId: TABLE_ID, + name: 'Newer default', + config: {}, + isDefault: true, + createdBy: 'user-1', + createdAt: new Date('2026-08-15T01:00:00.000Z'), + updatedAt: new Date('2026-08-15T03:00:00.000Z'), + } + const stalePromotion: TableViewWire = { + ...newerDefault, + id: 'view-stale', + name: 'Stale view', + updatedAt: new Date('2026-08-15T01:00:00.000Z'), + } + const cachedStaleRow: TableViewWire = { + ...stalePromotion, + isDefault: false, + updatedAt: new Date('2026-08-15T02:00:00.000Z'), + } + setCache(tableKeys.views(TABLE_ID), [newerDefault, cachedStaleRow]) + + const hook = useUpdateTableView({ workspaceId: WORKSPACE_ID, tableId: TABLE_ID }) + hook.onSuccess?.( + stalePromotion, + { viewId: stalePromotion.id, isDefault: true }, + undefined, + undefined + ) + + expect(getCache(tableKeys.views(TABLE_ID))).toEqual([ + newerDefault, + cachedStaleRow, + ]) + }) }) describe('useDeleteColumn optimistic update', () => { diff --git a/apps/sim/hooks/queries/tables.ts b/apps/sim/hooks/queries/tables.ts index 8198e79829f..bb8eeead625 100644 --- a/apps/sim/hooks/queries/tables.ts +++ b/apps/sim/hooks/queries/tables.ts @@ -1563,19 +1563,24 @@ export function useUpdateTableView({ workspaceId, tableId }: RowMutationContext) // Keep the active view's server baseline current immediately; the refetch // remains the authoritative reconciliation for concurrent collaborators. onSuccess: (view) => { - queryClient.setQueryData(tableKeys.views(tableId), (prev) => - prev?.map((existing) => { + queryClient.setQueryData(tableKeys.views(tableId), (prev) => { + if (!prev) return prev + // Layout and view controls auto-save concurrently, and their + // responses can arrive out of order. The DB merge is authoritative, so + // only let a response at least as new as the cached row win — for + // installing the row AND for demoting the previous default. A stale + // response applies nothing; otherwise it would rewind the cache (or + // strip isDefault from a newer default, leaving none) until the + // refetch lands. + const cached = prev.find((existing) => existing.id === view.id) + if (cached && new Date(view.updatedAt) < new Date(cached.updatedAt)) return prev + return prev.map((existing) => { if (view.isDefault && existing.id !== view.id && existing.isDefault) { return { ...existing, isDefault: false } } - if (existing.id !== view.id) return existing - // Layout and view controls auto-save concurrently, and their - // responses can arrive out of order. The DB merge is authoritative, so - // only let a row at least as new as the cached one win — otherwise a - // slower response rewinds the cache until the refetch lands. - return new Date(view.updatedAt) >= new Date(existing.updatedAt) ? view : existing + return existing.id === view.id ? view : existing }) - ) + }) }, onSettled: () => { // A scoped mutation only needs the database write ahead of the next From de5766ca205c1360b9178e40ea0d5fe53fa4205b Mon Sep 17 00:00:00 2001 From: Justin Blumencranz <96924014+j15z@users.noreply.github.com> Date: Sat, 15 Aug 2026 19:47:48 -0700 Subject: [PATCH 4/5] fix(tables): keep and/or filter toggles, autosave only real edits Co-Authored-By: Claude Fable 5 --- .../table-filter/table-filter.test.tsx | 44 +++++++++++++-- .../components/table-filter/table-filter.tsx | 54 ++++++++++++++----- .../sim/lib/table/query-builder/converters.ts | 11 +++- 3 files changed, 89 insertions(+), 20 deletions(-) diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.test.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.test.tsx index 1e9baccc51d..d304202a49c 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.test.tsx @@ -62,7 +62,7 @@ describe('TableFilter', () => { }) }) - it('uses fixed AND conjunctions without apply or clear actions', () => { + it('offers a toggleable conjunction without apply or clear actions', () => { renderFilter(vi.fn()) const addFilter = Array.from(container.querySelectorAll('button')).find((button) => button.textContent?.includes('Add filter') @@ -70,11 +70,14 @@ describe('TableFilter', () => { act(() => addFilter?.click()) - const conjunction = Array.from(container.querySelectorAll('*')).find( - (element) => element.textContent?.trim() === 'and' + const conjunction = Array.from(container.querySelectorAll('button')).find( + (button) => button.textContent?.trim() === 'and' ) expect(conjunction).toBeDefined() - expect(conjunction?.closest('button')).toBeNull() + + act(() => conjunction?.click()) + expect(conjunction?.textContent?.trim()).toBe('or') + expect(container.textContent).not.toContain('Apply filter') expect(container.textContent).not.toContain('Clear filters') }) @@ -141,7 +144,34 @@ describe('TableFilter', () => { ).toBe('') }) - it('normalizes a previously saved OR filter to AND', () => { + it('preserves saved isNull conditions instead of dropping them', () => { + const onChange = vi.fn() + renderFilter(onChange, { all: [{ field: 'col-name', op: 'isNull' }] }) + + act(() => vi.advanceTimersByTime(FILTER_DEBOUNCE_MS)) + + expect(onChange).not.toHaveBeenCalled() + }) + + it('loads a saved OR filter verbatim without an unsolicited autosave', () => { + const onChange = vi.fn() + renderFilter(onChange, { + any: [ + { all: [{ field: 'col-name', op: 'eq', value: 'Ada' }] }, + { all: [{ field: 'col-name', op: 'eq', value: 'Grace' }] }, + ], + }) + + const orToggle = Array.from(container.querySelectorAll('button')).find( + (button) => button.textContent?.trim() === 'or' + ) + expect(orToggle).toBeDefined() + + act(() => vi.advanceTimersByTime(FILTER_DEBOUNCE_MS)) + expect(onChange).not.toHaveBeenCalled() + }) + + it('merges the OR groups when the conjunction is toggled back to and', () => { const onChange = vi.fn() renderFilter(onChange, { any: [ @@ -150,6 +180,10 @@ describe('TableFilter', () => { ], }) + const orToggle = Array.from(container.querySelectorAll('button')).find( + (button) => button.textContent?.trim() === 'or' + ) + act(() => orToggle?.click()) act(() => vi.advanceTimersByTime(FILTER_DEBOUNCE_MS)) expect(onChange).toHaveBeenCalledWith({ diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx index b3bc0887e3d..1333725d391 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx @@ -19,11 +19,11 @@ import { COMPARISON_OPERATORS, MULTI_SELECT_FILTER_OPERATORS, SINGLE_SELECT_FILTER_OPERATORS, - VALUELESS_OPERATORS, } from '@/lib/table/query-builder/constants' import { filterRulesToPredicate, predicateToFilterRules, + VALUELESS_OPS, } from '@/lib/table/query-builder/converters' const SINGLE_SELECT_COMPARISON_OPERATORS = COMPARISON_OPERATORS.filter((o) => @@ -39,6 +39,17 @@ function selectFilterOperators(column: ColumnDefinition | undefined): Set rule.column && (rule.value || VALUELESS_OPS.has(rule.operator)) + ) + return filterRulesToPredicate(validRules, columns) +} + interface TableFilterProps { columns: ColumnDefinition[] filter: TablePredicate | null @@ -58,17 +69,21 @@ export const TableFilter = forwardRef(funct { columns, filter, onChange }, ref ) { - const lastAppliedFilterRef = useRef(JSON.stringify(filter)) + const lastAppliedFilterRef = useRef(undefined) const onChangeRef = useRef(onChange) const pendingFilterRef = useRef(null) const timeoutRef = useRef | null>(null) const [rules, setRules] = useState(() => { - const fromFilter = predicateToFilterRules(filter).map((rule) => ({ - ...rule, - logicalOperator: 'and' as const, - })) + const fromFilter = predicateToFilterRules(filter) return fromFilter.length > 0 ? fromFilter : [createRule(columns)] }) + // Seed the "already applied" signature from the rules the panel actually + // renders, not the raw prop: a saved tree the flat builder cannot express + // (deeply nested groups, wire key order) round-trips differently, and seeding + // from the prop would schedule an unedited autosave of that lossy form the + // moment the panel opens. The normalized form persists only once the user + // really edits a rule. + lastAppliedFilterRef.current ??= JSON.stringify(toAppliedPredicate(rules, columns)) onChangeRef.current = onChange // `value` is the filter field key (column id); `label` is what the user sees. @@ -100,6 +115,14 @@ export const TableFilter = forwardRef(funct setRules((prev) => prev.map((r) => (r.id === id ? { ...r, [field]: value } : r))) }, []) + const handleToggleLogical = useCallback((id: string) => { + setRules((prev) => + prev.map((r) => + r.id === id ? { ...r, logicalOperator: r.logicalOperator === 'and' ? 'or' : 'and' } : r + ) + ) + }, []) + // Switching a rule's column across the select boundary changes what values and // operators are valid, so clear the value and coerce an unsupported operator // back to `eq` — otherwise a stale free-text value or a range operator would @@ -140,10 +163,7 @@ export const TableFilter = forwardRef(funct useImperativeHandle(ref, () => ({ flush }), [flush]) useEffect(() => { - const validRules = rules.filter( - (rule) => rule.column && (rule.value || VALUELESS_OPERATORS.has(rule.operator)) - ) - const nextFilter = filterRulesToPredicate(validRules, columns) + const nextFilter = toAppliedPredicate(rules, columns) const signature = JSON.stringify(nextFilter) if (signature === lastAppliedFilterRef.current) { pendingFilterRef.current = null @@ -178,6 +198,7 @@ export const TableFilter = forwardRef(funct onUpdate={handleUpdate} onColumnChange={handleColumnChange} onRemove={handleRemove} + onToggleLogical={handleToggleLogical} /> ))} @@ -205,6 +226,7 @@ interface FilterRuleRowProps { onUpdate: (id: string, field: keyof FilterRule, value: string) => void onColumnChange: (id: string, columnId: string) => void onRemove: (id: string) => void + onToggleLogical: (id: string) => void } const FilterRuleRow = memo(function FilterRuleRow({ @@ -215,6 +237,7 @@ const FilterRuleRow = memo(function FilterRuleRow({ onUpdate, onColumnChange, onRemove, + onToggleLogical, }: FilterRuleRowProps) { // Keep a stale column id selectable/visible (e.g. after the column was // removed) instead of falling back to the placeholder while the rule still @@ -247,9 +270,12 @@ const FilterRuleRow = memo(function FilterRuleRow({ {isFirst ? ( Where ) : ( - - and - + )} - {VALUELESS_OPERATORS.has(rule.operator) ? ( + {VALUELESS_OPS.has(rule.operator) ? (
) : isSelect ? ( (['isEmpty', 'isNotEmpty', 'isNull', 'isNotNull']) +/** Operators that carry no value — the full v2 set, a superset of the legacy + * `VALUELESS_OPERATORS` in constants.ts (which the `$`-grammar serializer + * still reads and must not grow). Widened to `ReadonlySet` so UI rule + * operators can be tested without a cast. */ +export const VALUELESS_OPS: ReadonlySet = new Set([ + 'isEmpty', + 'isNotEmpty', + 'isNull', + 'isNotNull', +]) function ruleToPredicate(rule: FilterRule, keepAsText = false): Predicate { const op = rule.operator as FilterOp From 0d6558099794e19650798b71952704ec42d3c678 Mon Sep 17 00:00:00 2001 From: Justin Blumencranz <96924014+j15z@users.noreply.github.com> Date: Sat, 15 Aug 2026 19:47:49 -0700 Subject: [PATCH 5/5] fix(tables): compute view-row action spacer and cover the default pin Co-Authored-By: Claude Fable 5 --- .../[tableId]/components/views-menu/views-menu.test.tsx | 4 ++++ .../tables/[tableId]/components/views-menu/views-menu.tsx | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx index 614ad42650e..9a98d10bc96 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.test.tsx @@ -102,6 +102,10 @@ describe('ViewsMenu', () => { expect(onSetDefault).toHaveBeenCalledWith(SECOND_VIEW.id) expect(document.body).toHaveTextContent('New view') + expect(defaultPin).toBeDisabled() + act(() => defaultPin?.click()) + expect(onSetDefault).toHaveBeenCalledTimes(1) + act(() => root.unmount()) container.remove() }) diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx index b49f3d03bfe..1d572f88d31 100644 --- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx +++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/views-menu/views-menu.tsx @@ -23,6 +23,11 @@ export const ALL_ROWS_VIEW_LABEL = 'All' /** Matches the breadcrumb location popover's hover-intent grace period. */ const POPOVER_CLOSE_DELAY_MS = 120 +/** Rendered width of one action button (`p-1` + `size-3` glyph) plus its `gap-0.5`. + * The row reserves `actionCount` of these, so keep it in step with the button + * classes below — the overlay is absolutely positioned and can't size the spacer. */ +const VIEW_ACTION_SLOT_PX = 22 + interface ViewsMenuProps { views: TableViewWire[] /** `null` selects the legacy "All" state while a table awaits backfill. */ @@ -235,7 +240,8 @@ function ViewRow({ label, isActive, onSelect, defaultState, actions }: ViewRowPr {actionCount > 0 && ( )}