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
Database improvements
Hakan Shehu0c82846791d2
diff --git a/desktop/src/components/databases/boards/board-view.tsx b/desktop/src/components/databases/boards/board-view.tsxindex 098d8631..f2598680 100644--- a/desktop/src/components/databases/boards/board-view.tsx+++ b/desktop/src/components/databases/boards/board-view.tsx@@ -1,8 +1,8 @@import React from 'react';-import { LocalNode } from '@/types/nodes';+import { BoardViewNode } from '@/types/databases';interface BoardViewProps {- node: LocalNode;+ node: BoardViewNode;}export const BoardView = ({ node }: BoardViewProps) => {diff --git a/desktop/src/components/databases/calendars/calendar-view.tsx b/desktop/src/components/databases/calendars/calendar-view.tsxindex 93e55452..701036d1 100644--- a/desktop/src/components/databases/calendars/calendar-view.tsx+++ b/desktop/src/components/databases/calendars/calendar-view.tsx@@ -1,8 +1,8 @@import React from 'react';-import { LocalNode } from '@/types/nodes';+import { CalendarViewNode } from '@/types/databases';interface CalendarViewProps {- node: LocalNode;+ node: CalendarViewNode;}export const CalendarView = ({ node }: CalendarViewProps) => {diff --git a/desktop/src/components/databases/database-views.tsx b/desktop/src/components/databases/database-views.tsxindex 0e9ed466..d25d308d 100644--- a/desktop/src/components/databases/database-views.tsx+++ b/desktop/src/components/databases/database-views.tsx@@ -28,7 +28,7 @@ export const DatabaseViews = ({ views }: DatabaseViewsProps) => {))}<ViewCreateButton /></div>- <ViewActions />+ {selectedView && <ViewActions viewId={selectedView.id} />}</div>{selectedView && <View node={selectedView} />}</div>diff --git a/desktop/src/components/databases/filters/view-filter-field-dropdown.tsx b/desktop/src/components/databases/filters/view-filter-field-dropdown.tsxnew file mode 100644index 00000000..82659278--- /dev/null+++ b/desktop/src/components/databases/filters/view-filter-field-dropdown.tsx@@ -0,0 +1,60 @@+import React from 'react';+import { useDatabase } from '@/contexts/database';+import { Button } from '@/components/ui/button';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@/components/ui/dropdown-menu';+import { Icon } from '@/components/ui/icon';+import { getFieldIcon } from '@/lib/databases';++interface ViewFilterFieldDropdownProps {+ value: string;+ onChange: (value: string) => void;+}++export const ViewFilterFieldDropdown = ({+ value,+ onChange,+}: ViewFilterFieldDropdownProps) => {+ const database = useDatabase();+ if (database.fields.length === 0) {+ return null;+ }++ const selectedField =+ database.fields.find((field) => field.id === value) ?? database.fields[0];++ return (+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button+ variant="outline"+ size="sm"+ className="flex flex-row items-center gap-1 px-2 py-1"+ >+ <Icon name={getFieldIcon(selectedField.dataType)} />+ <span>{selectedField.name}</span>+ <Icon name="arrow-down-s-line" className="ml-2" />+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent className="mr-5 w-56">+ {database.fields.map((item) => (+ <DropdownMenuItem+ key={item.id}+ onClick={() => {+ onChange(item.id);+ }}+ >+ <div className="flex w-full flex-row items-center gap-2">+ <Icon name={getFieldIcon(item.dataType)} />+ <p className="flex-grow">{item.name}</p>+ </div>+ </DropdownMenuItem>+ ))}+ </DropdownMenuContent>+ </DropdownMenu>+ );+};diff --git a/desktop/src/components/databases/filters/view-filter-operator-dropdown.tsx b/desktop/src/components/databases/filters/view-filter-operator-dropdown.tsxnew file mode 100644index 00000000..0512176d--- /dev/null+++ b/desktop/src/components/databases/filters/view-filter-operator-dropdown.tsx@@ -0,0 +1,51 @@+import React from 'react';+import { Button } from '@/components/ui/button';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@/components/ui/dropdown-menu';+import { Icon } from '@/components/ui/icon';+import { FieldFilterOperator } from '@/lib/databases';++interface ViewFilterOperatorDropdownProps {+ operators: FieldFilterOperator[];+ value: FieldFilterOperator;+ onChange: (value: FieldFilterOperator) => void;+}++export const ViewFilterOperatorDropdown = ({+ operators,+ value,+ onChange,+}: ViewFilterOperatorDropdownProps) => {+ return (+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button+ variant="outline"+ size="sm"+ className="flex flex-row items-center gap-1 px-2 py-1"+ >+ <span>{value.label}</span>+ <Icon name="arrow-down-s-line" className="ml-2" />+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent className="mr-5 w-56">+ {operators.map((item) => (+ <DropdownMenuItem+ key={item.value}+ onClick={() => {+ onChange(item);+ }}+ >+ <div className="flex w-full flex-row items-center gap-2">+ <p className="flex-grow">{item.label}</p>+ </div>+ </DropdownMenuItem>+ ))}+ </DropdownMenuContent>+ </DropdownMenu>+ );+};diff --git a/desktop/src/components/databases/filters/view-filter.tsx b/desktop/src/components/databases/filters/view-filter.tsxnew file mode 100644index 00000000..0e25123d--- /dev/null+++ b/desktop/src/components/databases/filters/view-filter.tsx@@ -0,0 +1,72 @@+import React from 'react';+import { ViewFilterNode } from '@/types/databases';+import { ViewFilterFieldDropdown } from '@/components/databases/filters/view-filter-field-dropdown';+import { ViewFilterOperatorDropdown } from '@/components/databases/filters/view-filter-operator-dropdown';+import { Icon } from '@/components/ui/icon';+import { useDatabase } from '@/contexts/database';+import { getFieldFilterOperators } from '@/lib/databases';++interface ViewFilterProps {+ filter: ViewFilterNode;+ onChange: (filter: ViewFilterNode) => void;+ onRemove: () => void;+}++export const ViewFilter = ({ filter, onChange, onRemove }: ViewFilterProps) => {+ const database = useDatabase();+ const field = database.fields.find((field) => field.id === filter.fieldId);+ if (!field) {+ return null;+ }++ const operators = getFieldFilterOperators(field.dataType);+ if (operators.length === 0) {+ return null;+ }++ const operator =+ operators.find((operator) => operator.value === filter.operator) ??+ operators[0];++ const showInput = true;+ return (+ <div className="flex flex-row gap-2 p-1">+ <ViewFilterFieldDropdown+ value={filter.fieldId}+ onChange={(field) => {+ onChange({+ ...filter,+ fieldId: field,+ });+ }}+ />+ <ViewFilterOperatorDropdown+ operators={operators}+ value={operator}+ onChange={(operator) => {+ onChange({+ ...filter,+ operator: operator.value,+ });+ }}+ />+ <div className="flex-1">+ {/* {showInput && (+ <FieldFilterInput+ field={field}+ filter={filter}+ setFilter={onChange}+ />+ )} */}+ <p>input</p>+ </div>+ <div+ role="presentation"+ className="ml-auto flex cursor-pointer items-center text-muted-foreground"+ onClick={onRemove}+ >+ <Icon name="delete-bin-line" />+ </div>+ </div>+ );+};diff --git a/desktop/src/components/databases/filters/view-filters-popover.tsx b/desktop/src/components/databases/filters/view-filters-popover.tsxnew file mode 100644index 00000000..d7ea1589--- /dev/null+++ b/desktop/src/components/databases/filters/view-filters-popover.tsx@@ -0,0 +1,25 @@+import React from 'react';+import { Icon } from '@/components/ui/icon';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/components/ui/popover';++export const ViewFiltersPopover = () => {+ return (+ <Popover>+ <PopoverTrigger asChild>+ <div className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-gray-50">+ <Icon name="filter-line" />+ </div>+ </PopoverTrigger>+ <PopoverContent+ align="end"+ className="mr-4 flex w-[600px] flex-col gap-1.5 p-2"+ >+ filters goes here+ </PopoverContent>+ </Popover>+ );+};diff --git a/desktop/src/components/databases/tables/table-view-settings.tsx b/desktop/src/components/databases/tables/table-view-settings.tsxnew file mode 100644index 00000000..b72828bd--- /dev/null+++ b/desktop/src/components/databases/tables/table-view-settings.tsx@@ -0,0 +1,5 @@+import React from 'react';++export const TableViewSettings = () => {+ return <div>TableViewSettings</div>;+};diff --git a/desktop/src/components/databases/view-actions.tsx b/desktop/src/components/databases/view-actions.tsxindex 1bfeeaf1..4bc55b41 100644--- a/desktop/src/components/databases/view-actions.tsx+++ b/desktop/src/components/databases/view-actions.tsx@@ -1,14 +1,18 @@import React from 'react';import { ViewSettingsButton } from '@/components/databases/view-settings-button';import { ViewSortButton } from '@/components/databases/view-sort-button';-import { ViewFilterButton } from '@/components/databases/view-filter-button';+import { ViewFiltersPopover } from '@/components/databases/filters/view-filters-popover';-export const ViewActions = () => {+interface ViewActionsProps {+ viewId: string;+}++export const ViewActions = ({ viewId }: ViewActionsProps) => {return (<div className="invisible flex flex-row items-center justify-end group-hover/database:visible"><ViewSettingsButton /><ViewSortButton />- <ViewFilterButton />+ <ViewFiltersPopover /></div>);};diff --git a/desktop/src/components/databases/view-filter-button.tsx b/desktop/src/components/databases/view-filter-button.tsxdeleted file mode 100644index 27582ad2..00000000--- a/desktop/src/components/databases/view-filter-button.tsx+++ /dev/null@@ -1,10 +0,0 @@-import React from 'react';-import { Icon } from '@/components/ui/icon';--export const ViewFilterButton = () => {- return (- <div className="flex cursor-pointer items-center rounded-md p-1.5 hover:bg-gray-50">- <Icon name="filter-line" />- </div>- );-};diff --git a/desktop/src/components/databases/view.tsx b/desktop/src/components/databases/view.tsxindex 6ca97769..b70bc453 100644--- a/desktop/src/components/databases/view.tsx+++ b/desktop/src/components/databases/view.tsx@@ -1,6 +1,8 @@import React from 'react';import { ViewNode } from '@/types/databases';import { TableView } from '@/components/databases/tables/table-view';+import { BoardView } from '@/components/databases/boards/board-view';+import { CalendarView } from '@/components/databases/calendars/calendar-view';interface ViewProps {node: ViewNode;@@ -11,5 +13,13 @@ export const View = ({ node }: ViewProps) => {return <TableView node={node} />;}+ if (node.type === 'board_view') {+ return <BoardView node={node} />;+ }++ if (node.type === 'calendar_view') {+ return <CalendarView node={node} />;+ }+return null;};diff --git a/desktop/src/contexts/view.ts b/desktop/src/contexts/view.tsnew file mode 100644index 00000000..24c40677--- /dev/null+++ b/desktop/src/contexts/view.ts@@ -0,0 +1,14 @@+import { ViewFilterNode } from '@/types/databases';+import { createContext, useContext } from 'react';++interface ViewContext {+ id: string;+ filters: ViewFilterNode[];+ addFilter: (filter: ViewFilterNode) => void;+ removeFilter: (id: string) => void;+ updateFilter: (id: string, filter: ViewFilterNode) => void;+}++export const ViewContext = createContext<ViewContext>({} as ViewContext);++export const useView = () => useContext(ViewContext);diff --git a/desktop/src/lib/databases.ts b/desktop/src/lib/databases.tsindex d951b9f4..1db656fc 100644--- a/desktop/src/lib/databases.ts+++ b/desktop/src/lib/databases.ts@@ -148,3 +148,332 @@ export const getRandomSelectOptionColor = (): string => {Math.floor(Math.random() * selectOptionColors.length)].value;};++export interface FieldFilterOperator {+ label: string;+ value: string;+}++export const booleanFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is True',+ value: 'is_true',+ },+ {+ label: 'Is False',+ value: 'is_false',+ },+];++export const collaboratorFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+ {+ label: 'Is Me',+ value: 'is_me',+ },+ {+ label: 'Is Not Me',+ value: 'is_not_me',+ },+ {+ label: 'Is In',+ value: 'is_in',+ },+ {+ label: 'Is Not In',+ value: 'is_not_in',+ },+];++export const createdAtFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Equal To',+ value: 'is_equal_to',+ },+ {+ label: 'Is Not Equal To',+ value: 'is_not_equal_to',+ },+];++export const createdByFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Me',+ value: 'is_me',+ },+ {+ label: 'Is Not Me',+ value: 'is_not_me',+ },+ {+ label: 'Is In',+ value: 'is_in',+ },+ {+ label: 'Is Not In',+ value: 'is_not_in',+ },+];++export const dateFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+ {+ label: 'Is Equal To',+ value: 'is_equal_to',+ },+ {+ label: 'Is Not Equal To',+ value: 'is_not_equal_to',+ },+];++export const emailFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+ {+ label: 'Is Equal To',+ value: 'is_equal_to',+ },+ {+ label: 'Is Not Equal To',+ value: 'is_not_equal_to',+ },+ {+ label: 'Contains',+ value: 'contains',+ },+ {+ label: 'Does Not Contain',+ value: 'does_not_contain',+ },+];++export const fileFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+ {+ label: 'Is In',+ value: 'is_in',+ },+ {+ label: 'Is Not In',+ value: 'is_not_in',+ },+];++export const multiSelectFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+ {+ label: 'Is In',+ value: 'is_in',+ },+ {+ label: 'Is Not In',+ value: 'is_not_in',+ },+];++export const numberFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+ {+ label: 'Is Equal To',+ value: 'is_equal_to',+ },+ {+ label: 'Is Not Equal To',+ value: 'is_not_equal_to',+ },+ {+ label: 'Is Greater Than',+ value: 'is_greater_than',+ },+ {+ label: 'Is Less Than',+ value: 'is_less_than',+ },+ {+ label: 'Is Greater Than Or Equal To',+ value: 'is_greater_than_or_equal_to',+ },+ {+ label: 'Is Less Than Or Equal To',+ value: 'is_less_than_or_equal_to',+ },+];++export const phoneFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+ {+ label: 'Is Equal To',+ value: 'is_equal_to',+ },+ {+ label: 'Is Not Equal To',+ value: 'is_not_equal_to',+ },+ {+ label: 'Contains',+ value: 'contains',+ },+ {+ label: 'Does Not Contain',+ value: 'does_not_contain',+ },+];++export const selectFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+ {+ label: 'Is In',+ value: 'is_in',+ },+ {+ label: 'Is Not In',+ value: 'is_not_in',+ },+];++export const textFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+ {+ label: 'Is Equal To',+ value: 'is_equal_to',+ },+ {+ label: 'Is Not Equal To',+ value: 'is_not_equal_to',+ },+ {+ label: 'Contains',+ value: 'contains',+ },+ {+ label: 'Does Not Contain',+ value: 'does_not_contain',+ },+];++export const urlFieldFilterOperators: FieldFilterOperator[] = [+ {+ label: 'Is Empty',+ value: 'is_empty',+ },+ {+ label: 'Is Not Empty',+ value: 'is_not_empty',+ },+ {+ label: 'Is Equal To',+ value: 'is_equal_to',+ },+ {+ label: 'Is Not Equal To',+ value: 'is_not_equal_to',+ },+ {+ label: 'Contains',+ value: 'contains',+ },+ {+ label: 'Does Not Contain',+ value: 'does_not_contain',+ },+];++export const getFieldFilterOperators = (+ dataType: FieldDataType,+): FieldFilterOperator[] => {+ if (!dataType) return [];++ switch (dataType) {+ case 'boolean':+ return booleanFieldFilterOperators;+ case 'collaborator':+ return collaboratorFieldFilterOperators;+ case 'created_at':+ return createdAtFieldFilterOperators;+ case 'created_by':+ return createdByFieldFilterOperators;+ case 'date':+ return dateFieldFilterOperators;+ case 'email':+ return emailFieldFilterOperators;+ case 'file':+ return fileFieldFilterOperators;+ case 'multi_select':+ return multiSelectFieldFilterOperators;+ case 'number':+ return numberFieldFilterOperators;+ case 'phone':+ return phoneFieldFilterOperators;+ case 'select':+ return selectFieldFilterOperators;+ case 'text':+ return textFieldFilterOperators;+ case 'url':+ return urlFieldFilterOperators;+ default:+ return [];+ }+};diff --git a/desktop/src/types/databases.ts b/desktop/src/types/databases.tsindex 626f8de5..3859d4e8 100644--- a/desktop/src/types/databases.ts+++ b/desktop/src/types/databases.ts@@ -19,18 +19,21 @@ export type TableViewNode = {fieldWidths: Record<string, number>;nameWidth: number;versionId: string;+ filters: ViewFilterNode[];};export type BoardViewNode = {id: string;name: string;type: 'board_view';+ filters: ViewFilterNode[];};export type CalendarViewNode = {id: string;name: string;type: 'calendar_view';+ filters: ViewFilterNode[];};export type FieldDataType =@@ -172,3 +175,10 @@ export type RecordNode = {attributes: LocalNodeAttribute[];};++export type ViewFilterNode = {+ id: string;+ fieldId: string;+ operator: string;+ value: number | string | string[] | null;+};