-
Notifications
You must be signed in to change notification settings - Fork 3.7k
feat(tables): add select & multi-select column types #5873
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
TheodoreSpeaks
wants to merge
7
commits into
staging
Choose a base branch
from
feat/table-enum-type
base: staging
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
55bf638
feat(tables): add select/multiselect column types (backend)
TheodoreSpeaks d270a0f
feat(tables): select/multiselect column UI
TheodoreSpeaks 1fdfa3c
fix(tables): auto-fit select columns on option labels, not ids
TheodoreSpeaks b5ad728
feat(tables): default select options to grey, drop color picker for now
TheodoreSpeaks f7c6dd8
fix(tables): guard select type conversion, escape, and required clear
TheodoreSpeaks fce848c
fix(tables): block emptying required multiselect, skip no-op cell writes
TheodoreSpeaks 4db5e88
fix(tables): expanded multiselect string value + same-type options drop
TheodoreSpeaks File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/select-field/index.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| export { SelectOptionsEditor } from './select-options-editor' | ||
| export { resolveSelectOptions, SelectPill, toSelectedIds } from './select-pill' | ||
| export { SelectValueEditor } from './select-value-editor' |
61 changes: 61 additions & 0 deletions
61
...orkspace/[workspaceId]/tables/[tableId]/components/select-field/select-options-editor.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| 'use client' | ||
|
|
||
| import { Button, ChipInput } from '@sim/emcn' | ||
| import { Plus, Trash } from '@sim/emcn/icons' | ||
| import { generateShortId } from '@sim/utils/id' | ||
| import type { SelectOption } from '@/lib/table' | ||
|
|
||
| interface SelectOptionsEditorProps { | ||
| options: SelectOption[] | ||
| onChange: (options: SelectOption[]) => void | ||
| } | ||
|
|
||
| /** | ||
| * Add/remove/rename the options of a `select`/`multiselect` column. Option ids | ||
| * are stable across edits so existing cell data survives renames. Options | ||
| * default to the neutral `gray` pill — per-option colors are not yet exposed | ||
| * (the `color` field stays in the model so a picker can be re-added later). | ||
| */ | ||
| export function SelectOptionsEditor({ options, onChange }: SelectOptionsEditorProps) { | ||
| const update = (id: string, patch: Partial<SelectOption>) => { | ||
| onChange(options.map((o) => (o.id === id ? { ...o, ...patch } : o))) | ||
| } | ||
|
|
||
| const remove = (id: string) => { | ||
| onChange(options.filter((o) => o.id !== id)) | ||
| } | ||
|
|
||
| const add = () => { | ||
| onChange([...options, { id: generateShortId(), name: '', color: 'gray' }]) | ||
| } | ||
|
|
||
| return ( | ||
| <div className='flex flex-col gap-2'> | ||
| {options.map((option) => ( | ||
| <div key={option.id} className='flex items-center gap-1.5'> | ||
| <ChipInput | ||
| value={option.name} | ||
| onChange={(e) => update(option.id, { name: e.target.value })} | ||
| placeholder='Option name' | ||
| spellCheck={false} | ||
| autoComplete='off' | ||
| className='min-w-0 flex-1' | ||
| /> | ||
| <Button | ||
| variant='ghost' | ||
| size='sm' | ||
| onClick={() => remove(option.id)} | ||
| className='!p-1 size-7 shrink-0' | ||
| aria-label={`Remove ${option.name || 'option'}`} | ||
| > | ||
| <Trash className='size-[14px]' /> | ||
| </Button> | ||
| </div> | ||
| ))} | ||
| <Button variant='default' size='sm' onClick={add} className='self-start'> | ||
| <Plus className='size-[14px]' /> | ||
| Add option | ||
| </Button> | ||
| </div> | ||
| ) | ||
| } |
39 changes: 39 additions & 0 deletions
39
.../sim/app/workspace/[workspaceId]/tables/[tableId]/components/select-field/select-pill.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| 'use client' | ||
|
|
||
| import { Badge, cn } from '@sim/emcn' | ||
| import type { ColumnDefinition, SelectOption } from '@/lib/table' | ||
|
|
||
| /** Reads the selected option ids from a stored cell value of either select type. */ | ||
| export function toSelectedIds(value: unknown): string[] { | ||
| if (Array.isArray(value)) return value.filter((v): v is string => typeof v === 'string') | ||
| if (typeof value === 'string' && value !== '') return [value] | ||
| return [] | ||
| } | ||
|
|
||
| /** | ||
| * Resolves the stored ids of a `select`/`multiselect` cell to their declared | ||
| * options, preserving selection order. An id with no matching option (stale | ||
| * after an option was deleted) resolves to a neutral gray fallback so the cell | ||
| * never renders blank. | ||
| */ | ||
| export function resolveSelectOptions(column: ColumnDefinition, value: unknown): SelectOption[] { | ||
| const options = column.options ?? [] | ||
| return toSelectedIds(value).map( | ||
| (id) => options.find((o) => o.id === id) ?? { id, name: id, color: 'gray' } | ||
| ) | ||
| } | ||
|
|
||
| interface SelectPillProps { | ||
| option: SelectOption | ||
| size?: 'sm' | 'md' | ||
| className?: string | ||
| } | ||
|
|
||
| /** A single colored option pill, rendered through the shared `Badge` palette. */ | ||
| export function SelectPill({ option, size = 'sm', className }: SelectPillProps) { | ||
| return ( | ||
| <Badge variant={option.color} size={size} className={cn('max-w-full', className)}> | ||
| <span className='truncate'>{option.name}</span> | ||
| </Badge> | ||
| ) | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.