Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Implement infinite loading for tables, select field and other improvements

Hakan Shehua19b8a6269ff
diff --git a/desktop/src/components/databases/database-container-node.tsx b/desktop/src/components/databases/database-container-node.tsx
index e2581b02..f2f029d0 100644
--- a/desktop/src/components/databases/database-container-node.tsx
+++ b/desktop/src/components/databases/database-container-node.tsx
@@ -9,6 +9,7 @@ import { mapNode } from '@/lib/nodes';
import { DatabaseContext } from '@/contexts/database';
import { DatabaseViews } from './database-views';
import { ScrollArea } from '@/components/ui/scroll-area';
+import { mapField } from '@/lib/databases';
interface DatabaseContainerNodeProps {
node: LocalNode;
@@ -29,10 +30,22 @@ export const DatabaseContainerNode = ({ node }: DatabaseContainerNodeProps) => {
SELECT *
FROM nodes
WHERE parent_id = ${node.id} AND type IN (${sql.join(ViewNodeTypes)})
+ ),
+ select_option_nodes AS (
+ SELECT *
+ FROM nodes
+ WHERE parent_id IN
+ (
+ SELECT id
+ FROM field_nodes
+ )
+ AND type = ${NodeTypes.SelectOption}
)
SELECT * FROM field_nodes
UNION ALL
- SELECT * FROM view_nodes;
+ SELECT * FROM view_nodes
+ UNION ALL
+ SELECT * FROM select_option_nodes;
`.compile(workspace.schema);
return await workspace.queryAndSubscribe({
@@ -49,7 +62,15 @@ export const DatabaseContainerNode = ({ node }: DatabaseContainerNodeProps) => {
const rows = data?.rows ?? [];
const fieldNodes = rows
.filter((row) => row.type === NodeTypes.Field)
- .map((row) => mapNode(row));
+ .map((row) => {
+ const selectOptionRows =
+ rows.filter(
+ (selectOptionRow) =>
+ selectOptionRow.type === NodeTypes.SelectOption &&
+ selectOptionRow.parent_id === row.id,
+ ) ?? [];
+ return mapField(row, selectOptionRows);
+ });
const viewNodes = rows
.filter((row) => ViewNodeTypes.includes(row.type))
diff --git a/desktop/src/components/databases/fields/field-attrs.tsx b/desktop/src/components/databases/fields/field-attrs.tsx
index e5a14fd9..8607638c 100644
--- a/desktop/src/components/databases/fields/field-attrs.tsx
+++ b/desktop/src/components/databases/fields/field-attrs.tsx
@@ -1,5 +1,5 @@
import React from 'react';
export const FieldAttrs = () => {
- return <div>FieldAttrs</div>;
+ return <div></div>;
};
diff --git a/desktop/src/components/databases/fields/field-create-popover.tsx b/desktop/src/components/databases/fields/field-create-popover.tsx
index 29fa0668..bb790a41 100644
--- a/desktop/src/components/databases/fields/field-create-popover.tsx
+++ b/desktop/src/components/databases/fields/field-create-popover.tsx
@@ -42,12 +42,9 @@ const formSchema = z.object({
z.literal('date'),
z.literal('email'),
z.literal('file'),
- z.literal('formula'),
z.literal('multi_select'),
z.literal('number'),
z.literal('phone'),
- z.literal('relation'),
- z.literal('rollup'),
z.literal('select'),
z.literal('text'),
z.literal('updated_at'),
@@ -128,7 +125,7 @@ export const FieldCreatePopover = () => {
<PopoverTrigger asChild>
<Icon name="add-line" className="mr-2 h-3 w-3 cursor-pointer" />
</PopoverTrigger>
- <PopoverContent className="w-128 mr-5" side="bottom">
+ <PopoverContent className="mr-5 w-128" side="bottom">
<Form {...form}>
<form
className="flex flex-col gap-2"
diff --git a/desktop/src/components/databases/fields/field-type-select.tsx b/desktop/src/components/databases/fields/field-type-select.tsx
index 6d7a188b..54d69da0 100644
--- a/desktop/src/components/databases/fields/field-type-select.tsx
+++ b/desktop/src/components/databases/fields/field-type-select.tsx
@@ -24,10 +24,6 @@ interface FieldTypeOption {
}
const fieldTypes: FieldTypeOption[] = [
- {
- name: 'Autonumber',
- type: 'autonumber',
- },
{
name: 'Boolean',
type: 'boolean',
@@ -56,10 +52,6 @@ const fieldTypes: FieldTypeOption[] = [
name: 'File',
type: 'file',
},
- {
- name: 'Formula',
- type: 'formula',
- },
{
name: 'Multi Select',
type: 'multi_select',
@@ -72,14 +64,6 @@ const fieldTypes: FieldTypeOption[] = [
name: 'Phone',
type: 'phone',
},
- {
- name: 'Relation',
- type: 'relation',
- },
- {
- name: 'Rollup',
- type: 'rollup',
- },
{
name: 'Select',
type: 'select',
@@ -88,14 +72,6 @@ const fieldTypes: FieldTypeOption[] = [
name: 'Text',
type: 'text',
},
- {
- name: 'Last modified Date & Time',
- type: 'updated_at',
- },
- {
- name: 'Last modified by user',
- type: 'updated_by',
- },
{
name: 'Url',
type: 'url',
diff --git a/desktop/src/components/databases/fields/select-field-options.tsx b/desktop/src/components/databases/fields/select-field-options.tsx
new file mode 100644
index 00000000..1e34e325
--- /dev/null
+++ b/desktop/src/components/databases/fields/select-field-options.tsx
@@ -0,0 +1,184 @@
+import React from 'react';
+import {
+ Command,
+ CommandEmpty,
+ CommandGroup,
+ CommandInput,
+ CommandItem,
+ CommandList,
+} from '@/components/ui/command';
+import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';
+import { Icon } from '@/components/ui/icon';
+import { MultiSelectField, SelectField } from '@/types/databases';
+import { useWorkspace } from '@/contexts/workspace';
+import { useMutation } from '@tanstack/react-query';
+import { NeuronId } from '@/lib/id';
+import { NodeTypes } from '@/lib/constants';
+import { generateNodeIndex } from '@/lib/nodes';
+import { getRandomSelectOptionColor } from '@/lib/databases';
+import { SelectOptionSettingsPopover } from '@/components/databases/fields/select-option-settings-popover';
+
+interface SelectFieldOptionsProps {
+ field: SelectField | MultiSelectField;
+ values: string[];
+ onSelect: (id: string) => void;
+}
+
+interface CreateSelectOptionInput {
+ name: string;
+ color: string;
+}
+
+export const SelectFieldOptions = ({
+ field,
+ values,
+ onSelect,
+}: SelectFieldOptionsProps) => {
+ const workspace = useWorkspace();
+ const { mutate, isPending } = useMutation({
+ mutationFn: async (input: CreateSelectOptionInput) => {
+ const lastChildQuery = workspace.schema
+ .selectFrom('nodes')
+ .where((eb) =>
+ eb.and({
+ parent_id: field.id,
+ type: NodeTypes.SelectOption,
+ }),
+ )
+ .selectAll()
+ .orderBy('index', 'desc')
+ .limit(1)
+ .compile();
+
+ const result = await workspace.query(lastChildQuery);
+ const lastChild =
+ result.rows && result.rows.length > 0 ? result.rows[0] : null;
+ const maxIndex = lastChild?.index ? lastChild.index : null;
+
+ const index = generateNodeIndex(maxIndex, null);
+ const id = NeuronId.generate(NeuronId.Type.SelectOption);
+ const query = workspace.schema
+ .insertInto('nodes')
+ .values({
+ id,
+ type: NodeTypes.SelectOption,
+ parent_id: field.id,
+ index,
+ attrs: JSON.stringify({
+ name: input.name,
+ color: input.color,
+ }),
+ content: null,
+ created_at: new Date().toISOString(),
+ created_by: workspace.userId,
+ version_id: NeuronId.generate(NeuronId.Type.Version),
+ })
+ .compile();
+
+ await workspace.mutate(query);
+ return id;
+ },
+ });
+
+ const [inputValue, setInputValue] = React.useState('');
+ const [color, setColor] = React.useState(getRandomSelectOptionColor());
+ const allowAdd = !field.options?.some(
+ (option) => option.name === inputValue.trim(),
+ );
+
+ return (
+ <Command className="min-h-min">
+ <CommandInput
+ placeholder="Search options..."
+ className="h-9"
+ value={inputValue}
+ onValueChange={setInputValue}
+ />
+ <CommandEmpty>No options found.</CommandEmpty>
+ <CommandList>
+ <CommandGroup className="h-min max-h-96">
+ {field.options?.map((option) => {
+ const isSelected = values.includes(option.id);
+ return (
+ <CommandItem
+ key={option.id}
+ value={option.name}
+ onSelect={() => {
+ onSelect(option.id);
+ }}
+ className="group flex w-full cursor-pointer flex-row items-center gap-1"
+ >
+ <div className="flex-1">
+ <SelectOptionBadge name={option.name} color={option.color} />
+ </div>
+ <div className="flex flex-row items-center gap-2">
+ {isSelected ? (
+ <React.Fragment>
+ <Icon
+ name="check-line"
+ className="h-4 w-4 group-hover:hidden"
+ />
+ <Icon
+ name="close-line"
+ className="hidden h-4 w-4 group-hover:block"
+ />
+ </React.Fragment>
+ ) : (
+ <Icon
+ name="add-line"
+ className="hidden h-4 w-4 group-hover:block"
+ />
+ )}
+ </div>
+ <div
+ className="opacity-0 group-hover:opacity-100"
+ onClick={(e) => {
+ e.stopPropagation();
+ e.preventDefault();
+ }}
+ >
+ <SelectOptionSettingsPopover option={option} />
+ </div>
+ </CommandItem>
+ );
+ })}
+ </CommandGroup>
+ <CommandGroup>
+ {allowAdd && inputValue.length > 0 && (
+ <CommandItem
+ key={inputValue.trim()}
+ value={inputValue.trim()}
+ onSelect={() => {
+ if (isPending) {
+ return;
+ }
+
+ if (inputValue.trim().length === 0) {
+ return;
+ }
+
+ mutate(
+ {
+ name: inputValue.trim(),
+ color,
+ },
+ {
+ onSuccess: (id) => {
+ setInputValue('');
+ setColor(getRandomSelectOptionColor());
+ onSelect(id);
+ },
+ },
+ );
+ }}
+ className="flex flex-row items-center gap-2"
+ >
+ <span className="text-xs text-muted-foreground">Create</span>
+ <SelectOptionBadge name={inputValue} color={color} />
+ </CommandItem>
+ )}
+ </CommandGroup>
+ </CommandList>
+ </Command>
+ );
+};
diff --git a/desktop/src/components/databases/fields/select-option-badge.tsx b/desktop/src/components/databases/fields/select-option-badge.tsx
new file mode 100644
index 00000000..278e60bf
--- /dev/null
+++ b/desktop/src/components/databases/fields/select-option-badge.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { cn } from '@/lib/utils';
+import { getSelectOptionColorClass } from '@/lib/databases';
+
+interface SelectOptionBadgeProps {
+ name: string;
+ color: string;
+}
+
+export const SelectOptionBadge = ({ name, color }: SelectOptionBadgeProps) => {
+ return (
+ <div
+ className={cn(
+ 'line-clamp-1 inline-flex w-max items-center rounded-md border px-1 py-0.5 text-xs',
+ 'transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',
+ getSelectOptionColorClass(color),
+ )}
+ >
+ {name}
+ </div>
+ );
+};
diff --git a/desktop/src/components/databases/fields/select-option-delete-dialog.tsx b/desktop/src/components/databases/fields/select-option-delete-dialog.tsx
new file mode 100644
index 00000000..21ffcba7
--- /dev/null
+++ b/desktop/src/components/databases/fields/select-option-delete-dialog.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import {
+ AlertDialog,
+ AlertDialogCancel,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+} from '@/components/ui/alert-dialog';
+import { Button } from '@/components/ui/button';
+import { useWorkspace } from '@/contexts/workspace';
+import { useMutation } from '@tanstack/react-query';
+
+interface SelectOptionDeleteDialogProps {
+ id: string;
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
+}
+
+export const SelectOptionDeleteDialog = ({
+ id,
+ open,
+ onOpenChange,
+}: SelectOptionDeleteDialogProps) => {
+ const { mutate, isPending } = useMutation({
+ mutationFn: async (fieldId: string) => {
+ const mutation = workspace.schema
+ .deleteFrom('nodes')
+ .where('id', '=', fieldId)
+ .compile();
+ await workspace.mutate(mutation);
+ },
+ });
+ const workspace = useWorkspace();
+
+ return (
+ <AlertDialog open={open} onOpenChange={onOpenChange}>
+ <AlertDialogContent>
+ <AlertDialogHeader>
+ <AlertDialogTitle>
+ Are you sure you want delete this select option?
+ </AlertDialogTitle>
+ <AlertDialogDescription>
+ This action cannot be undone. This option will no longer be
+ accessible and all data in the option will be lost.
+ </AlertDialogDescription>
+ </AlertDialogHeader>
+ <AlertDialogFooter>
+ <AlertDialogCancel>Cancel</AlertDialogCancel>
+ <Button
+ variant="destructive"
+ disabled={isPending}
+ onClick={async () => {
+ mutate(id, {
+ onSuccess: () => {
+ onOpenChange(false);
+ },
+ });
+ }}
+ >
+ Delete
+ </Button>
+ </AlertDialogFooter>
+ </AlertDialogContent>
+ </AlertDialog>
+ );
+};
diff --git a/desktop/src/components/databases/fields/select-option-settings-popover.tsx b/desktop/src/components/databases/fields/select-option-settings-popover.tsx
new file mode 100644
index 00000000..b7d647c6
--- /dev/null
+++ b/desktop/src/components/databases/fields/select-option-settings-popover.tsx
@@ -0,0 +1,136 @@
+import React from 'react';
+import isHotkey from 'is-hotkey';
+import { Icon } from '@/components/ui/icon';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from '@/components/ui/popover';
+import { Separator } from '@/components/ui/separator';
+import { selectOptionColors } from '@/lib/databases';
+import { cn } from '@/lib/utils';
+import { SelectOption } from '@/types/databases';
+import { SelectOptionDeleteDialog } from '@/components/databases/fields/select-option-delete-dialog';
+import { useWorkspace } from '@/contexts/workspace';
+import { NeuronId } from '@/lib/id';
+import { useMutation } from '@tanstack/react-query';
+
+interface SelectOptionSettingsPopoverProps {
+ option: SelectOption;
+}
+
+interface UpdateSelectOptionInput {
+ name: string;
+ color: string;
+}
+
+export const SelectOptionSettingsPopover = ({
+ option,
+}: SelectOptionSettingsPopoverProps) => {
+ const workspace = useWorkspace();
+
+ const { mutate, isPending } = useMutation({
+ mutationFn: async (input: UpdateSelectOptionInput) => {
+ const newAttrs = {
+ name: input.name,
+ color: input.color,
+ };
+ const query = workspace.schema
+ .updateTable('nodes')
+ .set({
+ attrs: newAttrs ? JSON.stringify(newAttrs) : null,
+ updated_at: new Date().toISOString(),
+ updated_by: workspace.userId,
+ version_id: NeuronId.generate(NeuronId.Type.Version),
+ })
+ .where('id', '=', option.id)
+ .compile();
+
+ await workspace.mutate(query);
+ },
+ });
+
+ const [name, setName] = React.useState(option.name);
+ const [openSetttingsPopover, setOpenSetttingsPopover] = React.useState(false);
+ const [openDeleteDialog, setOpenDeleteDialog] = React.useState(false);
+
+ return (
+ <React.Fragment>
+ <Popover
+ modal={true}
+ open={openSetttingsPopover}
+ onOpenChange={setOpenSetttingsPopover}
+ >
+ <PopoverTrigger asChild>
+ <Icon name="more-line" />
+ </PopoverTrigger>
+ <PopoverContent className="ml-1 flex w-72 flex-col gap-1 p-2 text-sm">
+ <div className="p-1">
+ <Input
+ value={name}
+ onChange={(e) => {
+ setName(e.target.value);
+ }}
+ onBlur={() => {
+ if (name !== option.name) {
+ mutate({
+ name,
+ color: option.color,
+ });
+ }
+ }}
+ onKeyDown={(e) => {
+ if (isHotkey('enter', e)) {
+ if (name !== option.name) {
+ mutate({
+ name,
+ color: option.color,
+ });
+ }
+ e.preventDefault();
+ }
+ }}
+ />
+ </div>
+ <Separator className="my-1" />
+ <Label>Color</Label>
+ {selectOptionColors.map((color) => {
+ return (
+ <div
+ key={color.value}
+ className="flex cursor-pointer flex-row items-center gap-2 rounded-md p-1 hover:bg-gray-100"
+ onClick={() => {
+ mutate({
+ name,
+ color: color.value,
+ });
+ }}
+ >
+ <span className={cn('h-4 w-4 rounded-md', color.class)} />
+ <span>{color.label}</span>
+ </div>
+ );
+ })}
+ <Separator className="my-1" />
+ <div
+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"
+ onClick={() => {
+ setOpenDeleteDialog(true);
+ setOpenSetttingsPopover(false);
+ }}
+ >
+ <Icon name="delete-bin-line" />
+ <span>Delete option</span>
+ </div>
+ </PopoverContent>
+ </Popover>
+ <SelectOptionDeleteDialog
+ open={openDeleteDialog}
+ onOpenChange={setOpenDeleteDialog}
+ id={option.id}
+ />
+ </React.Fragment>
+ );
+};
diff --git a/desktop/src/components/databases/tables/cells/table-view-boolean-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-boolean-cell.tsx
index 9856ce59..aa117c62 100644
--- a/desktop/src/components/databases/tables/cells/table-view-boolean-cell.tsx
+++ b/desktop/src/components/databases/tables/cells/table-view-boolean-cell.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { Checkbox } from '@/components/ui/checkbox';
-import { LocalNode } from '@/types/nodes';
import { useMutation } from '@tanstack/react-query';
import { useWorkspace } from '@/contexts/workspace';
import { NeuronId } from '@/lib/id';
+import { BooleanField, RecordNode } from '@/types/databases';
-const getBooleanValue = (record: LocalNode, field: LocalNode): boolean => {
+const getBooleanValue = (record: RecordNode, field: BooleanField): boolean => {
const attrs = record.attrs;
if (!attrs) {
@@ -22,13 +22,15 @@ const getBooleanValue = (record: LocalNode, field: LocalNode): boolean => {
return false;
};
+interface TableViewBooleanCellProps {
+ record: RecordNode;
+ field: BooleanField;
+}
+
export const TableViewBooleanCell = ({
record,
field,
-}: {
- record: LocalNode;
- field: LocalNode;
-}) => {
+}: TableViewBooleanCellProps) => {
const workspace = useWorkspace();
const { mutate, isPending } = useMutation({
mutationFn: async (newValue: boolean) => {
diff --git a/desktop/src/components/databases/tables/cells/table-view-created-at-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-created-at-cell.tsx
new file mode 100644
index 00000000..e898d74b
--- /dev/null
+++ b/desktop/src/components/databases/tables/cells/table-view-created-at-cell.tsx
@@ -0,0 +1,21 @@
+import { CreatedAtField, RecordNode } from '@/types/databases';
+import React from 'react';
+
+interface TableViewCreatedAtCellProps {
+ record: RecordNode;
+ field: CreatedAtField;
+}
+
+export const TableViewCreatedAtCell = ({
+ record,
+ field,
+}: TableViewCreatedAtCellProps) => {
+ return (
+ <div className="h-full w-full p-1 text-sm" data-field={field.id}>
+ <p>
+ {record.createdAt.toLocaleDateString()}{' '}
+ {record.createdAt.toLocaleTimeString()}
+ </p>
+ </div>
+ );
+};
diff --git a/desktop/src/components/databases/tables/cells/table-view-created-by-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-created-by-cell.tsx
new file mode 100644
index 00000000..686a32a2
--- /dev/null
+++ b/desktop/src/components/databases/tables/cells/table-view-created-by-cell.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { Avatar } from '@/components/ui/avatar';
+import { CreatedByField, RecordNode } from '@/types/databases';
+
+interface TableViewCreatedByCellProps {
+ field: CreatedByField;
+ record: RecordNode;
+}
+
+export const TableViewCreatedByCell = ({
+ field,
+ record,
+}: TableViewCreatedByCellProps) => {
+ return (
+ <div
+ className="flex h-full w-full flex-row items-center gap-1 p-1 text-sm"
+ data-field={field.id}
+ >
+ <Avatar
+ id={record.createdBy.id}
+ name={record.createdBy.name}
+ avatar={record.createdBy.avatar}
+ size="small"
+ />
+ <p>{record.createdBy.name}</p>
+ </div>
+ );
+};
diff --git a/desktop/src/components/databases/tables/cells/table-view-email-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-email-cell.tsx
new file mode 100644
index 00000000..108bf288
--- /dev/null
+++ b/desktop/src/components/databases/tables/cells/table-view-email-cell.tsx
@@ -0,0 +1,87 @@
+import React from 'react';
+import isHotkey from 'is-hotkey';
+
+import { useMutation } from '@tanstack/react-query';
+import { useWorkspace } from '@/contexts/workspace';
+import { NeuronId } from '@/lib/id';
+import { RecordNode, EmailField } from '@/types/databases';
+
+const getEmailValue = (record: RecordNode, field: EmailField): string => {
+ const attrs = record.attrs;
+
+ if (!attrs) {
+ return '';
+ }
+
+ const fieldValue = attrs[field.id];
+
+ if (typeof fieldValue === 'string') {
+ return fieldValue;
+ }
+
+ return '';
+};
+
+interface TableViewEmailCellProps {
+ record: RecordNode;
+ field: EmailField;
+}
+
+export const TableViewEmailCell = ({
+ record,
+ field,
+}: TableViewEmailCellProps) => {
+ const workspace = useWorkspace();
+ const { mutate, isPending } = useMutation({
+ mutationFn: async (newValue: string) => {
+ const newAttrs = {
+ ...record.attrs,
+ [field.id]: newValue,
+ };
+ const query = workspace.schema
+ .updateTable('nodes')
+ .set({
+ attrs: newAttrs ? JSON.stringify(newAttrs) : null,
+ updated_at: new Date().toISOString(),
+ updated_by: workspace.userId,
+ version_id: NeuronId.generate(NeuronId.Type.Version),
+ })
+ .where('id', '=', record.id)
+ .compile();
+
+ await workspace.mutate(query);
+ },
+ });
+
+ const canEdit = true;
+
+ const [text, setText] = React.useState<string>(
+ getEmailValue(record, field) ?? '',
+ );
+
+ React.useEffect(() => {
+ setText(getEmailValue(record, field) ?? '');
+ }, [record.versionId]);
+
+ const saveIfChanged = (current: string, previous: string | null) => {
+ if (current.length && current !== previous) {
+ mutate(current);
+ }
+ };
+
+ return (
+ <input
+ value={text}
+ readOnly={!canEdit || isPending}
+ onChange={(e) => setText(e.target.value)}
+ onBlur={() => saveIfChanged(text, getEmailValue(record, field))}
+ onKeyDown={(e) => {
+ if (isHotkey('enter', e)) {
+ saveIfChanged(text, getEmailValue(record, field));
+ e.preventDefault();
+ }
+ }}
+ className="flex h-full w-full cursor-pointer flex-row items-center gap-1 p-1 text-sm focus-visible:cursor-text"
+ />
+ );
+};
diff --git a/desktop/src/components/databases/tables/cells/table-view-number-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-number-cell.tsx
index 111c55fd..49ebcc27 100644
--- a/desktop/src/components/databases/tables/cells/table-view-number-cell.tsx
+++ b/desktop/src/components/databases/tables/cells/table-view-number-cell.tsx
@@ -4,10 +4,14 @@ import { useEffect, useRef, useState } from 'react';
import { useMutation } from '@tanstack/react-query';
import { useWorkspace } from '@/contexts/workspace';
-import { LocalNode } from '@/types/nodes';
+import { RecordNode } from '@/types/databases';
import { NeuronId } from '@/lib/id';
+import { NumberField } from '@/types/databases';
-const getNumberValue = (record: LocalNode, field: LocalNode): number | null => {
+const getNumberValue = (
+ record: RecordNode,
+ field: NumberField,
+): number | null => {
const attrs = record.attrs;
if (!attrs) {
@@ -24,8 +28,8 @@ const getNumberValue = (record: LocalNode, field: LocalNode): number | null => {
};
interface TableViewNumberCellProps {
- record: LocalNode;
- field: LocalNode;
+ record: RecordNode;
+ field: NumberField;
}
export const TableViewNumberCell = ({
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.tsx
new file mode 100644
index 00000000..edbb5eba
--- /dev/null
+++ b/desktop/src/components/databases/tables/cells/table-view-select-cell.tsx
@@ -0,0 +1,119 @@
+import React from 'react';
+import { RecordNode, SelectField } from '@/types/databases';
+import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';
+import {
+ Popover,
+ PopoverTrigger,
+ PopoverContent,
+} from '@/components/ui/popover';
+import { SelectFieldOptions } from '@/components/databases/fields/select-field-options';
+import { useMutation } from '@tanstack/react-query';
+import { useWorkspace } from '@/contexts/workspace';
+import { NeuronId } from '@/lib/id';
+
+const getSelectValue = (
+ record: RecordNode,
+ field: SelectField,
+): string | null => {
+ const attrs = record.attrs;
+
+ if (!attrs) {
+ return null;
+ }
+
+ const fieldValue = attrs[field.id];
+
+ if (typeof fieldValue === 'string') {
+ return fieldValue;
+ }
+
+ return null;
+};
+
+interface TableViewSelectCellProps {
+ record: RecordNode;
+ field: SelectField;
+}
+
+export const TableViewSelectCell = ({
+ record,
+ field,
+}: TableViewSelectCellProps) => {
+ const workspace = useWorkspace();
+ const { mutate, isPending } = useMutation({
+ mutationFn: async (newValue: string | null) => {
+ const newAttrs = {
+ ...record.attrs,
+ [field.id]: newValue,
+ };
+ const query = workspace.schema
+ .updateTable('nodes')
+ .set({
+ attrs: newAttrs ? JSON.stringify(newAttrs) : null,
+ updated_at: new Date().toISOString(),
+ updated_by: workspace.userId,
+ version_id: NeuronId.generate(NeuronId.Type.Version),
+ })
+ .where('id', '=', record.id)
+ .compile();
+
+ await workspace.mutate(query);
+ },
+ });
+
+ const [open, setOpen] = React.useState(false);
+ const value = getSelectValue(record, field);
+ const [selectedValue, setSelectedValue] = React.useState(value);
+
+ React.useEffect(() => {
+ setSelectedValue(getSelectValue(record, field) ?? '');
+ }, [record.versionId]);
+
+ const selectedOption = field.options?.find(
+ (option) => option.id === selectedValue,
+ );
+
+ return (
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
+ <div className="h-full w-full cursor-pointer p-1">
+ {selectedOption ? (
+ <SelectOptionBadge
+ name={selectedOption.name}
+ color={selectedOption.color}
+ />
+ ) : (
+ ' '
+ )}
+ </div>
+ </PopoverTrigger>
+ <PopoverContent className="w-80 p-1">
+ <SelectFieldOptions
+ field={field}
+ values={[selectedValue]}
+ onSelect={(id) => {
+ if (isPending) {
+ return;
+ }
+
+ if (selectedValue === id) {
+ setSelectedValue('');
+ mutate(null, {
+ onSuccess: () => {
+ setOpen(false);
+ },
+ });
+ } else {
+ setSelectedValue(id);
+ mutate(id, {
+ onSuccess: () => {
+ setOpen(false);
+ },
+ });
+ }
+ }}
+ />
+ </PopoverContent>
+ </Popover>
+ );
+};
diff --git a/desktop/src/components/databases/tables/cells/table-view-text-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-text-cell.tsx
index d679f77d..9a8bf0dc 100644
--- a/desktop/src/components/databases/tables/cells/table-view-text-cell.tsx
+++ b/desktop/src/components/databases/tables/cells/table-view-text-cell.tsx
@@ -3,10 +3,10 @@ import isHotkey from 'is-hotkey';
import { useMutation } from '@tanstack/react-query';
import { useWorkspace } from '@/contexts/workspace';
-import { LocalNode } from '@/types/nodes';
import { NeuronId } from '@/lib/id';
+import { RecordNode, TextField } from '@/types/databases';
-const getTextValue = (record: LocalNode, field: LocalNode): string => {
+const getTextValue = (record: RecordNode, field: TextField): string => {
const attrs = record.attrs;
if (!attrs) {
@@ -23,15 +23,13 @@ const getTextValue = (record: LocalNode, field: LocalNode): string => {
};
interface TableViewTextCellProps {
- record: LocalNode;
- field: LocalNode;
- className?: string;
+ record: RecordNode;
+ field: TextField;
}
export const TableViewTextCell = ({
record,
field,
- className,
}: TableViewTextCellProps) => {
const workspace = useWorkspace();
const { mutate, isPending } = useMutation({
diff --git a/desktop/src/components/databases/tables/table-view-body.tsx b/desktop/src/components/databases/tables/table-view-body.tsx
index 331ca56d..e42a2699 100644
--- a/desktop/src/components/databases/tables/table-view-body.tsx
+++ b/desktop/src/components/databases/tables/table-view-body.tsx
@@ -1,44 +1,91 @@
import React from 'react';
import { useDatabase } from '@/contexts/database';
import { useWorkspace } from '@/contexts/workspace';
-import { useQuery } from '@tanstack/react-query';
+import { useInfiniteQuery, useQuery } from '@tanstack/react-query';
import { NodeTypes } from '@/lib/constants';
import { mapNode } from '@/lib/nodes';
import { TableViewRow } from '@/components/databases/tables/table-view-row';
import { TableViewEmptyPlaceholder } from '@/components/databases/tables/table-view-empty-placeholder';
+import { QueryResult, sql } from 'kysely';
+import { SelectNode } from '@/data/schemas/workspace';
+import { buildRecords } from '@/lib/databases';
+import { TableViewLoadMoreRow } from './table-view-load-more-row';
+
+const RECORDS_PER_PAGE = 50;
export const TableViewBody = () => {
const workspace = useWorkspace();
const database = useDatabase();
- const { data, isPending } = useQuery({
- queryKey: ['view', 'records', database.id],
- queryFn: async ({ queryKey }) => {
- const query = workspace.schema
- .selectFrom('nodes')
- .selectAll()
- .where('parent_id', '=', database.id)
- .where('type', '=', NodeTypes.Record)
- .compile();
+ const { data, isPending, isFetchingNextPage, fetchNextPage, hasNextPage } =
+ useInfiniteQuery({
+ queryKey: ['table-body', database.id],
+ initialPageParam: 0,
+ getNextPageParam: (lastPage: QueryResult<SelectNode>, pages) => {
+ if (lastPage && lastPage.rows) {
+ const recordsCount = lastPage.rows.filter(
+ (row) => row.type === NodeTypes.Record,
+ ).length;
+
+ if (recordsCount >= RECORDS_PER_PAGE) {
+ return pages.length;
+ }
+ }
+ return undefined;
+ },
+ queryFn: async ({ queryKey, pageParam }) => {
+ const offset = pageParam * RECORDS_PER_PAGE;
+ const query = sql<SelectNode>`
+ WITH record_nodes AS (
+ SELECT *
+ FROM nodes
+ WHERE parent_id = ${database.id} AND type = ${NodeTypes.Record}
+ ORDER BY ${sql.ref('index')} ASC
+ LIMIT ${sql.lit(RECORDS_PER_PAGE)}
+ OFFSET ${sql.lit(offset)}
+ ),
+ author_nodes AS (
+ SELECT *
+ FROM nodes
+ WHERE id IN (SELECT DISTINCT created_by FROM record_nodes)
+ )
+ SELECT * FROM record_nodes
+ UNION ALL
+ SELECT * FROM author_nodes;
+ `.compile(workspace.schema);
- return await workspace.queryAndSubscribe({
- key: queryKey,
- query,
- });
- },
- });
+ return await workspace.queryAndSubscribe({
+ key: queryKey,
+ page: pageParam,
+ query,
+ });
+ },
+ });
- if (isPending) {
- return null;
- }
+ const pages = data?.pages ?? [];
+ const allNodes =
+ pages
+ .map((page) => page.rows)
+ .flat()
+ .map((row) => mapNode(row)) ?? [];
- const recordNodes = data?.rows.map((row) => mapNode(row)) ?? [];
+ const records = buildRecords(allNodes);
return (
<div className="border-t">
- {recordNodes.length === 0 && <TableViewEmptyPlaceholder />}
- {recordNodes.map((node, index) => (
- <TableViewRow key={node.id} index={index} node={node} />
+ {records.length === 0 && <TableViewEmptyPlaceholder />}
+ {records.map((record, index) => (
+ <TableViewRow key={record.id} index={index} record={record} />
))}
+ {!isPending && hasNextPage && (
+ <TableViewLoadMoreRow
+ isPending={isFetchingNextPage}
+ onClick={() => {
+ if (hasNextPage && !isFetchingNextPage) {
+ fetchNextPage();
+ }
+ }}
+ />
+ )}
</div>
);
};
diff --git a/desktop/src/components/databases/tables/table-view-field-cell.tsx b/desktop/src/components/databases/tables/table-view-field-cell.tsx
index acf87222..5a01d04b 100644
--- a/desktop/src/components/databases/tables/table-view-field-cell.tsx
+++ b/desktop/src/components/databases/tables/table-view-field-cell.tsx
@@ -1,26 +1,33 @@
import React from 'react';
-import { LocalNode } from '@/types/nodes';
-import { match } from 'ts-pattern';
-import { FieldType } from '@/types/databases';
+import { Field, RecordNode } from '@/types/databases';
import { TableViewTextCell } from '@/components/databases/tables/cells/table-view-text-cell';
import { TableViewNumberCell } from '@/components/databases/tables/cells/table-view-number-cell';
import { TableViewBooleanCell } from '@/components/databases/tables/cells/table-view-boolean-cell';
+import { TableViewCreatedAtCell } from '@/components/databases/tables/cells/table-view-created-at-cell';
+import { TableViewCreatedByCell } from '@/components/databases/tables/cells/table-view-created-by-cell';
+import { TableViewSelectCell } from '@/components/databases/tables/cells/table-view-select-cell';
interface TableViewFieldCellProps {
- record: LocalNode;
- field: LocalNode;
+ record: RecordNode;
+ field: Field;
}
export const TableViewFieldCell = ({
record,
field,
}: TableViewFieldCellProps) => {
- const type = field.attrs?.type as FieldType;
- return match(type)
- .with('text', () => <TableViewTextCell record={record} field={field} />)
- .with('number', () => <TableViewNumberCell record={record} field={field} />)
- .with('boolean', () => (
- <TableViewBooleanCell record={record} field={field} />
- ))
- .otherwise(() => null);
+ switch (field.type) {
+ case 'text':
+ return <TableViewTextCell record={record} field={field} />;
+ case 'number':
+ return <TableViewNumberCell record={record} field={field} />;
+ case 'boolean':
+ return <TableViewBooleanCell record={record} field={field} />;
+ case 'created_at':
+ return <TableViewCreatedAtCell record={record} field={field} />;
+ case 'created_by':
+ return <TableViewCreatedByCell record={record} field={field} />;
+ case 'select':
+ return <TableViewSelectCell record={record} field={field} />;
+ }
};
diff --git a/desktop/src/components/databases/tables/table-view-field-header.tsx b/desktop/src/components/databases/tables/table-view-field-header.tsx
index 5b490b9a..a745197b 100644
--- a/desktop/src/components/databases/tables/table-view-field-header.tsx
+++ b/desktop/src/components/databases/tables/table-view-field-header.tsx
@@ -1,5 +1,4 @@
import React from 'react';
-import { LocalNode } from '@/types/nodes';
import { Icon } from '@/components/ui/icon';
import { cn } from '@/lib/utils';
import { getDefaultFieldWidth, getFieldIcon } from '@/lib/databases';
@@ -13,9 +12,10 @@ import {
import { Separator } from '@/components/ui/separator';
import { Input } from '@/components/ui/input';
import { FieldDeleteDialog } from '@/components/databases/fields/field-delete-dialog';
+import { Field } from '@/types/databases';
interface TableViewFieldHeaderProps {
- field: LocalNode;
+ field: Field;
index: number;
}
@@ -23,13 +23,12 @@ export const TableViewFieldHeader = ({
field,
index,
}: TableViewFieldHeaderProps) => {
- const name = field.attrs.name ?? 'Untitled';
const canEditDatabase = true;
const canEditView = true;
const [showDeleteDialog, setShowDeleteDialog] = React.useState(false);
- const [, dragRef] = useDrag<LocalNode>({
+ const [, dragRef] = useDrag<Field>({
type: 'table-field-header',
item: field,
canDrag: () => canEditView,
@@ -61,7 +60,7 @@ export const TableViewFieldHeader = ({
const divRef = React.useRef<HTMLDivElement>(null);
const dragDropRef = dragRef(dropRef(divRef));
- const defaultWidth = getDefaultFieldWidth(field.attrs.type);
+ const defaultWidth = getDefaultFieldWidth(field.type);
return (
<React.Fragment>
@@ -72,7 +71,7 @@ export const TableViewFieldHeader = ({
}}
minWidth={100}
maxWidth={500}
- size={{ width: field.attrs.width ?? defaultWidth, height: '2rem' }}
+ size={{ width: defaultWidth, height: '2rem' }}
enable={{
bottom: false,
bottomLeft: false,
@@ -112,14 +111,14 @@ export const TableViewFieldHeader = ({
)}
ref={dragDropRef as any}
>
- <Icon name={getFieldIcon(field.attrs.type)} />
- <p>{name}</p>
+ <Icon name={getFieldIcon(field.type)} />
+ <p>{field.name}</p>
</div>
</PopoverTrigger>
<PopoverContent className="ml-1 flex w-72 flex-col gap-1 p-2 text-sm">
<div className="p-1">
<Input
- value={name}
+ value={field.name}
onChange={(e) => {
// setName(e.target.value);
// updateName(e.target.value);
diff --git a/desktop/src/components/databases/tables/table-view-load-more-row.tsx b/desktop/src/components/databases/tables/table-view-load-more-row.tsx
new file mode 100644
index 00000000..2fa9142a
--- /dev/null
+++ b/desktop/src/components/databases/tables/table-view-load-more-row.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Icon } from '@/components/ui/icon';
+import { Spinner } from '@/components/ui/spinner';
+
+interface TableViewLoadMoreRowProps {
+ isPending: boolean;
+ onClick: () => void;
+}
+
+export const TableViewLoadMoreRow = ({
+ isPending,
+ onClick,
+}: TableViewLoadMoreRowProps) => {
+ return (
+ <button
+ type="button"
+ disabled={isPending}
+ className="animate-fade-in flex h-8 w-full cursor-pointer flex-row items-center gap-1 border-b pl-2 text-muted-foreground hover:bg-gray-50"
+ onClick={() => {
+ onClick();
+ }}
+ >
+ {isPending ? <Spinner /> : <Icon name="arrow-down-line" />}
+ <span className="text-sm">Load more</span>
+ </button>
+ );
+};
diff --git a/desktop/src/components/databases/tables/table-view-name-cell.tsx b/desktop/src/components/databases/tables/table-view-name-cell.tsx
index 54bae629..895e022c 100644
--- a/desktop/src/components/databases/tables/table-view-name-cell.tsx
+++ b/desktop/src/components/databases/tables/table-view-name-cell.tsx
@@ -1,12 +1,11 @@
import React from 'react';
import isHotkey from 'is-hotkey';
-
import { Icon } from '@/components/ui/icon';
import { useWorkspace } from '@/contexts/workspace';
-import { LocalNode } from '@/types/nodes';
import { useMutation } from '@tanstack/react-query';
import { NeuronId } from '@/lib/id';
import { Spinner } from '@/components/ui/spinner';
+import { RecordNode } from '@/types/databases';
interface NameEditorProps {
initialValue: string;
@@ -49,18 +48,18 @@ const NameEditor = ({ initialValue, onSave, onCancel }: NameEditorProps) => {
};
interface TableViewNameCellProps {
- node: LocalNode;
+ record: RecordNode;
}
-export const TableViewNameCell = ({ node }: TableViewNameCellProps) => {
+export const TableViewNameCell = ({ record }: TableViewNameCellProps) => {
const workspace = useWorkspace();
const [isEditing, setIsEditing] = React.useState(false);
- const [name, setName] = React.useState(node.attrs?.name);
+ const [name, setName] = React.useState(record.attrs?.name);
const { mutate, isPending } = useMutation({
mutationFn: async (newName: string) => {
const newAttrs = {
- ...node.attrs,
+ ...record.attrs,
name: newName,
};
const query = workspace.schema
@@ -71,7 +70,7 @@ export const TableViewNameCell = ({ node }: TableViewNameCellProps) => {
updated_by: workspace.userId,
version_id: NeuronId.generate(NeuronId.Type.Version),
})
- .where('id', '=', node.id)
+ .where('id', '=', record.id)
.compile();
await workspace.mutate(query);
@@ -79,8 +78,8 @@ export const TableViewNameCell = ({ node }: TableViewNameCellProps) => {
});
React.useEffect(() => {
- setName(node.attrs?.name);
- }, [node.versionId]);
+ setName(record.attrs?.name);
+ }, [record.versionId]);
const canEdit = true;
const hasName = name && name.length > 0;
@@ -117,7 +116,7 @@ export const TableViewNameCell = ({ node }: TableViewNameCellProps) => {
<button
type="button"
className="absolute right-2 flex h-6 cursor-pointer flex-row items-center gap-1 rounded-md border bg-white p-1 text-sm text-muted-foreground opacity-0 hover:bg-gray-50 group-hover:opacity-100"
- onClick={() => workspace.openModal(node.id)}
+ onClick={() => workspace.openModal(record.id)}
>
<Icon name="edit-box-line" /> <p>Open</p>
</button>
diff --git a/desktop/src/components/databases/tables/table-view-name-header.tsx b/desktop/src/components/databases/tables/table-view-name-header.tsx
index 202c637e..eb3c1d54 100644
--- a/desktop/src/components/databases/tables/table-view-name-header.tsx
+++ b/desktop/src/components/databases/tables/table-view-name-header.tsx
@@ -1,6 +1,5 @@
import React from 'react';
import { Icon } from '@/components/ui/icon';
-import { getDefaultFieldWidth, getFieldIcon } from '@/lib/databases';
import { Resizable } from 're-resizable';
import {
Popover,
@@ -11,7 +10,7 @@ import { Separator } from '@/components/ui/separator';
import { Input } from '@/components/ui/input';
export const TableViewNameHeader = () => {
- const defaultWidth = getDefaultFieldWidth('name');
+ const defaultWidth = '300px';
const canEditView = true;
@@ -54,7 +53,7 @@ export const TableViewNameHeader = () => {
<Popover modal={true}>
<PopoverTrigger asChild>
<div className="flex h-8 w-full cursor-pointer flex-row items-center gap-1 p-1 text-sm hover:bg-gray-50">
- <Icon name={getFieldIcon('name')} />
+ <Icon name="text" />
<p>Name</p>
</div>
</PopoverTrigger>
diff --git a/desktop/src/components/databases/tables/table-view-add-record-row.tsx b/desktop/src/components/databases/tables/table-view-record-create-row.tsx
similarity index 97%
rename from desktop/src/components/databases/tables/table-view-add-record-row.tsx
rename to desktop/src/components/databases/tables/table-view-record-create-row.tsx
index f22d4a75..98c183f1 100644
--- a/desktop/src/components/databases/tables/table-view-add-record-row.tsx
+++ b/desktop/src/components/databases/tables/table-view-record-create-row.tsx
@@ -7,7 +7,7 @@ import { generateNodeIndex } from '@/lib/nodes';
import { NeuronId } from '@/lib/id';
import { NodeTypes } from '@/lib/constants';
-export const TableViewAddRecordRow = () => {
+export const TableViewRecordCreateRow = () => {
const workspace = useWorkspace();
const database = useDatabase();
diff --git a/desktop/src/components/databases/tables/table-view-row.tsx b/desktop/src/components/databases/tables/table-view-row.tsx
index efc1ef33..490a979d 100644
--- a/desktop/src/components/databases/tables/table-view-row.tsx
+++ b/desktop/src/components/databases/tables/table-view-row.tsx
@@ -1,19 +1,18 @@
-import { LocalNode } from '@/types/nodes';
import React from 'react';
import { TableViewNameCell } from '@/components/databases/tables/table-view-name-cell';
import { getDefaultFieldWidth } from '@/lib/databases';
import { useDatabase } from '@/contexts/database';
import { TableViewFieldCell } from './table-view-field-cell';
-import { FieldType } from '@/types/databases';
+import { RecordNode } from '@/types/databases';
interface TableViewRowProps {
index: number;
- node: LocalNode;
+ record: RecordNode;
}
-export const TableViewRow = ({ index, node }: TableViewRowProps) => {
+export const TableViewRow = ({ index, record }: TableViewRowProps) => {
const database = useDatabase();
- const nameCellWidth = getDefaultFieldWidth('name') + 'px';
+ const nameCellWidth = '300px';
return (
<div className="animate-fade-in flex flex-row items-center gap-0.5 border-b">
<span
@@ -26,17 +25,17 @@ export const TableViewRow = ({ index, node }: TableViewRowProps) => {
className="h-8 border-r"
style={{ width: nameCellWidth, minWidth: nameCellWidth }}
>
- <TableViewNameCell node={node} />
+ <TableViewNameCell record={record} />
</div>
{database.fields.map((field) => {
- const width = getDefaultFieldWidth(field.attrs?.type as FieldType);
+ const width = getDefaultFieldWidth(field.type) + 'px';
return (
<div
- key={`row-${node.id}-${field.id}`}
+ key={`row-${record.id}-${field.id}`}
className="h-8 border-r"
style={{ width: width }}
>
- <TableViewFieldCell record={node} field={field} />
+ <TableViewFieldCell record={record} field={field} />
</div>
);
})}
diff --git a/desktop/src/components/databases/tables/table-view.tsx b/desktop/src/components/databases/tables/table-view.tsx
index c5596bd7..9a3154af 100644
--- a/desktop/src/components/databases/tables/table-view.tsx
+++ b/desktop/src/components/databases/tables/table-view.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { LocalNode } from '@/types/nodes';
import { TableViewHeader } from '@/components/databases/tables/table-view-header';
import { TableViewBody } from '@/components/databases/tables/table-view-body';
-import { TableViewAddRecordRow } from '@/components/databases/tables/table-view-add-record-row';
+import { TableViewRecordCreateRow } from '@/components/databases/tables/table-view-record-create-row';
interface TableViewProps {
node: LocalNode;
@@ -13,7 +13,7 @@ export const TableView = ({ node }: TableViewProps) => {
<div className="mt-2 w-full min-w-full max-w-full overflow-auto pr-5">
<TableViewHeader />
<TableViewBody />
- <TableViewAddRecordRow />
+ <TableViewRecordCreateRow />
</div>
);
};
diff --git a/desktop/src/components/messages/message-list.tsx b/desktop/src/components/messages/message-list.tsx
index b18f0260..f4a74f7f 100644
--- a/desktop/src/components/messages/message-list.tsx
+++ b/desktop/src/components/messages/message-list.tsx
@@ -59,7 +59,7 @@ export const MessageList = ({
FROM nodes child
INNER JOIN descendant_nodes parent ON child.parent_id = parent.id
),
- authors AS (
+ author_nodes AS (
SELECT *
FROM nodes
WHERE id IN (SELECT DISTINCT created_by FROM message_nodes)
@@ -68,7 +68,7 @@ export const MessageList = ({
UNION ALL
SELECT * FROM descendant_nodes
UNION ALL
- SELECT * FROM authors;
+ SELECT * FROM author_nodes;
`.compile(workspace.schema);
return await workspace.queryAndSubscribe({
diff --git a/desktop/src/contexts/database.ts b/desktop/src/contexts/database.ts
index 16cfe6cf..825ef5b7 100644
--- a/desktop/src/contexts/database.ts
+++ b/desktop/src/contexts/database.ts
@@ -1,9 +1,9 @@
-import { LocalNode } from '@/types/nodes';
+import { Field } from '@/types/databases';
import { createContext, useContext } from 'react';
interface DatabaseContext {
id: string;
- fields: LocalNode[];
+ fields: Field[];
}
export const DatabaseContext = createContext<DatabaseContext>(
diff --git a/desktop/src/lib/constants.ts b/desktop/src/lib/constants.ts
index 8aef929a..cfdbe45a 100644
--- a/desktop/src/lib/constants.ts
+++ b/desktop/src/lib/constants.ts
@@ -22,6 +22,7 @@ export const NodeTypes = {
BoardView: 'board_view',
CalendarView: 'calendar_view',
Field: 'field',
+ SelectOption: 'select_option',
};
export const LeafNodeTypes: string[] = [
diff --git a/desktop/src/lib/databases.ts b/desktop/src/lib/databases.ts
index 9953df9e..65340b14 100644
--- a/desktop/src/lib/databases.ts
+++ b/desktop/src/lib/databases.ts
@@ -1,17 +1,15 @@
-import { FieldType } from '@/types/databases';
+import { SelectNode } from '@/data/schemas/workspace';
+import { Field, FieldType, RecordNode, SelectOption } from '@/types/databases';
+import { NodeTypes } from '@/lib/constants';
+import { LocalNode } from '@/types/nodes';
+import { compareString } from '@/lib/utils';
export const getFieldIcon = (type?: FieldType): string => {
if (!type) return '';
switch (type) {
- case 'name':
- return 'text';
- case 'autonumber':
- return 'hashtag';
case 'boolean':
return 'checkbox-line';
- case 'button':
- return 'focus-line';
case 'collaborator':
return 'user-line';
case 'created_at':
@@ -24,26 +22,16 @@ export const getFieldIcon = (type?: FieldType): string => {
return 'mail-line';
case 'file':
return 'file-line';
- case 'formula':
- return 'functions';
case 'multi_select':
return 'list-check';
case 'number':
return 'hashtag';
case 'phone':
return 'smartphone-line';
- case 'relation':
- return 'mind-map';
- case 'rollup':
- return 'magic-line';
case 'select':
return 'radio-button-line';
case 'text':
return 'text';
- case 'updated_at':
- return 'calendar-event-line';
- case 'updated_by':
- return 'user-received-line';
case 'url':
return 'link';
default:
@@ -101,3 +89,223 @@ export const getDefaultFieldWidth = (type: FieldType): number => {
return 200;
}
};
+
+interface SelectOptionColor {
+ label: string;
+ value: string;
+ class: string;
+}
+
+export const selectOptionColors: SelectOptionColor[] = [
+ {
+ label: 'Gray',
+ value: 'gray',
+ class: 'bg-gray-200',
+ },
+ {
+ label: 'Orange',
+ value: 'orange',
+ class: 'bg-orange-200',
+ },
+ {
+ label: 'Yellow',
+ value: 'yellow',
+ class: 'bg-yellow-200',
+ },
+ {
+ label: 'Green',
+ value: 'green',
+ class: 'bg-green-200',
+ },
+ {
+ label: 'Blue',
+ value: 'blue',
+ class: 'bg-blue-200',
+ },
+ {
+ label: 'Purple',
+ value: 'purple',
+ class: 'bg-purple-200',
+ },
+ {
+ label: 'Pink',
+ value: 'pink',
+ class: 'bg-pink-200',
+ },
+ {
+ label: 'Red',
+ value: 'red',
+ class: 'bg-red-200',
+ },
+];
+
+export const getSelectOptionColorClass = (color: string): string => {
+ return selectOptionColors.find((c) => c.value === color)?.class || '';
+};
+
+export const getRandomSelectOptionColor = (): string => {
+ return selectOptionColors[
+ Math.floor(Math.random() * selectOptionColors.length)
+ ].value;
+};
+
+export const mapField = (
+ node: SelectNode,
+ selectOptionNodes: SelectNode[],
+): Field => {
+ const attrsJson = node.attrs;
+ const attrs = attrsJson ? JSON.parse(attrsJson) : {};
+ const type: FieldType = attrs.type ?? 'text';
+
+ switch (type) {
+ case 'boolean': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'boolean',
+ index: node.index,
+ };
+ }
+ case 'collaborator': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'collaborator',
+ index: node.index,
+ };
+ }
+ case 'created_at': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'created_at',
+ index: node.index,
+ };
+ }
+ case 'created_by': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'created_by',
+ index: node.index,
+ };
+ }
+ case 'date': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'date',
+ index: node.index,
+ };
+ }
+ case 'email': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'email',
+ index: node.index,
+ };
+ }
+ case 'file': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'file',
+ index: node.index,
+ };
+ }
+ case 'multi_select': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'multi_select',
+ index: node.index,
+ options: selectOptionNodes.map((option) => buildSelectOption(option)),
+ };
+ }
+ case 'number': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'number',
+ index: node.index,
+ };
+ }
+ case 'phone': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'phone',
+ index: node.index,
+ };
+ }
+ case 'select': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'select',
+ index: node.index,
+ options: selectOptionNodes.map((option) => buildSelectOption(option)),
+ };
+ }
+ case 'text': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'text',
+ index: node.index,
+ };
+ }
+ case 'url': {
+ return {
+ id: node.id,
+ name: attrs.name,
+ type: 'url',
+ index: node.index,
+ };
+ }
+ }
+};
+
+export const buildSelectOption = (node: SelectNode): SelectOption => {
+ const attrsJson = node.attrs;
+ const attrs = attrsJson ? JSON.parse(attrsJson) : {};
+ return {
+ id: node.id,
+ name: attrs.name ?? 'Unnamed',
+ color: attrs.color ?? 'gray',
+ };
+};
+
+export const buildRecords = (allNodes: LocalNode[]): RecordNode[] => {
+ const recordNodes = allNodes.filter((node) => node.type === NodeTypes.Record);
+
+ const authorNodes = allNodes.filter((node) => node.type === NodeTypes.User);
+ const records: RecordNode[] = [];
+ const authorMap = new Map<string, LocalNode>();
+
+ for (const author of authorNodes) {
+ authorMap.set(author.id, author);
+ }
+
+ for (const node of recordNodes) {
+ const author = authorMap.get(node.createdBy);
+ const record: RecordNode = {
+ id: node.id,
+ parentId: node.parentId,
+ index: node.index,
+ attrs: node.attrs,
+ createdAt: new Date(node.createdAt),
+ createdBy: {
+ id: author?.id ?? node.createdBy,
+ name: author?.attrs?.name ?? 'Unknown',
+ avatar: author?.attrs?.avatar ?? '',
+ },
+ versionId: node.versionId,
+ };
+
+ records.push(record);
+ }
+
+ return records.sort((a, b) => compareString(a.index, b.index));
+};
diff --git a/desktop/src/lib/id.ts b/desktop/src/lib/id.ts
index 1a4ed121..e22c6275 100644
--- a/desktop/src/lib/id.ts
+++ b/desktop/src/lib/id.ts
@@ -33,6 +33,7 @@ enum IdType {
BoardView = 'bv',
CalendarView = 'cv',
Field = 'fi',
+ SelectOption = 'so',
}
export class NeuronId {
@@ -96,6 +97,8 @@ export class NeuronId {
return IdType.CalendarView;
case NodeTypes.Field:
return IdType.Field;
+ case NodeTypes.SelectOption:
+ return IdType.SelectOption;
default:
return IdType.Node;
}
diff --git a/desktop/src/types/databases.ts b/desktop/src/types/databases.ts
index 74e1dae3..e9478f93 100644
--- a/desktop/src/types/databases.ts
+++ b/desktop/src/types/databases.ts
@@ -1,22 +1,139 @@
+import { User } from '@/types/users';
+
export type FieldType =
- | 'name'
- | 'autonumber'
| 'boolean'
- | 'button'
| 'collaborator'
| 'created_at'
| 'created_by'
| 'date'
| 'email'
| 'file'
- | 'formula'
| 'multi_select'
| 'number'
| 'phone'
- | 'relation'
- | 'rollup'
| 'select'
| 'text'
- | 'updated_at'
- | 'updated_by'
| 'url';
+
+export type Field =
+ | BooleanField
+ | CollaboratorField
+ | CreatedAtField
+ | CreatedByField
+ | DateField
+ | EmailField
+ | FileField
+ | MultiSelectField
+ | NumberField
+ | PhoneField
+ | SelectField
+ | TextField
+ | UrlField;
+
+export type BooleanField = {
+ id: string;
+ type: 'boolean';
+ name: string;
+ index: string;
+};
+
+export type CollaboratorField = {
+ id: string;
+ type: 'collaborator';
+ name: string;
+ index: string;
+};
+
+export type CreatedAtField = {
+ id: string;
+ type: 'created_at';
+ name: string;
+ index: string;
+};
+
+export type CreatedByField = {
+ id: string;
+ type: 'created_by';
+ name: string;
+ index: string;
+};
+
+export type DateField = {
+ id: string;
+ type: 'date';
+ name: string;
+ index: string;
+};
+
+export type EmailField = {
+ id: string;
+ type: 'email';
+ name: string;
+ index: string;
+};
+
+export type FileField = {
+ id: string;
+ type: 'file';
+ name: string;
+ index: string;
+};
+
+export type MultiSelectField = {
+ id: string;
+ type: 'multi_select';
+ name: string;
+ index: string;
+ options: SelectOption[];
+};
+
+export type NumberField = {
+ id: string;
+ type: 'number';
+ name: string;
+ index: string;
+};
+
+export type PhoneField = {
+ id: string;
+ type: 'phone';
+ name: string;
+ index: string;
+};
+
+export type SelectField = {
+ id: string;
+ type: 'select';
+ name: string;
+ index: string;
+ options: SelectOption[];
+};
+
+export type TextField = {
+ id: string;
+ type: 'text';
+ name: string;
+ index: string;
+};
+export type UrlField = {
+ id: string;
+ type: 'url';
+ name: string;
+ index: string;
+};
+
+export type SelectOption = {
+ id: string;
+ name: string;
+ color: string;
+};
+
+export type RecordNode = {
+ id: string;
+ parentId: string;
+ index: string;
+ attrs: Record<string, any>;
+ createdAt: Date;
+ createdBy: User;
+ versionId: string;
+};
diff --git a/desktop/src/types/users.ts b/desktop/src/types/users.ts
new file mode 100644
index 00000000..fbfc64c2
--- /dev/null
+++ b/desktop/src/types/users.ts
@@ -0,0 +1,5 @@
+export type User = {
+ id: string;
+ name: string;
+ avatar: string;
+};