Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Implement filters for select and multi select fields
Hakan Shehue7a1577f8449
diff --git a/desktop/src/components/databases/fields/select-field-options.tsx b/desktop/src/components/databases/fields/select-field-options.tsxindex 95d79edb..9f66c07a 100644--- a/desktop/src/components/databases/fields/select-field-options.tsx+++ b/desktop/src/components/databases/fields/select-field-options.tsx@@ -18,20 +18,22 @@ interface SelectFieldOptionsProps {field: SelectFieldNode | MultiSelectFieldNode;values: string[];onSelect: (id: string) => void;+ allowAdd: boolean;}export const SelectFieldOptions = ({field,values,onSelect,+ allowAdd,}: SelectFieldOptionsProps) => {const { mutate, isPending } = useSelectOptionCreateMutation();const [inputValue, setInputValue] = React.useState('');const [color, setColor] = React.useState(getRandomSelectOptionColor());- const allowAdd = !field.options?.some(- (option) => option.name === inputValue.trim(),- );+ const showNewOption =+ allowAdd &&+ !field.options?.some((option) => option.name === inputValue.trim());return (<Command className="min-h-min">@@ -91,7 +93,7 @@ export const SelectFieldOptions = ({})}</CommandGroup><CommandGroup>- {allowAdd && inputValue.length > 0 && (+ {showNewOption && inputValue.length > 0 && (<CommandItemkey={inputValue.trim()}value={inputValue.trim()}diff --git a/desktop/src/components/databases/filters/view-filters.tsx b/desktop/src/components/databases/filters/view-filters.tsxindex d2a08f9a..1f496cbe 100644--- a/desktop/src/components/databases/filters/view-filters.tsx+++ b/desktop/src/components/databases/filters/view-filters.tsx@@ -6,9 +6,11 @@ import { ViewNumberFieldFilter } from '@/components/databases/filters/view-numbeimport { ViewEmailFieldFilter } from '@/components/databases/filters/view-email-field-filter';import { ViewUrlFieldFilter } from '@/components/databases/filters/view-url-field-filter';import { ViewPhoneFieldFilter } from '@/components/databases/filters/view-phone-field-filter';-import { ViewFilterAddPopover } from './view-filter-add-popover';-import { Icon } from '@/components/ui/icon';import { ViewBooleanFieldFilter } from '@/components/databases/filters/view-boolean-field-filter';+import { ViewSelectFieldFilter } from '@/components/databases/filters/view-select-field-filter';+import { ViewMultiSelectFieldFilter } from '@/components/databases/filters/view-multi-select-field-filter';+import { ViewFilterAddPopover } from '@/components/databases/filters/view-filter-add-popover';+import { Icon } from '@/components/ui/icon';interface ViewFiltersProps {viewId: string;@@ -58,7 +60,13 @@ export const ViewFilters = ({ viewId, filters }: ViewFiltersProps) => {case 'file':return null;case 'multi_select':- return null;+ return (+ <ViewMultiSelectFieldFilter+ key={filter.id}+ field={field}+ filter={filter}+ />+ );case 'number':return (<ViewNumberFieldFilter@@ -76,7 +84,13 @@ export const ViewFilters = ({ viewId, filters }: ViewFiltersProps) => {/>);case 'select':- return null;+ return (+ <ViewSelectFieldFilter+ key={filter.id}+ field={field}+ filter={filter}+ />+ );case 'text':return (<ViewTextFieldFilterdiff --git a/desktop/src/components/databases/filters/view-multi-select-field-filter.tsx b/desktop/src/components/databases/filters/view-multi-select-field-filter.tsxnew file mode 100644index 00000000..d54ffc72--- /dev/null+++ b/desktop/src/components/databases/filters/view-multi-select-field-filter.tsx@@ -0,0 +1,162 @@+import React from 'react';+import { MultiSelectFieldNode, ViewFilterNode } from '@/types/databases';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/components/ui/popover';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@/components/ui/dropdown-menu';+import { Button } from '@/components/ui/button';+import { Icon } from '@/components/ui/icon';+import { getFieldIcon, selectFieldFilterOperators } from '@/lib/databases';+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';+import { AttributeTypes } from '@/lib/constants';+import { useNodeDeleteMutation } from '@/mutations/use-node-delete-mutation';+import { SelectFieldOptions } from '@/components/databases/fields/select-field-options';+import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';++interface ViewMultiSelectFieldFilterProps {+ field: MultiSelectFieldNode;+ filter: ViewFilterNode;+}++export const ViewMultiSelectFieldFilter = ({+ field,+ filter,+}: ViewMultiSelectFieldFilterProps) => {+ const [open, setOpen] = React.useState(false);+ const { mutate: upsertAttribute } = useNodeAttributeUpsertMutation();+ const { mutate: deleteAttribute } = useNodeAttributeDeleteMutation();+ const { mutate: deleteFilter } = useNodeDeleteMutation();++ const operator =+ selectFieldFilterOperators.find(+ (operator) => operator.value === filter.operator,+ ) ?? selectFieldFilterOperators[0];++ const selectOptionIds = filter.values.map((value) => value.foreignNodeId);+ const selectedOptions = field.options.filter((option) =>+ selectOptionIds.includes(option.id),+ );++ const hideInput =+ operator.value === 'is_empty' || operator.value === 'is_not_empty';++ return (+ <Popover open={open} onOpenChange={setOpen}>+ <PopoverTrigger asChild>+ <Button+ variant="outline"+ size="sm"+ className="border-dashed text-xs text-muted-foreground"+ >+ {field.name}+ </Button>+ </PopoverTrigger>+ <PopoverContent className="flex w-96 flex-col gap-2 p-2">+ <div className="flex flex-row items-center gap-3 text-sm">+ <div className="flex flex-row items-center gap-0.5 p-1">+ <Icon name={getFieldIcon(field.dataType)} className="h-4 w-4" />+ <p>{field.name}</p>+ </div>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold hover:cursor-pointer hover:bg-gray-100">+ <p>{operator.label}</p>+ <Icon+ name="arrow-down-s-line"+ className="h-4 w-4 text-muted-foreground"+ />+ </div>+ </DropdownMenuTrigger>+ <DropdownMenuContent>+ {selectFieldFilterOperators.map((operator) => (+ <DropdownMenuItem+ key={operator.value}+ onSelect={() => {+ upsertAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Operator,+ key: '1',+ textValue: operator.value,+ numberValue: null,+ foreignNodeId: null,+ });++ if (+ operator.value === 'is_empty' ||+ operator.value === 'is_not_empty'+ ) {+ deleteAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: '1',+ });+ }+ }}+ >+ {operator.label}+ </DropdownMenuItem>+ ))}+ </DropdownMenuContent>+ </DropdownMenu>+ <Button+ variant="ghost"+ size="icon"+ onClick={() => {+ deleteFilter(filter.id);+ }}+ >+ <Icon name="delete-bin-line" className="h-4 w-4" />+ </Button>+ </div>+ {!hideInput && (+ <Popover>+ <PopoverTrigger asChild>+ <div className="flex h-full w-full cursor-pointer flex-row items-center gap-1 rounded-md border border-input p-1">+ {selectedOptions.map((option) => (+ <SelectOptionBadge+ key={option.id}+ name={option.name}+ color={option.color}+ />+ ))}+ </div>+ </PopoverTrigger>+ <PopoverContent className="w-80 p-1">+ <SelectFieldOptions+ field={field}+ values={selectOptionIds}+ onSelect={(id) => {+ if (selectOptionIds.includes(id)) {+ deleteAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: id,+ });+ } else {+ upsertAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: id,+ foreignNodeId: id,+ textValue: null,+ numberValue: null,+ });+ }+ }}+ allowAdd={false}+ />+ </PopoverContent>+ </Popover>+ )}+ </PopoverContent>+ </Popover>+ );+};diff --git a/desktop/src/components/databases/filters/view-select-field-filter.tsx b/desktop/src/components/databases/filters/view-select-field-filter.tsxnew file mode 100644index 00000000..c244c939--- /dev/null+++ b/desktop/src/components/databases/filters/view-select-field-filter.tsx@@ -0,0 +1,162 @@+import React from 'react';+import { SelectFieldNode, ViewFilterNode } from '@/types/databases';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/components/ui/popover';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@/components/ui/dropdown-menu';+import { Button } from '@/components/ui/button';+import { Icon } from '@/components/ui/icon';+import { getFieldIcon, selectFieldFilterOperators } from '@/lib/databases';+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';+import { AttributeTypes } from '@/lib/constants';+import { useNodeDeleteMutation } from '@/mutations/use-node-delete-mutation';+import { SelectFieldOptions } from '@/components/databases/fields/select-field-options';+import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';++interface ViewSelectFieldFilterProps {+ field: SelectFieldNode;+ filter: ViewFilterNode;+}++export const ViewSelectFieldFilter = ({+ field,+ filter,+}: ViewSelectFieldFilterProps) => {+ const [open, setOpen] = React.useState(false);+ const { mutate: upsertAttribute } = useNodeAttributeUpsertMutation();+ const { mutate: deleteAttribute } = useNodeAttributeDeleteMutation();+ const { mutate: deleteFilter } = useNodeDeleteMutation();++ const operator =+ selectFieldFilterOperators.find(+ (operator) => operator.value === filter.operator,+ ) ?? selectFieldFilterOperators[0];++ const selectOptionIds = filter.values.map((value) => value.foreignNodeId);+ const selectedOptions = field.options.filter((option) =>+ selectOptionIds.includes(option.id),+ );++ const hideInput =+ operator.value === 'is_empty' || operator.value === 'is_not_empty';++ return (+ <Popover open={open} onOpenChange={setOpen}>+ <PopoverTrigger asChild>+ <Button+ variant="outline"+ size="sm"+ className="border-dashed text-xs text-muted-foreground"+ >+ {field.name}+ </Button>+ </PopoverTrigger>+ <PopoverContent className="flex w-96 flex-col gap-2 p-2">+ <div className="flex flex-row items-center gap-3 text-sm">+ <div className="flex flex-row items-center gap-0.5 p-1">+ <Icon name={getFieldIcon(field.dataType)} className="h-4 w-4" />+ <p>{field.name}</p>+ </div>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <div className="flex flex-grow flex-row items-center gap-1 rounded-md p-1 font-semibold hover:cursor-pointer hover:bg-gray-100">+ <p>{operator.label}</p>+ <Icon+ name="arrow-down-s-line"+ className="h-4 w-4 text-muted-foreground"+ />+ </div>+ </DropdownMenuTrigger>+ <DropdownMenuContent>+ {selectFieldFilterOperators.map((operator) => (+ <DropdownMenuItem+ key={operator.value}+ onSelect={() => {+ upsertAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Operator,+ key: '1',+ textValue: operator.value,+ numberValue: null,+ foreignNodeId: null,+ });++ if (+ operator.value === 'is_empty' ||+ operator.value === 'is_not_empty'+ ) {+ deleteAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: '1',+ });+ }+ }}+ >+ {operator.label}+ </DropdownMenuItem>+ ))}+ </DropdownMenuContent>+ </DropdownMenu>+ <Button+ variant="ghost"+ size="icon"+ onClick={() => {+ deleteFilter(filter.id);+ }}+ >+ <Icon name="delete-bin-line" className="h-4 w-4" />+ </Button>+ </div>+ {!hideInput && (+ <Popover>+ <PopoverTrigger asChild>+ <div className="flex h-full w-full cursor-pointer flex-row items-center gap-1 rounded-md border border-input p-1">+ {selectedOptions.map((option) => (+ <SelectOptionBadge+ key={option.id}+ name={option.name}+ color={option.color}+ />+ ))}+ </div>+ </PopoverTrigger>+ <PopoverContent className="w-80 p-1">+ <SelectFieldOptions+ field={field}+ values={selectOptionIds}+ onSelect={(id) => {+ if (selectOptionIds.includes(id)) {+ deleteAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: id,+ });+ } else {+ upsertAttribute({+ nodeId: filter.id,+ type: AttributeTypes.Value,+ key: id,+ foreignNodeId: id,+ textValue: null,+ numberValue: null,+ });+ }+ }}+ allowAdd={false}+ />+ </PopoverContent>+ </Popover>+ )}+ </PopoverContent>+ </Popover>+ );+};diff --git a/desktop/src/components/databases/tables/cells/table-view-multi-select-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-multi-select-cell.tsxindex b54ca2e6..735f6946 100644--- a/desktop/src/components/databases/tables/cells/table-view-multi-select-cell.tsx+++ b/desktop/src/components/databases/tables/cells/table-view-multi-select-cell.tsx@@ -87,6 +87,7 @@ export const TableViewMultiSelectCell = ({});}}}+ allowAdd={true}/></PopoverContent></Popover>diff --git a/desktop/src/components/databases/tables/cells/table-view-select-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-select-cell.tsxindex 4f63918b..3d7918c0 100644--- a/desktop/src/components/databases/tables/cells/table-view-select-cell.tsx+++ b/desktop/src/components/databases/tables/cells/table-view-select-cell.tsx@@ -65,6 +65,7 @@ export const TableViewSelectCell = ({<SelectFieldOptionsfield={field}values={[selectedValue]}+ allowAdd={true}onSelect={(id) => {if (isPending) {return;diff --git a/desktop/src/components/records/values/record-multi-select-value.tsx b/desktop/src/components/records/values/record-multi-select-value.tsxindex 0e75b472..3b8f1363 100644--- a/desktop/src/components/records/values/record-multi-select-value.tsx+++ b/desktop/src/components/records/values/record-multi-select-value.tsx@@ -87,6 +87,7 @@ export const RecordMultiSelectValue = ({});}}}+ allowAdd={true}/></PopoverContent></Popover>diff --git a/desktop/src/components/records/values/record-select-value.tsx b/desktop/src/components/records/values/record-select-value.tsxindex e5e52384..b9604623 100644--- a/desktop/src/components/records/values/record-select-value.tsx+++ b/desktop/src/components/records/values/record-select-value.tsx@@ -96,6 +96,7 @@ export const RecordSelectValue = ({}setSelectedValue(id);}}+ allowAdd={true}/></PopoverContent></Popover>