Skip to content

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

Implement record modal

Hakan Shehuca253b3cec27
diff --git a/desktop/src/components/databases/database-container-node.tsx b/desktop/src/components/databases/database-container-node.tsx
index e07f01e6..fed9db81 100644
--- a/desktop/src/components/databases/database-container-node.tsx
+++ b/desktop/src/components/databases/database-container-node.tsx
@@ -2,21 +2,32 @@ import React from 'react';
import { LocalNode } from '@/types/nodes';
import { useDatabaseQuery } from '@/queries/use-database-query';
import { Database } from '@/components/databases/database';
+import { DatabaseViews } from '@/components/databases/database-views';
+import { useDatabaseViewsQuery } from '@/queries/use-database-views-query';
interface DatabaseContainerNodeProps {
node: LocalNode;
}
export const DatabaseContainerNode = ({ node }: DatabaseContainerNodeProps) => {
- const { data, isPending } = useDatabaseQuery(node.id);
+ const { data: database, isPending: isDatabasePending } = useDatabaseQuery(
+ node.id,
+ );
+ const { data: views, isPending: isViewsPending } = useDatabaseViewsQuery(
+ node.id,
+ );
- if (isPending) {
+ if (isDatabasePending || isViewsPending) {
return null;
}
- if (!data) {
+ if (!database) {
return null;
}
- return <Database node={data} />;
+ return (
+ <Database node={database}>
+ {views && <DatabaseViews views={views} />}
+ </Database>
+ );
};
diff --git a/desktop/src/components/databases/database-views.tsx b/desktop/src/components/databases/database-views.tsx
new file mode 100644
index 00000000..982f8ac9
--- /dev/null
+++ b/desktop/src/components/databases/database-views.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { DatabaseViewsContext } from '@/contexts/database-views';
+import { ViewNode } from '@/types/databases';
+import { View } from '@/components/databases/view';
+import { ScrollArea } from '@/components/ui/scroll-area';
+
+interface DatabaseViewsProps {
+ views: ViewNode[];
+}
+
+export const DatabaseViews = ({ views }: DatabaseViewsProps) => {
+ const [activeViewId, setActiveViewId] = React.useState<string>(views[0].id);
+ const activeView = views.find((view) => view.id === activeViewId);
+
+ React.useEffect(() => {
+ if (!activeView) {
+ setActiveViewId(views[0].id);
+ }
+ }, [views, activeViewId]);
+
+ return (
+ <DatabaseViewsContext.Provider
+ value={{ views, activeViewId, setActiveViewId }}
+ >
+ <ScrollArea className="group/database h-full max-h-full w-full overflow-y-auto px-10 pb-12">
+ {activeView && <View node={activeView} />}
+ </ScrollArea>
+ </DatabaseViewsContext.Provider>
+ );
+};
diff --git a/desktop/src/components/databases/database.tsx b/desktop/src/components/databases/database.tsx
index 27c2e8f8..8bcfefe9 100644
--- a/desktop/src/components/databases/database.tsx
+++ b/desktop/src/components/databases/database.tsx
@@ -1,39 +1,22 @@
import React from 'react';
import { DatabaseContext } from '@/contexts/database';
import { DatabaseNode } from '@/types/databases';
-import { ScrollArea } from '@radix-ui/react-scroll-area';
-import { View } from '@/components/databases/view';
interface DatabaseProps {
node: DatabaseNode;
+ children: React.ReactNode;
}
-export const Database = ({ node }: DatabaseProps) => {
- const [activeViewId, setActiveViewId] = React.useState<string>(
- node.views[0].id,
- );
- const activeView = node.views.find((view) => view.id === activeViewId);
-
- React.useEffect(() => {
- if (!activeView) {
- setActiveViewId(node.views[0].id);
- }
- }, [node.views, activeViewId]);
-
+export const Database = ({ node, children }: DatabaseProps) => {
return (
<DatabaseContext.Provider
value={{
id: node.id,
name: node.name,
fields: node.fields,
- views: node.views,
- activeViewId: activeViewId,
- setActiveViewId: setActiveViewId,
}}
>
- <ScrollArea className="group/database h-full max-h-full w-full overflow-y-auto px-10 pb-12">
- {activeView && <View node={activeView} />}
- </ScrollArea>
+ {children}
</DatabaseContext.Provider>
);
};
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 9fe6f856..68572e2a 100644
--- a/desktop/src/components/databases/tables/table-view-name-cell.tsx
+++ b/desktop/src/components/databases/tables/table-view-name-cell.tsx
@@ -54,19 +54,12 @@ interface TableViewNameCellProps {
export const TableViewNameCell = ({ record }: TableViewNameCellProps) => {
const workspace = useWorkspace();
const [isEditing, setIsEditing] = React.useState(false);
- const [name, setName] = React.useState(record.name);
const { mutate, isPending } = useNodeAttributeUpsertMutation();
-
- React.useEffect(() => {
- setName(record.name);
- }, [record.versionId]);
-
const canEdit = true;
- const hasName = name && name.length > 0;
+ const hasName = record.name && record.name.length > 0;
const handleSave = (newName: string) => {
- setName(newName);
mutate(
{
nodeId: record.id,
@@ -88,7 +81,7 @@ export const TableViewNameCell = ({ record }: TableViewNameCellProps) => {
<div className="group relative flex h-full w-full items-center">
{isEditing ? (
<NameEditor
- initialValue={name ?? ''}
+ initialValue={record.name ?? ''}
onSave={handleSave}
onCancel={() => setIsEditing(false)}
/>
@@ -99,7 +92,7 @@ export const TableViewNameCell = ({ record }: TableViewNameCellProps) => {
className="flex h-full w-full cursor-pointer flex-row items-center gap-1 p-1 text-sm"
>
{hasName ? (
- name
+ record.name
) : (
<span className="text-muted-foreground">Untitled</span>
)}
diff --git a/desktop/src/components/databases/view-tabs.tsx b/desktop/src/components/databases/view-tabs.tsx
index 912394a1..4e1195ff 100644
--- a/desktop/src/components/databases/view-tabs.tsx
+++ b/desktop/src/components/databases/view-tabs.tsx
@@ -1,19 +1,19 @@
import React from 'react';
import { ViewTab } from '@/components/databases/view-tab';
import { ViewCreateButton } from '@/components/databases/view-create-button';
-import { useDatabase } from '@/contexts/database';
+import { useDatabaseViews } from '@/contexts/database-views';
export const ViewTabs = () => {
- const database = useDatabase();
+ const databaseViews = useDatabaseViews();
return (
<div className="flex flex-row items-center gap-3">
- {database.views.map((view) => (
+ {databaseViews.views.map((view) => (
<ViewTab
key={view.id}
view={view}
- isActive={view.id === database.activeViewId}
- onClick={() => database.setActiveViewId(view.id)}
+ isActive={view.id === databaseViews.activeViewId}
+ onClick={() => databaseViews.setActiveViewId(view.id)}
/>
))}
<ViewCreateButton />
diff --git a/desktop/src/components/records/record-attributes.tsx b/desktop/src/components/records/record-attributes.tsx
new file mode 100644
index 00000000..e6acc822
--- /dev/null
+++ b/desktop/src/components/records/record-attributes.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { RecordNode } from '@/types/databases';
+import { RecordName } from '@/components/records/record-name';
+import { useDatabase } from '@/contexts/database';
+import { RecordField } from '@/components/records/record-field';
+import { RecordFieldValue } from '@/components/records/record-field-value';
+
+interface RecordAttributesProps {
+ record: RecordNode;
+}
+
+export const RecordAttributes = ({ record }: RecordAttributesProps) => {
+ const database = useDatabase();
+ return (
+ <div className="flex flex-col gap-2">
+ <RecordName record={record} />
+ <div className="flex flex-row gap-2">
+ <div className="flex w-60 flex-col gap-2">
+ {database.fields.map((field) => (
+ <RecordField key={field.id} field={field} />
+ ))}
+ </div>
+ <div className="flex flex-1 flex-col gap-2">
+ {database.fields.map((field) => {
+ return (
+ <RecordFieldValue
+ key={`value-${field.id}`}
+ field={field}
+ record={record}
+ />
+ );
+ })}
+ </div>
+ </div>
+ </div>
+ );
+};
diff --git a/desktop/src/components/records/record-container-node.tsx b/desktop/src/components/records/record-container-node.tsx
new file mode 100644
index 00000000..5021e482
--- /dev/null
+++ b/desktop/src/components/records/record-container-node.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { useDatabaseQuery } from '@/queries/use-database-query';
+import { useRecordQuery } from '@/queries/use-record-query';
+import { LocalNode } from '@/types/nodes';
+import { Database } from '@/components/databases/database';
+import { RecordAttributes } from '@/components/records/record-attributes';
+import { ScrollArea } from '@/components/ui/scroll-area';
+import { Document } from '@/components/documents/document';
+import { Separator } from '@/components/ui/separator';
+
+interface RecordContainerNodeProps {
+ node: LocalNode;
+}
+
+export const RecordContainerNode = ({ node }: RecordContainerNodeProps) => {
+ const { data: record, isPending: isRecordPending } = useRecordQuery(node.id);
+ const { data: database, isPending: isDatabasePending } = useDatabaseQuery(
+ node.parentId,
+ );
+
+ if (isRecordPending || isDatabasePending) {
+ return null;
+ }
+
+ if (!record) {
+ return null;
+ }
+
+ return (
+ <Database node={database}>
+ <ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12">
+ <RecordAttributes record={record} />
+ <Separator className="my-4 w-full" />
+ <Document node={node} />
+ </ScrollArea>
+ </Database>
+ );
+};
diff --git a/desktop/src/components/records/record-field-value.tsx b/desktop/src/components/records/record-field-value.tsx
new file mode 100644
index 00000000..20a57866
--- /dev/null
+++ b/desktop/src/components/records/record-field-value.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { FieldNode, RecordNode } from '@/types/databases';
+import { RecordTextValue } from '@/components/records/values/record-text-value';
+import { RecordNumberValue } from '@/components/records/values/record-number-value';
+import { RecordBooleanValue } from '@/components/records/values/record-boolean-value';
+import { RecordCreatedAtValue } from '@/components/records/values/record-created-at-value';
+import { RecordCreatedByValue } from '@/components/records/values/record-created-by-value';
+import { RecordSelectValue } from '@/components/records/values/record-select-value';
+import { RecordPhoneValue } from '@/components/records/values/record-phone-value';
+import { RecordEmailValue } from '@/components/records/values/record-email-value';
+import { RecordUrlValue } from '@/components/records/values/record-url-value';
+import { RecordMultiSelectValue } from '@/components/records/values/record-multi-select-value';
+
+interface RecordFieldValueProps {
+ record: RecordNode;
+ field: FieldNode;
+}
+
+export const RecordFieldValue = ({ record, field }: RecordFieldValueProps) => {
+ switch (field.dataType) {
+ case 'text':
+ return <RecordTextValue record={record} field={field} />;
+ case 'number':
+ return <RecordNumberValue record={record} field={field} />;
+ case 'boolean':
+ return <RecordBooleanValue record={record} field={field} />;
+ case 'created_at':
+ return <RecordCreatedAtValue record={record} field={field} />;
+ case 'created_by':
+ return <RecordCreatedByValue record={record} field={field} />;
+ case 'select':
+ return <RecordSelectValue record={record} field={field} />;
+ case 'phone':
+ return <RecordPhoneValue record={record} field={field} />;
+ case 'email':
+ return <RecordEmailValue record={record} field={field} />;
+ case 'url':
+ return <RecordUrlValue record={record} field={field} />;
+ case 'multi_select':
+ return <RecordMultiSelectValue record={record} field={field} />;
+ }
+};
diff --git a/desktop/src/components/records/record-field.tsx b/desktop/src/components/records/record-field.tsx
new file mode 100644
index 00000000..515844c3
--- /dev/null
+++ b/desktop/src/components/records/record-field.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import { FieldNode } from '@/types/databases';
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from '@/components/ui/popover';
+import { Icon } from '@/components/ui/icon';
+import { getFieldIcon } from '@/lib/databases';
+import { FieldRenameInput } from '@/components/databases/fields/field-rename-input';
+import { Separator } from '@/components/ui/separator';
+import { FieldDeleteDialog } from '@/components/databases/fields/field-delete-dialog';
+
+interface RecordFieldProps {
+ field: FieldNode;
+}
+
+export const RecordField = ({ field }: RecordFieldProps) => {
+ const [showDeleteDialog, setShowDeleteDialog] = React.useState(false);
+ const canEditDatabase = true;
+
+ return (
+ <React.Fragment>
+ <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(field.dataType)} />
+ <p>{field.name}</p>
+ </div>
+ </PopoverTrigger>
+ <PopoverContent className="ml-1 flex w-72 flex-col gap-1 p-2 text-sm">
+ <FieldRenameInput field={field} />
+ <Separator />
+ {canEditDatabase && (
+ <div
+ className="flex cursor-pointer flex-row items-center gap-2 p-1 hover:bg-gray-100"
+ onClick={() => {
+ setShowDeleteDialog(true);
+ }}
+ >
+ <Icon name="delete-bin-line" />
+ <span>Delete field</span>
+ </div>
+ )}
+ </PopoverContent>
+ </Popover>
+ {showDeleteDialog && (
+ <FieldDeleteDialog
+ id={field.id}
+ open={showDeleteDialog}
+ onOpenChange={setShowDeleteDialog}
+ />
+ )}
+ </React.Fragment>
+ );
+};
diff --git a/desktop/src/components/records/record-name.tsx b/desktop/src/components/records/record-name.tsx
new file mode 100644
index 00000000..43c60fab
--- /dev/null
+++ b/desktop/src/components/records/record-name.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { RecordNode } from '@/types/databases';
+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';
+import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { AttributeTypes } from '@/lib/constants';
+
+interface RecordNameProps {
+ record: RecordNode;
+}
+
+export const RecordName = ({ record }: RecordNameProps) => {
+ const { mutate, isPending } = useNodeAttributeUpsertMutation();
+
+ return (
+ <SmartTextInput
+ value={record.name}
+ onChange={(value) => {
+ if (isPending) {
+ return;
+ }
+
+ if (value === record.name) {
+ return;
+ }
+
+ mutate({
+ nodeId: record.id,
+ type: AttributeTypes.Name,
+ key: '1',
+ textValue: value,
+ numberValue: null,
+ foreignNodeId: null,
+ });
+ }}
+ className="font-heading border-b border-none pl-1 text-4xl font-bold shadow-none focus-visible:ring-0"
+ />
+ );
+};
diff --git a/desktop/src/components/records/values/record-boolean-value.tsx b/desktop/src/components/records/values/record-boolean-value.tsx
new file mode 100644
index 00000000..d8ec7d8c
--- /dev/null
+++ b/desktop/src/components/records/values/record-boolean-value.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+import { Checkbox } from '@/components/ui/checkbox';
+import { BooleanFieldNode, RecordNode } from '@/types/databases';
+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';
+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';
+
+const getBooleanValue = (
+ record: RecordNode,
+ field: BooleanFieldNode,
+): boolean => {
+ const attribute = record.attributes.find((attr) => attr.type === field.id);
+ if (!attribute) {
+ return false;
+ }
+
+ return attribute.numberValue === 1;
+};
+
+interface RecordBooleanValueProps {
+ record: RecordNode;
+ field: BooleanFieldNode;
+}
+
+export const RecordBooleanValue = ({
+ record,
+ field,
+}: RecordBooleanValueProps) => {
+ const { mutate: upsertNodeAttribute, isPending: isUpsertingNodeAttribute } =
+ useNodeAttributeUpsertMutation();
+ const { mutate: deleteNodeAttribute, isPending: isDeletingNodeAttribute } =
+ useNodeAttributeDeleteMutation();
+
+ const isPending = isUpsertingNodeAttribute || isDeletingNodeAttribute;
+ const canEdit = true;
+
+ const [input, setInput] = React.useState<boolean>(
+ getBooleanValue(record, field),
+ );
+
+ React.useEffect(() => {
+ setInput(getBooleanValue(record, field));
+ }, [record.versionId]);
+
+ return (
+ <div className="flex h-full w-full flex-row items-center justify-start p-1">
+ <Checkbox
+ checked={input}
+ disabled={isPending || !canEdit}
+ onCheckedChange={(e) => {
+ if (isPending) return;
+ if (!canEdit) return;
+
+ if (typeof e === 'boolean') {
+ setInput(e.valueOf());
+ const checked = e.valueOf();
+ if (checked) {
+ upsertNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ numberValue: 1,
+ textValue: null,
+ foreignNodeId: null,
+ });
+ } else {
+ deleteNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ });
+ }
+ }
+ }}
+ />
+ </div>
+ );
+};
diff --git a/desktop/src/components/records/values/record-created-at-value.tsx b/desktop/src/components/records/values/record-created-at-value.tsx
new file mode 100644
index 00000000..220929fb
--- /dev/null
+++ b/desktop/src/components/records/values/record-created-at-value.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { CreatedAtFieldNode, RecordNode } from '@/types/databases';
+
+interface RecordCreatedAtValueProps {
+ record: RecordNode;
+ field: CreatedAtFieldNode;
+}
+
+export const RecordCreatedAtValue = ({
+ record,
+ field,
+}: RecordCreatedAtValueProps) => {
+ 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/records/values/record-created-by-value.tsx b/desktop/src/components/records/values/record-created-by-value.tsx
new file mode 100644
index 00000000..c5c3d9a2
--- /dev/null
+++ b/desktop/src/components/records/values/record-created-by-value.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { Avatar } from '@/components/ui/avatar';
+import { CreatedByFieldNode, RecordNode } from '@/types/databases';
+
+interface RecordCreatedByValueProps {
+ field: CreatedByFieldNode;
+ record: RecordNode;
+}
+
+export const RecordCreatedByValue = ({
+ field,
+ record,
+}: RecordCreatedByValueProps) => {
+ 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/records/values/record-email-value.tsx b/desktop/src/components/records/values/record-email-value.tsx
new file mode 100644
index 00000000..96f07854
--- /dev/null
+++ b/desktop/src/components/records/values/record-email-value.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { RecordNode, EmailFieldNode } from '@/types/databases';
+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';
+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';
+import { SmartTextInput } from '@/components/ui/smart-text-input';
+
+const getEmailValue = (record: RecordNode, field: EmailFieldNode): string => {
+ const attribute = record.attributes.find((attr) => attr.type === field.id);
+ return attribute?.textValue ?? '';
+};
+
+interface RecordEmailValueProps {
+ record: RecordNode;
+ field: EmailFieldNode;
+}
+
+export const RecordEmailValue = ({ record, field }: RecordEmailValueProps) => {
+ const { mutate: upsertNodeAttribute, isPending: isUpsertingNodeAttribute } =
+ useNodeAttributeUpsertMutation();
+ const { mutate: deleteNodeAttribute, isPending: isDeletingNodeAttribute } =
+ useNodeAttributeDeleteMutation();
+
+ const canEdit = true;
+ const isPending = isUpsertingNodeAttribute || isDeletingNodeAttribute;
+
+ return (
+ <SmartTextInput
+ value={getEmailValue(record, field)}
+ readOnly={!canEdit || isPending}
+ onChange={(newValue) => {
+ if (isPending) return;
+ if (!canEdit) return;
+
+ if (newValue === null || newValue === '') {
+ deleteNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ });
+ } else {
+ upsertNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ textValue: newValue,
+ numberValue: null,
+ foreignNodeId: null,
+ });
+ }
+ }}
+ className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm shadow-none focus-visible:cursor-text"
+ />
+ );
+};
diff --git a/desktop/src/components/records/values/record-multi-select-value.tsx b/desktop/src/components/records/values/record-multi-select-value.tsx
new file mode 100644
index 00000000..0e75b472
--- /dev/null
+++ b/desktop/src/components/records/values/record-multi-select-value.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import { MultiSelectFieldNode, RecordNode } 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 { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';
+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';
+
+const getMultiSelectValues = (
+ record: RecordNode,
+ field: MultiSelectFieldNode,
+): string[] => {
+ const attributes = record.attributes.filter((attr) => attr.type === field.id);
+ return attributes.map((attr) => attr.foreignNodeId);
+};
+
+interface RecordMultiSelectValueProps {
+ record: RecordNode;
+ field: MultiSelectFieldNode;
+}
+
+export const RecordMultiSelectValue = ({
+ record,
+ field,
+}: RecordMultiSelectValueProps) => {
+ const { mutate: upsertNodeAttribute, isPending: isUpsertingNodeAttribute } =
+ useNodeAttributeUpsertMutation();
+ const { mutate: deleteNodeAttribute, isPending: isDeletingNodeAttribute } =
+ useNodeAttributeDeleteMutation();
+
+ const isPending = isUpsertingNodeAttribute || isDeletingNodeAttribute;
+
+ const [open, setOpen] = React.useState(false);
+ const [selectedValues, setSelectedValues] = React.useState(
+ getMultiSelectValues(record, field),
+ );
+
+ React.useEffect(() => {
+ setSelectedValues(getMultiSelectValues(record, field));
+ }, [record.versionId]);
+
+ const selectedOptions = field.options?.filter((option) =>
+ selectedValues.includes(option.id),
+ );
+
+ return (
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
+ <div className="flex h-full w-full cursor-pointer flex-wrap gap-1 p-1">
+ {selectedOptions?.map((option) => (
+ <SelectOptionBadge
+ key={option.id}
+ name={option.name}
+ color={option.color}
+ />
+ ))}
+ {selectedOptions?.length === 0 && ' '}
+ </div>
+ </PopoverTrigger>
+ <PopoverContent className="w-80 p-1">
+ <SelectFieldOptions
+ field={field}
+ values={selectedValues}
+ onSelect={(id) => {
+ if (isPending) return;
+
+ if (selectedValues.includes(id)) {
+ setSelectedValues(selectedValues.filter((v) => v !== id));
+ deleteNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: id,
+ });
+ } else {
+ setSelectedValues([...selectedValues, id]);
+ upsertNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: id,
+ foreignNodeId: id,
+ numberValue: null,
+ textValue: null,
+ });
+ }
+ }}
+ />
+ </PopoverContent>
+ </Popover>
+ );
+};
diff --git a/desktop/src/components/records/values/record-number-value.tsx b/desktop/src/components/records/values/record-number-value.tsx
new file mode 100644
index 00000000..b7bd647e
--- /dev/null
+++ b/desktop/src/components/records/values/record-number-value.tsx
@@ -0,0 +1,65 @@
+import React from 'react';
+import { RecordNode } from '@/types/databases';
+import { NumberFieldNode } from '@/types/databases';
+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';
+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';
+import { SmartNumberInput } from '@/components/ui/smart-number-input';
+
+const getNumberValue = (
+ record: RecordNode,
+ field: NumberFieldNode,
+): number | null => {
+ const attribute = record.attributes.find((attr) => attr.type === field.id);
+ return attribute?.numberValue ?? null;
+};
+
+interface RecordNumberValueProps {
+ record: RecordNode;
+ field: NumberFieldNode;
+}
+
+export const RecordNumberValue = ({
+ record,
+ field,
+}: RecordNumberValueProps) => {
+ const { mutate: upsertNodeAttribute, isPending: isUpsertingNodeAttribute } =
+ useNodeAttributeUpsertMutation();
+ const { mutate: deleteNodeAttribute, isPending: isDeletingNodeAttribute } =
+ useNodeAttributeDeleteMutation();
+
+ const canEdit = true;
+ const isPending = isUpsertingNodeAttribute || isDeletingNodeAttribute;
+
+ return (
+ <SmartNumberInput
+ value={getNumberValue(record, field)}
+ readOnly={!canEdit || isPending}
+ onChange={(newValue) => {
+ if (isPending) return;
+ if (!canEdit) return;
+
+ if (newValue === getNumberValue(record, field)) {
+ return;
+ }
+
+ if (newValue === null) {
+ deleteNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ });
+ } else {
+ upsertNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ numberValue: newValue,
+ textValue: null,
+ foreignNodeId: null,
+ });
+ }
+ }}
+ className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm focus-visible:cursor-text"
+ />
+ );
+};
diff --git a/desktop/src/components/records/values/record-phone-value.tsx b/desktop/src/components/records/values/record-phone-value.tsx
new file mode 100644
index 00000000..bd3f0205
--- /dev/null
+++ b/desktop/src/components/records/values/record-phone-value.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import { RecordNode, PhoneFieldNode } from '@/types/databases';
+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';
+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';
+import { SmartTextInput } from '@/components/ui/smart-text-input';
+
+const getPhoneValue = (record: RecordNode, field: PhoneFieldNode): string => {
+ const attribute = record.attributes.find((attr) => attr.type === field.id);
+ return attribute?.textValue ?? '';
+};
+
+interface RecordPhoneValueProps {
+ record: RecordNode;
+ field: PhoneFieldNode;
+}
+
+export const RecordPhoneValue = ({ record, field }: RecordPhoneValueProps) => {
+ const { mutate: upsertNodeAttribute, isPending: isUpsertingNodeAttribute } =
+ useNodeAttributeUpsertMutation();
+ const { mutate: deleteNodeAttribute, isPending: isDeletingNodeAttribute } =
+ useNodeAttributeDeleteMutation();
+
+ const canEdit = true;
+ const isPending = isUpsertingNodeAttribute || isDeletingNodeAttribute;
+
+ return (
+ <SmartTextInput
+ value={getPhoneValue(record, field)}
+ readOnly={!canEdit || isPending}
+ onChange={(newValue) => {
+ if (isPending) return;
+ if (!canEdit) return;
+
+ if (newValue === getPhoneValue(record, field)) {
+ return;
+ }
+
+ if (newValue === null || newValue === '') {
+ deleteNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ });
+ } else {
+ upsertNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ numberValue: 1,
+ textValue: newValue,
+ foreignNodeId: null,
+ });
+ }
+ }}
+ className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm focus-visible:cursor-text"
+ />
+ );
+};
diff --git a/desktop/src/components/records/values/record-select-value.tsx b/desktop/src/components/records/values/record-select-value.tsx
new file mode 100644
index 00000000..e5e52384
--- /dev/null
+++ b/desktop/src/components/records/values/record-select-value.tsx
@@ -0,0 +1,103 @@
+import React from 'react';
+import { RecordNode, SelectFieldNode } 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 { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';
+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';
+
+const getSelectValue = (
+ record: RecordNode,
+ field: SelectFieldNode,
+): string | null => {
+ const attribute = record.attributes.find((attr) => attr.type === field.id);
+ return attribute?.foreignNodeId ?? null;
+};
+
+interface RecordSelectValueProps {
+ record: RecordNode;
+ field: SelectFieldNode;
+}
+
+export const RecordSelectValue = ({
+ record,
+ field,
+}: RecordSelectValueProps) => {
+ const { mutate: upsertNodeAttribute, isPending: isUpsertingNodeAttribute } =
+ useNodeAttributeUpsertMutation();
+ const { mutate: deleteNodeAttribute, isPending: isDeletingNodeAttribute } =
+ useNodeAttributeDeleteMutation();
+
+ const isPending = isUpsertingNodeAttribute || isDeletingNodeAttribute;
+
+ const [open, setOpen] = React.useState(false);
+ const [selectedValue, setSelectedValue] = React.useState(
+ getSelectValue(record, field) ?? '',
+ );
+
+ 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('');
+ deleteNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ });
+ } else {
+ upsertNodeAttribute(
+ {
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ foreignNodeId: id,
+ textValue: null,
+ numberValue: null,
+ },
+ {
+ onSuccess: () => {
+ setOpen(false);
+ },
+ },
+ );
+ }
+ setSelectedValue(id);
+ }}
+ />
+ </PopoverContent>
+ </Popover>
+ );
+};
diff --git a/desktop/src/components/records/values/record-text-value.tsx b/desktop/src/components/records/values/record-text-value.tsx
new file mode 100644
index 00000000..9f407ee5
--- /dev/null
+++ b/desktop/src/components/records/values/record-text-value.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import { RecordNode, TextFieldNode } from '@/types/databases';
+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';
+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';
+import { SmartTextInput } from '@/components/ui/smart-text-input';
+
+const getTextValue = (record: RecordNode, field: TextFieldNode): string => {
+ const attribute = record.attributes.find((attr) => attr.type === field.id);
+ return attribute?.textValue ?? '';
+};
+
+interface RecordTextValueProps {
+ record: RecordNode;
+ field: TextFieldNode;
+}
+
+export const RecordTextValue = ({ record, field }: RecordTextValueProps) => {
+ const { mutate: upsertNodeAttribute, isPending: isUpsertingNodeAttribute } =
+ useNodeAttributeUpsertMutation();
+ const { mutate: deleteNodeAttribute, isPending: isDeletingNodeAttribute } =
+ useNodeAttributeDeleteMutation();
+
+ const canEdit = true;
+ const isPending = isUpsertingNodeAttribute || isDeletingNodeAttribute;
+
+ return (
+ <SmartTextInput
+ value={getTextValue(record, field)}
+ readOnly={!canEdit || isPending}
+ onChange={(newValue) => {
+ if (isPending) return;
+ if (!canEdit) return;
+
+ if (newValue === getTextValue(record, field)) {
+ return;
+ }
+
+ if (newValue === null || newValue === '') {
+ deleteNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ });
+ } else {
+ upsertNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ numberValue: 1,
+ textValue: newValue,
+ foreignNodeId: null,
+ });
+ }
+ }}
+ className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm shadow-none focus-visible:cursor-text"
+ />
+ );
+};
diff --git a/desktop/src/components/records/values/record-url-value.tsx b/desktop/src/components/records/values/record-url-value.tsx
new file mode 100644
index 00000000..28fca28b
--- /dev/null
+++ b/desktop/src/components/records/values/record-url-value.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import { RecordNode, UrlFieldNode } from '@/types/databases';
+import { cn, isValidUrl } from '@/lib/utils';
+import {
+ HoverCard,
+ HoverCardContent,
+ HoverCardTrigger,
+} from '@/components/ui/hover-card';
+import { Icon } from '@/components/ui/icon';
+import { useNodeAttributeUpsertMutation } from '@/mutations/use-node-attribute-upsert-mutation';
+import { useNodeAttributeDeleteMutation } from '@/mutations/use-node-attribute-delete-mutation';
+import { SmartTextInput } from '@/components/ui/smart-text-input';
+
+const getUrlValue = (record: RecordNode, field: UrlFieldNode): string => {
+ const attribute = record.attributes.find((attr) => attr.type === field.id);
+ return attribute?.textValue ?? '';
+};
+
+interface RecordUrlValueProps {
+ record: RecordNode;
+ field: UrlFieldNode;
+}
+
+export const RecordUrlValue = ({ record, field }: RecordUrlValueProps) => {
+ const { mutate: upsertNodeAttribute, isPending: isUpsertingNodeAttribute } =
+ useNodeAttributeUpsertMutation();
+ const { mutate: deleteNodeAttribute, isPending: isDeletingNodeAttribute } =
+ useNodeAttributeDeleteMutation();
+
+ const canEdit = true;
+ const isPending = isUpsertingNodeAttribute || isDeletingNodeAttribute;
+ const text = getUrlValue(record, field);
+ const isUrl = text.length > 0 && isValidUrl(text);
+
+ return (
+ <HoverCard openDelay={300}>
+ <HoverCardTrigger>
+ <SmartTextInput
+ value={text}
+ readOnly={!canEdit || isPending}
+ onChange={(newValue) => {
+ if (isPending) return;
+ if (!canEdit) return;
+
+ if (newValue === text) {
+ return;
+ }
+
+ if (newValue === null || newValue === '') {
+ deleteNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ });
+ } else {
+ upsertNodeAttribute({
+ nodeId: record.id,
+ type: field.id,
+ key: '1',
+ numberValue: 1,
+ textValue: newValue,
+ foreignNodeId: null,
+ });
+ }
+ }}
+ className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm focus-visible:cursor-text"
+ />
+ </HoverCardTrigger>
+ <HoverCardContent
+ className={cn(
+ 'flex w-full min-w-80 max-w-128 flex-row items-center justify-between gap-2 text-ellipsis',
+ !isUrl && 'hidden',
+ )}
+ >
+ <a
+ className="text-blue-500 underline hover:cursor-pointer hover:text-blue-600"
+ href={text}
+ target="_blank"
+ rel="noreferrer"
+ >
+ {text}
+ </a>
+ <Icon
+ name="external-link-line"
+ className="h-4 min-h-4 w-4 min-w-4 text-muted-foreground"
+ />
+ </HoverCardContent>
+ </HoverCard>
+ );
+};
diff --git a/desktop/src/components/workspaces/containers/container.tsx b/desktop/src/components/workspaces/containers/container.tsx
index 27c135fe..14bfddfa 100644
--- a/desktop/src/components/workspaces/containers/container.tsx
+++ b/desktop/src/components/workspaces/containers/container.tsx
@@ -7,29 +7,13 @@ import { ChannelContainerNode } from '@/components/channels/channel-container-no
import { ContainerHeader } from '@/components/workspaces/containers/container-header';
import { Spinner } from '@/components/ui/spinner';
import { mapNode } from '@/lib/nodes';
-import { useQuery } from '@tanstack/react-query';
-import { useWorkspace } from '@/contexts/workspace';
import { DatabaseContainerNode } from '@/components/databases/database-container-node';
+import { useNodeQuery } from '@/queries/use-node-query';
+import { RecordContainerNode } from '@/components/records/record-container-node';
export const Container = () => {
const { nodeId } = useParams<{ nodeId: string }>();
- const workspace = useWorkspace();
-
- const { data, isPending } = useQuery({
- queryKey: ['node', nodeId],
- queryFn: async ({ queryKey }) => {
- const query = workspace.schema
- .selectFrom('nodes')
- .selectAll()
- .where('id', '=', nodeId)
- .compile();
-
- return await workspace.queryAndSubscribe({
- key: queryKey,
- query,
- });
- },
- });
+ const { data, isPending } = useNodeQuery(nodeId);
if (isPending) {
return <Spinner />;
@@ -47,6 +31,7 @@ export const Container = () => {
.with(NodeTypes.Channel, () => <ChannelContainerNode node={node} />)
.with(NodeTypes.Page, () => <PageContainerNode node={node} />)
.with(NodeTypes.Database, () => <DatabaseContainerNode node={node} />)
+ .with(NodeTypes.Record, () => <RecordContainerNode node={node} />)
.otherwise(() => null)}
</div>
);
diff --git a/desktop/src/components/workspaces/modals/modal-content.tsx b/desktop/src/components/workspaces/modals/modal-content.tsx
new file mode 100644
index 00000000..1323d984
--- /dev/null
+++ b/desktop/src/components/workspaces/modals/modal-content.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { Spinner } from '@/components/ui/spinner';
+import { useNodeQuery } from '@/queries/use-node-query';
+import { mapNode } from '@/lib/nodes';
+import { match } from 'ts-pattern';
+import { NodeTypes } from '@/lib/constants';
+import { ChannelContainerNode } from '@/components/channels/channel-container-node';
+import { PageContainerNode } from '@/components/pages/page-container-node';
+import { DatabaseContainerNode } from '@/components/databases/database-container-node';
+import { RecordContainerNode } from '@/components/records/record-container-node';
+
+interface ModalContentProps {
+ nodeId: string;
+}
+
+export const ModalContent = ({ nodeId }: ModalContentProps) => {
+ const { data, isPending } = useNodeQuery(nodeId);
+
+ if (isPending) {
+ return <Spinner />;
+ }
+
+ if (!data || data.rows.length === 0) {
+ return null;
+ }
+
+ const node = mapNode(data.rows[0]);
+
+ return (
+ <div className="flex h-full w-full flex-col">
+ {match(node.type)
+ .with(NodeTypes.Channel, () => <ChannelContainerNode node={node} />)
+ .with(NodeTypes.Page, () => <PageContainerNode node={node} />)
+ .with(NodeTypes.Database, () => <DatabaseContainerNode node={node} />)
+ .with(NodeTypes.Record, () => <RecordContainerNode node={node} />)
+ .otherwise(() => null)}
+ </div>
+ );
+};
diff --git a/desktop/src/components/workspaces/modals/modal-header.tsx b/desktop/src/components/workspaces/modals/modal-header.tsx
new file mode 100644
index 00000000..ea2139b6
--- /dev/null
+++ b/desktop/src/components/workspaces/modals/modal-header.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { Icon } from '@/components/ui/icon';
+import { useWorkspace } from '@/contexts/workspace';
+
+interface ModalHeaderProps {
+ nodeId: string;
+}
+
+export const ModalHeader = ({ nodeId }: ModalHeaderProps) => {
+ const workspace = useWorkspace();
+ return (
+ <div className="flex h-10 min-h-10 items-center justify-between bg-white p-2">
+ <button
+ className="cursor-pointer hover:bg-gray-50"
+ onClick={() => workspace.navigateToNode(nodeId)}
+ >
+ <Icon name="fullscreen-exit-line" />
+ </button>
+ </div>
+ );
+};
diff --git a/desktop/src/components/workspaces/modals/modal.tsx b/desktop/src/components/workspaces/modals/modal.tsx
new file mode 100644
index 00000000..b899fad3
--- /dev/null
+++ b/desktop/src/components/workspaces/modals/modal.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { Dialog, DialogContent, DialogTitle } from '@/components/ui/dialog';
+import { ModalHeader } from '@/components/workspaces/modals/modal-header';
+import { ModalContent } from '@/components/workspaces/modals/modal-content';
+
+interface ModalProps {
+ nodeId: string;
+ onClose: () => void;
+}
+
+export const Modal = ({ nodeId, onClose }: ModalProps) => {
+ const [open, setOpen] = React.useState(true);
+
+ return (
+ <Dialog
+ open={open}
+ onOpenChange={(open) => {
+ setOpen(open);
+ onClose();
+ }}
+ >
+ <DialogContent
+ className="flex h-[calc(100vh-100px)] max-h-full w-8/12 max-w-full flex-col gap-1 overflow-hidden px-0.5 pt-2 md:w-8/12"
+ aria-describedby={undefined}
+ >
+ <DialogTitle>
+ <ModalHeader nodeId={nodeId} />
+ </DialogTitle>
+ <ModalContent nodeId={nodeId} />
+ </DialogContent>
+ </Dialog>
+ );
+};
diff --git a/desktop/src/components/workspaces/workspace.tsx b/desktop/src/components/workspaces/workspace.tsx
index 80230382..f8679d52 100644
--- a/desktop/src/components/workspaces/workspace.tsx
+++ b/desktop/src/components/workspaces/workspace.tsx
@@ -1,7 +1,12 @@
import React from 'react';
import { Sidebar } from '@/components/workspaces/sidebars/sidebar';
import { WorkspaceContext } from '@/contexts/workspace';
-import { Outlet, useNavigate, useParams } from 'react-router-dom';
+import {
+ Outlet,
+ useNavigate,
+ useParams,
+ useSearchParams,
+} from 'react-router-dom';
import {
DummyDriver,
Kysely,
@@ -13,6 +18,7 @@ import { WorkspaceDatabaseSchema } from '@/data/schemas/workspace';
import { useAccount } from '@/contexts/account';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { useEventBus } from '@/hooks/use-event-bus';
+import { Modal } from '@/components/workspaces/modals/modal';
const workspaceDatabase = new Kysely<WorkspaceDatabaseSchema>({
dialect: {
@@ -27,6 +33,8 @@ export const Workspace = () => {
const { workspaceId } = useParams<{ workspaceId: string }>();
const account = useAccount();
const navigate = useNavigate();
+ const [searchParams, setSearchParams] = useSearchParams();
+
const eventBus = useEventBus();
const workspace = account.workspaces.find((w) => w.id === workspaceId);
@@ -117,6 +125,7 @@ export const Workspace = () => {
return <p>Workspace not found</p>;
}
+ const modal = searchParams.get('modal');
return (
<QueryClientProvider client={queryClient}>
<WorkspaceContext.Provider
@@ -145,7 +154,12 @@ export const Workspace = () => {
navigate(`/${workspaceId}/${nodeId}`);
},
openModal(modal) {
- // setModal(modal);
+ setSearchParams((prev) => {
+ return {
+ ...prev,
+ modal: modal,
+ };
+ });
},
}}
>
@@ -156,6 +170,18 @@ export const Workspace = () => {
<main className="h-full w-full min-w-128 flex-grow overflow-hidden bg-white">
<Outlet />
</main>
+ {modal && (
+ <Modal
+ nodeId={modal}
+ key={modal}
+ onClose={() => {
+ setSearchParams((prev) => {
+ prev.delete('modal');
+ return prev;
+ });
+ }}
+ />
+ )}
</div>
</WorkspaceContext.Provider>
</QueryClientProvider>
diff --git a/desktop/src/contexts/database-views.tsx b/desktop/src/contexts/database-views.tsx
new file mode 100644
index 00000000..eacdfd91
--- /dev/null
+++ b/desktop/src/contexts/database-views.tsx
@@ -0,0 +1,14 @@
+import { ViewNode } from '@/types/databases';
+import { createContext, useContext } from 'react';
+
+interface DatabaseViewsContext {
+ views: ViewNode[];
+ activeViewId: string;
+ setActiveViewId: (viewId: string) => void;
+}
+
+export const DatabaseViewsContext = createContext<DatabaseViewsContext>(
+ {} as DatabaseViewsContext,
+);
+
+export const useDatabaseViews = () => useContext(DatabaseViewsContext);
diff --git a/desktop/src/contexts/database.ts b/desktop/src/contexts/database.ts
index f2f6f8cd..a400c7eb 100644
--- a/desktop/src/contexts/database.ts
+++ b/desktop/src/contexts/database.ts
@@ -1,13 +1,10 @@
-import { FieldNode, ViewNode } from '@/types/databases';
+import { FieldNode } from '@/types/databases';
import { createContext, useContext } from 'react';
interface DatabaseContext {
id: string;
name: string;
fields: FieldNode[];
- views: ViewNode[];
- activeViewId: string;
- setActiveViewId: (viewId: string) => void;
}
export const DatabaseContext = createContext<DatabaseContext>(
diff --git a/desktop/src/queries/use-database-query.tsx b/desktop/src/queries/use-database-query.tsx
index d5673d92..9a2d1a01 100644
--- a/desktop/src/queries/use-database-query.tsx
+++ b/desktop/src/queries/use-database-query.tsx
@@ -3,16 +3,10 @@ import { SelectNodeWithAttributes } from '@/data/schemas/workspace';
import { AttributeTypes, NodeTypes, ViewNodeTypes } from '@/lib/constants';
import { mapNodeWithAttributes } from '@/lib/nodes';
import {
- BoardViewNode,
- CalendarViewNode,
DatabaseNode,
FieldDataType,
FieldNode,
SelectOptionNode,
- TableViewNode,
- ViewFilterNode,
- ViewFilterValueNode,
- ViewNode,
} from '@/types/databases';
import { LocalNodeWithAttributes } from '@/types/nodes';
import { useQuery } from '@tanstack/react-query';
@@ -156,24 +150,10 @@ const buildDatabaseNode = (
}
}
- const viewNodes = nodes.filter((node) => ViewNodeTypes.includes(node.type));
- const views: ViewNode[] = [];
- for (const viewNode of viewNodes) {
- const viewFilters = nodes.filter(
- (node) =>
- node.type === NodeTypes.ViewFilter && node.parentId === viewNode.id,
- );
- const view = buildViewNode(viewNode, viewFilters);
- if (view) {
- views.push(view);
- }
- }
-
return {
id: databaseLocalNode.id,
name: name,
fields,
- views,
};
};
@@ -307,134 +287,3 @@ const buildSelectOption = (node: LocalNodeWithAttributes): SelectOptionNode => {
color: color ?? 'gray',
};
};
-
-const buildViewNode = (
- node: LocalNodeWithAttributes,
- filters: LocalNodeWithAttributes[],
-): ViewNode | null => {
- if (node.type === NodeTypes.TableView) {
- return buildTableViewNode(node, filters);
- } else if (node.type === NodeTypes.BoardView) {
- return buildBoardViewNode(node, filters);
- } else if (node.type === NodeTypes.CalendarView) {
- return buildCalendarViewNode(node, filters);
- }
-
- return null;
-};
-
-const buildTableViewNode = (
- node: LocalNodeWithAttributes,
- filters: LocalNodeWithAttributes[],
-): TableViewNode => {
- const name = node.attributes.find(
- (attribute) => attribute.type === AttributeTypes.Name,
- )?.textValue;
-
- const hiddenFields = node.attributes
- .filter((attribute) => attribute.type === AttributeTypes.HiddenField)
- .map((attribute) => attribute.foreignNodeId);
-
- const fieldIndexes = node.attributes
- .filter((attribute) => attribute.type === AttributeTypes.FieldIndex)
- .reduce(
- (acc, attribute) => {
- if (attribute.foreignNodeId && attribute.textValue !== null) {
- acc[attribute.foreignNodeId] = attribute.textValue;
- }
- return acc;
- },
- {} as Record<string, string>,
- );
-
- const fieldWidths = node.attributes
- .filter((attribute) => attribute.type === AttributeTypes.FieldWidth)
- .reduce(
- (acc, attribute) => {
- if (attribute.foreignNodeId && attribute.numberValue !== null) {
- acc[attribute.foreignNodeId] = attribute.numberValue;
- }
- return acc;
- },
- {} as Record<string, number>,
- );
-
- const nameWidth = node.attributes.find(
- (attribute) => attribute.type === AttributeTypes.NameWidth,
- )?.numberValue;
-
- const viewFilters = filters.map(buildViewFilterNode);
-
- return {
- id: node.id,
- name: name ?? 'Unnamed',
- type: 'table_view',
- hiddenFields,
- fieldIndexes,
- fieldWidths,
- nameWidth: nameWidth,
- versionId: node.versionId,
- filters: viewFilters,
- };
-};
-
-const buildBoardViewNode = (
- node: LocalNodeWithAttributes,
- filters: LocalNodeWithAttributes[],
-): BoardViewNode => {
- const name = node.attributes.find(
- (attribute) => attribute.type === AttributeTypes.Name,
- )?.textValue;
-
- const viewFilters = filters.map(buildViewFilterNode);
-
- return {
- id: node.id,
- name: name ?? 'Unnamed',
- type: 'board_view',
- filters: viewFilters,
- };
-};
-
-const buildCalendarViewNode = (
- node: LocalNodeWithAttributes,
- filters: LocalNodeWithAttributes[],
-): CalendarViewNode => {
- const name = node.attributes.find(
- (attribute) => attribute.type === AttributeTypes.Name,
- )?.textValue;
-
- const viewFilters = filters.map(buildViewFilterNode);
-
- return {
- id: node.id,
- name: name ?? 'Unnamed',
- type: 'calendar_view',
- filters: viewFilters,
- };
-};
-
-const buildViewFilterNode = (node: LocalNodeWithAttributes): ViewFilterNode => {
- const fieldId = node.attributes.find(
- (attribute) => attribute.type === AttributeTypes.FieldId,
- )?.foreignNodeId;
-
- const operator = node.attributes.find(
- (attribute) => attribute.type === AttributeTypes.Operator,
- )?.textValue;
-
- const values: ViewFilterValueNode[] = node.attributes
- .filter((attribute) => attribute.type === AttributeTypes.Value)
- .map((attribute) => ({
- textValue: attribute.textValue,
- numberValue: attribute.numberValue,
- foreignNodeId: attribute.foreignNodeId,
- }));
-
- return {
- id: node.id,
- fieldId,
- operator,
- values,
- };
-};
diff --git a/desktop/src/queries/use-database-views-query.tsx b/desktop/src/queries/use-database-views-query.tsx
new file mode 100644
index 00000000..11f5b4a6
--- /dev/null
+++ b/desktop/src/queries/use-database-views-query.tsx
@@ -0,0 +1,236 @@
+import { useWorkspace } from '@/contexts/workspace';
+import { SelectNodeWithAttributes } from '@/data/schemas/workspace';
+import { AttributeTypes, NodeTypes, ViewNodeTypes } from '@/lib/constants';
+import { mapNodeWithAttributes } from '@/lib/nodes';
+import {
+ BoardViewNode,
+ CalendarViewNode,
+ TableViewNode,
+ ViewFilterNode,
+ ViewFilterValueNode,
+ ViewNode,
+} from '@/types/databases';
+import { LocalNodeWithAttributes } from '@/types/nodes';
+import { useQuery } from '@tanstack/react-query';
+import { QueryResult, sql } from 'kysely';
+
+export const useDatabaseViewsQuery = (databaseId: string) => {
+ const workspace = useWorkspace();
+ return useQuery<
+ QueryResult<SelectNodeWithAttributes>,
+ Error,
+ ViewNode[],
+ string[]
+ >({
+ queryKey: ['database', databaseId],
+ queryFn: async ({ queryKey }) => {
+ const query = sql<SelectNodeWithAttributes>`
+ view_nodes AS (
+ SELECT *
+ FROM nodes
+ WHERE parent_id = ${databaseId} AND type IN (${sql.join(ViewNodeTypes)})
+ ),
+ view_filter_nodes AS (
+ SELECT *
+ FROM nodes
+ WHERE parent_id IN
+ (
+ SELECT id
+ FROM view_nodes
+ )
+ AND type = ${NodeTypes.ViewFilter}
+ ),
+ all_nodes AS (
+ SELECT * FROM view_nodes
+ UNION ALL
+ SELECT * FROM view_filter_nodes
+ )
+ SELECT
+ n.*,
+ CASE
+ WHEN COUNT(na.node_id) = 0 THEN json('[]')
+ ELSE json_group_array(
+ json_object(
+ 'node_id', na.'node_id',
+ 'type', na.'type',
+ 'key', na.'key',
+ 'text_value', na.'text_value',
+ 'number_value', na.'number_value',
+ 'foreign_node_id', na.'foreign_node_id',
+ 'created_at', na.'created_at',
+ 'updated_at', na.'updated_at',
+ 'created_by', na.'created_by',
+ 'updated_by', na.'updated_by',
+ 'version_id', na.'version_id',
+ 'server_created_at', na.'server_created_at',
+ 'server_updated_at', na.'server_updated_at',
+ 'server_version_id', na.'server_version_id'
+ )
+ )
+ END as attributes
+ FROM all_nodes n
+ LEFT JOIN node_attributes na ON n.id = na.node_id
+ GROUP BY n.id;
+ `.compile(workspace.schema);
+
+ return await workspace.queryAndSubscribe({
+ key: queryKey,
+ query,
+ });
+ },
+ select: (data: QueryResult<SelectNodeWithAttributes>): ViewNode[] => {
+ const rows = data?.rows ?? [];
+ return buildViewNodes(rows);
+ },
+ });
+};
+
+const buildViewNodes = (rows: SelectNodeWithAttributes[]): ViewNode[] => {
+ const nodes = rows.map((row) => mapNodeWithAttributes(row));
+
+ const viewNodes = nodes.filter((node) => ViewNodeTypes.includes(node.type));
+ const views: ViewNode[] = [];
+ for (const viewNode of viewNodes) {
+ const viewFilters = nodes.filter(
+ (node) =>
+ node.type === NodeTypes.ViewFilter && node.parentId === viewNode.id,
+ );
+ const view = buildViewNode(viewNode, viewFilters);
+ if (view) {
+ views.push(view);
+ }
+ }
+
+ return views;
+};
+
+const buildViewNode = (
+ node: LocalNodeWithAttributes,
+ filters: LocalNodeWithAttributes[],
+): ViewNode | null => {
+ if (node.type === NodeTypes.TableView) {
+ return buildTableViewNode(node, filters);
+ } else if (node.type === NodeTypes.BoardView) {
+ return buildBoardViewNode(node, filters);
+ } else if (node.type === NodeTypes.CalendarView) {
+ return buildCalendarViewNode(node, filters);
+ }
+
+ return null;
+};
+
+const buildTableViewNode = (
+ node: LocalNodeWithAttributes,
+ filters: LocalNodeWithAttributes[],
+): TableViewNode => {
+ const name = node.attributes.find(
+ (attribute) => attribute.type === AttributeTypes.Name,
+ )?.textValue;
+
+ const hiddenFields = node.attributes
+ .filter((attribute) => attribute.type === AttributeTypes.HiddenField)
+ .map((attribute) => attribute.foreignNodeId);
+
+ const fieldIndexes = node.attributes
+ .filter((attribute) => attribute.type === AttributeTypes.FieldIndex)
+ .reduce(
+ (acc, attribute) => {
+ if (attribute.foreignNodeId && attribute.textValue !== null) {
+ acc[attribute.foreignNodeId] = attribute.textValue;
+ }
+ return acc;
+ },
+ {} as Record<string, string>,
+ );
+
+ const fieldWidths = node.attributes
+ .filter((attribute) => attribute.type === AttributeTypes.FieldWidth)
+ .reduce(
+ (acc, attribute) => {
+ if (attribute.foreignNodeId && attribute.numberValue !== null) {
+ acc[attribute.foreignNodeId] = attribute.numberValue;
+ }
+ return acc;
+ },
+ {} as Record<string, number>,
+ );
+
+ const nameWidth = node.attributes.find(
+ (attribute) => attribute.type === AttributeTypes.NameWidth,
+ )?.numberValue;
+
+ const viewFilters = filters.map(buildViewFilterNode);
+
+ return {
+ id: node.id,
+ name: name ?? 'Unnamed',
+ type: 'table_view',
+ hiddenFields,
+ fieldIndexes,
+ fieldWidths,
+ nameWidth: nameWidth,
+ versionId: node.versionId,
+ filters: viewFilters,
+ };
+};
+
+const buildBoardViewNode = (
+ node: LocalNodeWithAttributes,
+ filters: LocalNodeWithAttributes[],
+): BoardViewNode => {
+ const name = node.attributes.find(
+ (attribute) => attribute.type === AttributeTypes.Name,
+ )?.textValue;
+
+ const viewFilters = filters.map(buildViewFilterNode);
+
+ return {
+ id: node.id,
+ name: name ?? 'Unnamed',
+ type: 'board_view',
+ filters: viewFilters,
+ };
+};
+
+const buildCalendarViewNode = (
+ node: LocalNodeWithAttributes,
+ filters: LocalNodeWithAttributes[],
+): CalendarViewNode => {
+ const name = node.attributes.find(
+ (attribute) => attribute.type === AttributeTypes.Name,
+ )?.textValue;
+
+ const viewFilters = filters.map(buildViewFilterNode);
+
+ return {
+ id: node.id,
+ name: name ?? 'Unnamed',
+ type: 'calendar_view',
+ filters: viewFilters,
+ };
+};
+
+const buildViewFilterNode = (node: LocalNodeWithAttributes): ViewFilterNode => {
+ const fieldId = node.attributes.find(
+ (attribute) => attribute.type === AttributeTypes.FieldId,
+ )?.foreignNodeId;
+
+ const operator = node.attributes.find(
+ (attribute) => attribute.type === AttributeTypes.Operator,
+ )?.textValue;
+
+ const values: ViewFilterValueNode[] = node.attributes
+ .filter((attribute) => attribute.type === AttributeTypes.Value)
+ .map((attribute) => ({
+ textValue: attribute.textValue,
+ numberValue: attribute.numberValue,
+ foreignNodeId: attribute.foreignNodeId,
+ }));
+
+ return {
+ id: node.id,
+ fieldId,
+ operator,
+ values,
+ };
+};
diff --git a/desktop/src/queries/use-node-query.tsx b/desktop/src/queries/use-node-query.tsx
new file mode 100644
index 00000000..86c31a70
--- /dev/null
+++ b/desktop/src/queries/use-node-query.tsx
@@ -0,0 +1,22 @@
+import { useWorkspace } from '@/contexts/workspace';
+import { useQuery } from '@tanstack/react-query';
+
+export const useNodeQuery = (nodeId: string) => {
+ const workspace = useWorkspace();
+
+ return useQuery({
+ queryKey: ['node', nodeId],
+ queryFn: async ({ queryKey }) => {
+ const query = workspace.schema
+ .selectFrom('nodes')
+ .selectAll()
+ .where('id', '=', nodeId)
+ .compile();
+
+ return await workspace.queryAndSubscribe({
+ key: queryKey,
+ query,
+ });
+ },
+ });
+};
diff --git a/desktop/src/queries/use-record-query.tsx b/desktop/src/queries/use-record-query.tsx
new file mode 100644
index 00000000..39b17039
--- /dev/null
+++ b/desktop/src/queries/use-record-query.tsx
@@ -0,0 +1,116 @@
+import { useWorkspace } from '@/contexts/workspace';
+import { SelectNodeWithAttributes } from '@/data/schemas/workspace';
+import { AttributeTypes, NodeTypes } from '@/lib/constants';
+import { mapNodeWithAttributes } from '@/lib/nodes';
+import { RecordNode } from '@/types/databases';
+import { useQuery } from '@tanstack/react-query';
+import { QueryResult, sql } from 'kysely';
+
+export const useRecordQuery = (recordId: string) => {
+ const workspace = useWorkspace();
+
+ return useQuery<
+ QueryResult<SelectNodeWithAttributes>,
+ Error,
+ RecordNode | null,
+ string[]
+ >({
+ queryKey: ['record', recordId],
+ queryFn: async ({ queryKey }) => {
+ const query = sql<SelectNodeWithAttributes>`
+ WITH record_node AS (
+ SELECT *
+ FROM nodes
+ WHERE id = ${recordId}
+ ),
+ author_node AS (
+ SELECT *
+ FROM nodes
+ WHERE id IN (SELECT DISTINCT created_by FROM record_node)
+ ),
+ all_nodes as (
+ SELECT * FROM record_node
+ UNION ALL
+ SELECT * FROM author_node
+ )
+ SELECT
+ n.*,
+ json_group_array(
+ json_object(
+ 'node_id', na.'node_id',
+ 'type', na.'type',
+ 'key', na.'key',
+ 'text_value', na.'text_value',
+ 'number_value', na.'number_value',
+ 'foreign_node_id', na.'foreign_node_id',
+ 'created_at', na.'created_at',
+ 'updated_at', na.'updated_at',
+ 'created_by', na.'created_by',
+ 'updated_by', na.updated_by,
+ 'version_id', na.'version_id',
+ 'server_created_at', na.'server_created_at',
+ 'server_updated_at', na.'server_updated_at',
+ 'server_version_id', na.'server_version_id'
+ )
+ ) as attributes
+ FROM all_nodes n
+ LEFT JOIN node_attributes na ON n.id = na.node_id
+ GROUP BY n.id;
+ `.compile(workspace.schema);
+
+ return await workspace.queryAndSubscribe({
+ key: queryKey,
+ query,
+ });
+ },
+ select: (
+ data: QueryResult<SelectNodeWithAttributes>,
+ ): RecordNode | null => {
+ const rows = data?.rows ?? [];
+ return buildRecord(recordId, rows);
+ },
+ });
+};
+
+const buildRecord = (
+ recordId: string,
+ rows: SelectNodeWithAttributes[],
+): RecordNode | null => {
+ const nodes = rows.map(mapNodeWithAttributes);
+ const recordNode = nodes.find((node) => node.id === recordId);
+ if (!recordNode) {
+ return null;
+ }
+
+ const recordName = recordNode.attributes.find(
+ (attr) => attr.type === AttributeTypes.Name,
+ )?.textValue;
+
+ const authorNode = nodes.find((node) => node.type === NodeTypes.User);
+ const author = authorNode
+ ? {
+ id: authorNode.id,
+ name: authorNode.attributes.find(
+ (attr) => attr.type === AttributeTypes.Name,
+ )?.textValue,
+ avatar: authorNode.attributes.find(
+ (attr) => attr.type === AttributeTypes.Avatar,
+ )?.textValue,
+ }
+ : {
+ id: recordNode.createdBy,
+ name: 'Unknown User',
+ avatar: null,
+ };
+
+ return {
+ id: recordNode.id,
+ parentId: recordNode.parentId,
+ name: recordName ?? null,
+ index: recordNode.index,
+ attributes: recordNode.attributes,
+ createdAt: new Date(recordNode.createdAt),
+ createdBy: author,
+ versionId: recordNode.versionId,
+ };
+};
diff --git a/desktop/src/types/databases.ts b/desktop/src/types/databases.ts
index 37b0d39b..835895a3 100644
--- a/desktop/src/types/databases.ts
+++ b/desktop/src/types/databases.ts
@@ -5,7 +5,6 @@ export type DatabaseNode = {
id: string;
name: string;
fields: FieldNode[];
- views: ViewNode[];
};
export type ViewNode = TableViewNode | BoardViewNode | CalendarViewNode;