Skip to content

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

Implement relation field

Hakan Shehu85f62d8cf2d6
diff --git a/apps/desktop/src/main/mutations/databases/field-create.ts b/apps/desktop/src/main/mutations/databases/field-create.ts
index 7e56fee7..8ae5b18e 100644
--- a/apps/desktop/src/main/mutations/databases/field-create.ts
+++ b/apps/desktop/src/main/mutations/databases/field-create.ts
@@ -1,5 +1,7 @@
import {
compareString,
+ FieldAttributes,
+ FieldType,
generateId,
generateNodeIndex,
IdType,
@@ -19,6 +21,27 @@ export class FieldCreateMutationHandler
async handleMutation(
input: FieldCreateMutationInput
): Promise<FieldCreateMutationOutput> {
+ if (input.fieldType === 'relation') {
+ if (!input.relationDatabaseId) {
+ throw new MutationError(
+ 'relation_database_not_found',
+ 'Relation database not found.'
+ );
+ }
+
+ const relationDatabase = await nodeService.fetchNode(
+ input.relationDatabaseId,
+ input.userId
+ );
+
+ if (!relationDatabase || relationDatabase.type !== 'database') {
+ throw new MutationError(
+ 'relation_database_not_found',
+ 'Relation database not found.'
+ );
+ }
+ }
+
const fieldId = generateId(IdType.Field);
const result = await nodeService.updateNode(
input.databaseId,
@@ -34,13 +57,19 @@ export class FieldCreateMutationHandler
const index = generateNodeIndex(maxIndex, null);
- attributes.fields[fieldId] = {
+ const newField: FieldAttributes = {
id: fieldId,
- type: input.fieldType,
+ type: input.fieldType as FieldType,
name: input.name,
index,
};
+ if (newField.type === 'relation') {
+ newField.databaseId = input.relationDatabaseId;
+ }
+
+ attributes.fields[fieldId] = newField;
+
return attributes;
}
);
diff --git a/apps/desktop/src/main/queries/databases/database-list.ts b/apps/desktop/src/main/queries/databases/database-list.ts
new file mode 100644
index 00000000..8349f91e
--- /dev/null
+++ b/apps/desktop/src/main/queries/databases/database-list.ts
@@ -0,0 +1,120 @@
+import { compareString, DatabaseNode } from '@colanode/core';
+
+import { databaseService } from '@/main/data/database-service';
+import { SelectNode } from '@/main/data/workspace/schema';
+import { ChangeCheckResult, QueryHandler } from '@/main/types';
+import { mapNode } from '@/main/utils';
+import { DatabaseListQueryInput } from '@/shared/queries/databases/database-list';
+import { Event } from '@/shared/types/events';
+
+export class DatabaseListQueryHandler
+ implements QueryHandler<DatabaseListQueryInput>
+{
+ public async handleQuery(
+ input: DatabaseListQueryInput
+ ): Promise<DatabaseNode[]> {
+ const databases = await this.fetchDatabases(input);
+ return this.buildDatabases(databases);
+ }
+
+ public async checkForChanges(
+ event: Event,
+ input: DatabaseListQueryInput,
+ output: DatabaseNode[]
+ ): Promise<ChangeCheckResult<DatabaseListQueryInput>> {
+ if (
+ event.type === 'workspace_deleted' &&
+ event.workspace.userId === input.userId
+ ) {
+ return {
+ hasChanges: true,
+ result: [],
+ };
+ }
+
+ if (
+ event.type === 'node_created' &&
+ event.userId === input.userId &&
+ event.node.type === 'database'
+ ) {
+ const newResult = await this.handleQuery(input);
+
+ return {
+ hasChanges: true,
+ result: newResult,
+ };
+ }
+
+ if (
+ event.type === 'node_updated' &&
+ event.userId === input.userId &&
+ event.node.type === 'database'
+ ) {
+ const database = output.find((database) => database.id === event.node.id);
+ if (database) {
+ const newResult = output.map((database) => {
+ if (database.id === event.node.id) {
+ return event.node as DatabaseNode;
+ }
+ return database;
+ });
+
+ return {
+ hasChanges: true,
+ result: newResult,
+ };
+ }
+ }
+
+ if (
+ event.type === 'node_deleted' &&
+ event.userId === input.userId &&
+ event.node.type === 'database'
+ ) {
+ const database = output.find((database) => database.id === event.node.id);
+
+ if (database) {
+ const newOutput = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: newOutput,
+ };
+ }
+ }
+
+ return {
+ hasChanges: false,
+ };
+ }
+
+ private async fetchDatabases(
+ input: DatabaseListQueryInput
+ ): Promise<SelectNode[]> {
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
+ input.userId
+ );
+
+ const databases = await workspaceDatabase
+ .selectFrom('nodes')
+ .where('type', '=', 'database')
+ .selectAll()
+ .execute();
+
+ return databases;
+ }
+
+ private buildDatabases = (rows: SelectNode[]): DatabaseNode[] => {
+ const nodes = rows.map(mapNode);
+ const databaseNodes: DatabaseNode[] = [];
+
+ for (const node of nodes) {
+ if (node.type !== 'database') {
+ continue;
+ }
+
+ databaseNodes.push(node);
+ }
+
+ return databaseNodes.sort((a, b) => compareString(a.id, b.id));
+ };
+}
diff --git a/apps/desktop/src/main/queries/index.ts b/apps/desktop/src/main/queries/index.ts
index 456a886c..1656c2e6 100644
--- a/apps/desktop/src/main/queries/index.ts
+++ b/apps/desktop/src/main/queries/index.ts
@@ -16,6 +16,8 @@ import { UserSearchQueryHandler } from '@/main/queries/users/user-search';
import { WorkspaceGetQueryHandler } from '@/main/queries/workspaces/workspace-get';
import { WorkspaceListQueryHandler } from '@/main/queries/workspaces/workspace-list';
import { WorkspaceUserListQueryHandler } from '@/main/queries/workspaces/workspace-user-list';
+import { DatabaseListQueryHandler } from '@/main/queries/databases/database-list';
+import { RecordSearchQueryHandler } from '@/main/queries/records/record-search';
import { QueryHandler } from '@/main/types';
import { QueryMap } from '@/shared/queries';
@@ -42,4 +44,6 @@ export const queryHandlerMap: QueryHandlerMap = {
account_get: new AccountGetQueryHandler(),
workspace_get: new WorkspaceGetQueryHandler(),
download_get: new DownloadGetQueryHandler(),
+ database_list: new DatabaseListQueryHandler(),
+ record_search: new RecordSearchQueryHandler(),
};
diff --git a/apps/desktop/src/main/queries/records/record-search.ts b/apps/desktop/src/main/queries/records/record-search.ts
new file mode 100644
index 00000000..fe30be36
--- /dev/null
+++ b/apps/desktop/src/main/queries/records/record-search.ts
@@ -0,0 +1,133 @@
+import { NodeTypes, RecordNode } from '@colanode/core';
+import { sql } from 'kysely';
+
+import { databaseService } from '@/main/data/database-service';
+import { SelectNode } from '@/main/data/workspace/schema';
+import { ChangeCheckResult, QueryHandler } from '@/main/types';
+import { mapNode } from '@/main/utils';
+import { RecordSearchQueryInput } from '@/shared/queries/records/record-search';
+import { Event } from '@/shared/types/events';
+
+export class RecordSearchQueryHandler
+ implements QueryHandler<RecordSearchQueryInput>
+{
+ public async handleQuery(
+ input: RecordSearchQueryInput
+ ): Promise<RecordNode[]> {
+ const rows =
+ input.searchQuery.length > 0
+ ? await this.searchRecords(input)
+ : await this.fetchRecords(input);
+
+ return this.buildRecordNodes(rows);
+ }
+
+ public async checkForChanges(
+ event: Event,
+ input: RecordSearchQueryInput,
+ _: RecordNode[]
+ ): Promise<ChangeCheckResult<RecordSearchQueryInput>> {
+ if (
+ event.type === 'workspace_deleted' &&
+ event.workspace.userId === input.userId
+ ) {
+ return {
+ hasChanges: true,
+ result: [],
+ };
+ }
+
+ if (
+ event.type === 'node_created' &&
+ event.userId === input.userId &&
+ event.node.type === 'record' &&
+ event.node.attributes.databaseId === input.databaseId
+ ) {
+ const newResult = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: newResult,
+ };
+ }
+
+ if (
+ event.type === 'node_updated' &&
+ event.userId === input.userId &&
+ event.node.type === 'record' &&
+ event.node.attributes.databaseId === input.databaseId
+ ) {
+ const newResult = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: newResult,
+ };
+ }
+
+ if (
+ event.type === 'node_deleted' &&
+ event.userId === input.userId &&
+ event.node.type === 'record' &&
+ event.node.attributes.databaseId === input.databaseId
+ ) {
+ const newResult = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: newResult,
+ };
+ }
+
+ return {
+ hasChanges: false,
+ };
+ }
+
+ private async searchRecords(
+ input: RecordSearchQueryInput
+ ): Promise<SelectNode[]> {
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
+ input.userId
+ );
+
+ const exclude = input.exclude ?? [];
+ const query = sql<SelectNode>`
+ SELECT n.*
+ FROM nodes n
+ JOIN node_names nn ON n.id = nn.id
+ WHERE n.type = ${NodeTypes.Record}
+ AND n.parent_id = ${input.databaseId}
+ AND nn.name MATCH ${input.searchQuery + '*'}
+ ${
+ exclude.length > 0
+ ? sql`AND n.id NOT IN (${sql.join(
+ exclude.map((id) => sql`${id}`),
+ sql`, `
+ )})`
+ : sql``
+ }
+ `.compile(workspaceDatabase);
+
+ const result = await workspaceDatabase.executeQuery(query);
+ return result.rows;
+ }
+
+ private async fetchRecords(
+ input: RecordSearchQueryInput
+ ): Promise<SelectNode[]> {
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
+ input.userId
+ );
+
+ const exclude = input.exclude ?? [];
+ return workspaceDatabase
+ .selectFrom('nodes')
+ .where('type', '=', 'record')
+ .where('parent_id', '=', input.databaseId)
+ .where('id', 'not in', exclude)
+ .selectAll()
+ .execute();
+ }
+
+ private buildRecordNodes = (rows: SelectNode[]): RecordNode[] => {
+ return rows.map((row) => mapNode(row) as RecordNode);
+ };
+}
diff --git a/apps/desktop/src/renderer/components/databases/database-select.tsx b/apps/desktop/src/renderer/components/databases/database-select.tsx
new file mode 100644
index 00000000..371901cc
--- /dev/null
+++ b/apps/desktop/src/renderer/components/databases/database-select.tsx
@@ -0,0 +1,107 @@
+import { Check, ChevronsUpDown } from 'lucide-react';
+import React from 'react';
+
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import { Button } from '@/renderer/components/ui/button';
+import {
+ Command,
+ CommandEmpty,
+ CommandGroup,
+ CommandInput,
+ CommandItem,
+ CommandList,
+} from '@/renderer/components/ui/command';
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from '@/renderer/components/ui/popover';
+import { cn } from '@/shared/lib/utils';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+
+interface DatabaseSelectProps {
+ id: string | null | undefined;
+ onChange: (id: string) => void;
+}
+
+export const DatabaseSelect = ({ id, onChange }: DatabaseSelectProps) => {
+ const workspace = useWorkspace();
+ const [open, setOpen] = React.useState(false);
+ const { data } = useQuery({
+ type: 'database_list',
+ userId: workspace.userId,
+ });
+
+ const databases = data ?? [];
+ const selectedDatabase = id
+ ? databases.find((database) => database.id === id)
+ : undefined;
+
+ return (
+ <Popover open={open} onOpenChange={setOpen} modal={true}>
+ <PopoverTrigger asChild>
+ <Button
+ type="button"
+ variant="outline"
+ role="combobox"
+ aria-expanded={open}
+ className="w-full justify-between p-2"
+ >
+ {selectedDatabase ? (
+ <React.Fragment>
+ <span className="flex flex-row items-center gap-1">
+ <Avatar
+ id={selectedDatabase.id}
+ name={selectedDatabase.attributes.name}
+ avatar={selectedDatabase.attributes.avatar}
+ className="size-4"
+ />
+ {selectedDatabase.attributes.name}
+ </span>
+ </React.Fragment>
+ ) : (
+ <span>Select database...</span>
+ )}
+ <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+ </Button>
+ </PopoverTrigger>
+ <PopoverContent className="w-96 p-1 overflow-hidden">
+ <Command className="min-h-min">
+ <CommandInput placeholder="Search field types..." className="h-9" />
+ <CommandEmpty>No field type found.</CommandEmpty>
+ <CommandList>
+ <CommandGroup className="h-min overflow-y-auto">
+ {databases.map((database) => (
+ <CommandItem
+ key={database.id}
+ value={`${database.id} - ${database.attributes.name}`}
+ onSelect={() => {
+ onChange(database.id);
+ setOpen(false);
+ }}
+ >
+ <div className="flex w-full flex-row items-center gap-2">
+ <Avatar
+ id={database.id}
+ name={database.attributes.name}
+ avatar={database.attributes.avatar}
+ className="size-4"
+ />
+ <p>{database.attributes.name}</p>
+ <Check
+ className={cn(
+ 'ml-auto size-4',
+ id === database.id ? 'opacity-100' : 'opacity-0'
+ )}
+ />
+ </div>
+ </CommandItem>
+ ))}
+ </CommandGroup>
+ </CommandList>
+ </Command>
+ </PopoverContent>
+ </Popover>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/databases/fields/field-attrs.tsx b/apps/desktop/src/renderer/components/databases/fields/field-attrs.tsx
deleted file mode 100644
index 6316bfec..00000000
--- a/apps/desktop/src/renderer/components/databases/fields/field-attrs.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export const FieldAttrs = () => {
- return <div></div>;
-};
diff --git a/apps/desktop/src/renderer/components/databases/fields/field-create-popover.tsx b/apps/desktop/src/renderer/components/databases/fields/field-create-popover.tsx
index 2d0e0d95..64312855 100644
--- a/apps/desktop/src/renderer/components/databases/fields/field-create-popover.tsx
+++ b/apps/desktop/src/renderer/components/databases/fields/field-create-popover.tsx
@@ -4,7 +4,7 @@ import React from 'react';
import { useForm } from 'react-hook-form';
import * as z from 'zod';
-import { FieldAttrs } from '@/renderer/components/databases/fields/field-attrs';
+import { DatabaseSelect } from '@/renderer/components/databases/database-select';
import { FieldTypeSelect } from '@/renderer/components/databases/fields/field-type-select';
import { Button } from '@/renderer/components/ui/button';
import {
@@ -42,10 +42,12 @@ const formSchema = z.object({
z.literal('phone'),
z.literal('select'),
z.literal('text'),
+ z.literal('relation'),
z.literal('updatedAt'),
z.literal('updatedBy'),
z.literal('url'),
]),
+ relationDatabaseId: z.string().optional().nullable(),
});
export const FieldCreatePopover = () => {
@@ -63,6 +65,8 @@ export const FieldCreatePopover = () => {
},
});
+ const type = form.watch('type');
+
const handleCancelClick = () => {
setOpen(false);
form.reset();
@@ -76,6 +80,7 @@ export const FieldCreatePopover = () => {
name: values.name,
fieldType: values.type,
userId: workspace.userId,
+ relationDatabaseId: values.relationDatabaseId,
},
onSuccess: () => {
setOpen(false);
@@ -135,7 +140,23 @@ export const FieldCreatePopover = () => {
</FormItem>
)}
/>
- <FieldAttrs />
+ {type === 'relation' && (
+ <FormField
+ control={form.control}
+ name="relationDatabaseId"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Database</FormLabel>
+ <FormControl>
+ <DatabaseSelect
+ id={field.value}
+ onChange={field.onChange}
+ />
+ </FormControl>
+ </FormItem>
+ )}
+ />
+ )}
</div>
<div className="mt-2 flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2">
<Button
diff --git a/apps/desktop/src/renderer/components/databases/fields/field-icon.tsx b/apps/desktop/src/renderer/components/databases/fields/field-icon.tsx
index d2f30285..2c717470 100644
--- a/apps/desktop/src/renderer/components/databases/fields/field-icon.tsx
+++ b/apps/desktop/src/renderer/components/databases/fields/field-icon.tsx
@@ -1,5 +1,6 @@
import { FieldType } from '@colanode/core';
import {
+ Cable,
Calendar,
File,
Hash,
@@ -43,6 +44,8 @@ export const FieldIcon = ({ type, className }: FieldIconProps) => {
return <Smartphone className={className} />;
case 'select':
return <ListCheck className={className} />;
+ case 'relation':
+ return <Cable className={className} />;
case 'text':
return <Text className={className} />;
case 'url':
diff --git a/apps/desktop/src/renderer/components/databases/fields/field-type-select.tsx b/apps/desktop/src/renderer/components/databases/fields/field-type-select.tsx
index a0408fe3..0485055b 100644
--- a/apps/desktop/src/renderer/components/databases/fields/field-type-select.tsx
+++ b/apps/desktop/src/renderer/components/databases/fields/field-type-select.tsx
@@ -69,6 +69,10 @@ const fieldTypes: FieldTypeOption[] = [
name: 'Select',
type: 'select',
},
+ {
+ name: 'Relation',
+ type: 'relation',
+ },
{
name: 'Text',
type: 'text',
diff --git a/apps/desktop/src/renderer/components/records/record-field-value.tsx b/apps/desktop/src/renderer/components/records/record-field-value.tsx
index 3f525dfc..202c1eaf 100644
--- a/apps/desktop/src/renderer/components/records/record-field-value.tsx
+++ b/apps/desktop/src/renderer/components/records/record-field-value.tsx
@@ -14,6 +14,7 @@ import { RecordTextValue } from '@/renderer/components/records/values/record-tex
import { RecordUpdatedAtValue } from '@/renderer/components/records/values/record-updated-at-value';
import { RecordUpdatedByValue } from '@/renderer/components/records/values/record-updated-by-value';
import { RecordUrlValue } from '@/renderer/components/records/values/record-url-value';
+import { RecordRelationValue } from '@/renderer/components/records/values/record-relation-value';
interface RecordFieldValueProps {
field: FieldAttributes;
@@ -45,6 +46,8 @@ export const RecordFieldValue = ({
return <RecordPhoneValue field={field} readOnly={readOnly} />;
case 'select':
return <RecordSelectValue field={field} readOnly={readOnly} />;
+ case 'relation':
+ return <RecordRelationValue field={field} readOnly={readOnly} />;
case 'text':
return <RecordTextValue field={field} readOnly={readOnly} />;
case 'url':
diff --git a/apps/desktop/src/renderer/components/records/record-search.tsx b/apps/desktop/src/renderer/components/records/record-search.tsx
new file mode 100644
index 00000000..4d26f549
--- /dev/null
+++ b/apps/desktop/src/renderer/components/records/record-search.tsx
@@ -0,0 +1,72 @@
+import { RecordNode } from '@colanode/core';
+import React from 'react';
+
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import {
+ Command,
+ CommandEmpty,
+ CommandGroup,
+ CommandInput,
+ CommandItem,
+ CommandList,
+} from '@/renderer/components/ui/command';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+
+interface RecordSearchProps {
+ exclude?: string[];
+ onSelect: (record: RecordNode) => void;
+ databaseId: string;
+}
+
+export const RecordSearch = ({
+ exclude,
+ onSelect,
+ databaseId,
+}: RecordSearchProps) => {
+ const workspace = useWorkspace();
+
+ const [query, setQuery] = React.useState('');
+ const { data } = useQuery({
+ type: 'record_search',
+ searchQuery: query,
+ userId: workspace.userId,
+ exclude,
+ databaseId,
+ });
+
+ return (
+ <Command className="min-h-min" shouldFilter={false}>
+ <CommandInput
+ value={query}
+ onValueChange={setQuery}
+ placeholder="Search records..."
+ className="h-9"
+ />
+ <CommandEmpty>No record found.</CommandEmpty>
+ <CommandList>
+ <CommandGroup className="h-min max-h-96">
+ {data?.map((record) => (
+ <CommandItem
+ key={record.id}
+ onSelect={() => {
+ onSelect(record);
+ setQuery('');
+ }}
+ >
+ <div className="flex w-full flex-row items-center gap-2">
+ <Avatar
+ id={record.id}
+ name={record.attributes.name}
+ avatar={record.attributes.avatar}
+ className="size-4"
+ />
+ <p className="text-sm flex-grow">{record.attributes.name}</p>
+ </div>
+ </CommandItem>
+ ))}
+ </CommandGroup>
+ </CommandList>
+ </Command>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/records/values/record-collaborator-value.tsx b/apps/desktop/src/renderer/components/records/values/record-collaborator-value.tsx
index 2e57250a..81179635 100644
--- a/apps/desktop/src/renderer/components/records/values/record-collaborator-value.tsx
+++ b/apps/desktop/src/renderer/components/records/values/record-collaborator-value.tsx
@@ -63,7 +63,7 @@ export const RecordCollaboratorValue = ({
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<div className="flex h-full w-full cursor-pointer flex-wrap gap-1 p-0 overflow-hidden">
- {collaborators.map((collaborator) => (
+ {collaborators.slice(0, 1).map((collaborator) => (
<CollaboratorBadge
key={collaborator.id}
collaborator={collaborator}
diff --git a/apps/desktop/src/renderer/components/records/values/record-relation-value.tsx b/apps/desktop/src/renderer/components/records/values/record-relation-value.tsx
new file mode 100644
index 00000000..4823caf8
--- /dev/null
+++ b/apps/desktop/src/renderer/components/records/values/record-relation-value.tsx
@@ -0,0 +1,152 @@
+import { RecordNode, RelationFieldAttributes } from '@colanode/core';
+import { X } from 'lucide-react';
+import React from 'react';
+
+import { RecordSearch } from '../record-search';
+
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import { Badge } from '@/renderer/components/ui/badge';
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from '@/renderer/components/ui/popover';
+import { Separator } from '@/renderer/components/ui/separator';
+import { useRecord } from '@/renderer/contexts/record';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQueries } from '@/renderer/hooks/use-queries';
+
+interface RecordRelationValueProps {
+ field: RelationFieldAttributes;
+ readOnly?: boolean;
+}
+
+const RelationBadge = ({ record }: { record: RecordNode }) => {
+ const name = record.attributes.name ?? 'Unnamed';
+ return (
+ <div className="flex flex-row items-center gap-1">
+ <Avatar
+ id={record.id}
+ name={name}
+ avatar={record.attributes.avatar}
+ size="small"
+ />
+ <p className="text-sm line-clamp-1 w-full">{name}</p>
+ </div>
+ );
+};
+
+export const RecordRelationValue = ({
+ field,
+ readOnly,
+}: RecordRelationValueProps) => {
+ const workspace = useWorkspace();
+ const record = useRecord();
+
+ const [open, setOpen] = React.useState(false);
+
+ const relationIds = record.getRelationValue(field) ?? [];
+ const results = useQueries(
+ relationIds.map((id) => ({
+ type: 'node_get',
+ nodeId: id,
+ userId: workspace.userId,
+ }))
+ );
+
+ const relations: RecordNode[] = [];
+ for (const result of results) {
+ if (result.data && result.data.type === 'record') {
+ relations.push(result.data);
+ }
+ }
+
+ if (!field.databaseId) {
+ return null;
+ }
+
+ return (
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
+ <div className="flex h-full w-full cursor-pointer flex-wrap gap-1 p-0 overflow-hidden">
+ {relations.slice(0, 1).map((relation) => (
+ <RelationBadge key={relation.id} record={relation} />
+ ))}
+ {relations.length === 0 && ' '}
+ {relations.length > 1 && (
+ <Badge
+ variant="outline"
+ className="ml-2 text-xs px-1 text-muted-foreground"
+ >
+ +{relations.length - 1}
+ </Badge>
+ )}
+ </div>
+ </PopoverTrigger>
+ <PopoverContent className="w-80 p-1">
+ <div className="flex flex-col flex-wrap gap-2 p-2">
+ {relations.length > 0 ? (
+ <React.Fragment>
+ {relations.map((relation) => (
+ <div
+ key={relation.id}
+ className="flex w-full flex-row items-center gap-2"
+ >
+ <RelationBadge record={relation} />
+ {record.canEdit && !readOnly && (
+ <X
+ className="size-4 cursor-pointer"
+ onClick={() => {
+ if (!record.canEdit || readOnly) return;
+
+ const newRelations = relationIds.filter(
+ (id) => id !== relation.id
+ );
+
+ if (newRelations.length === 0) {
+ record.removeFieldValue(field);
+ } else {
+ record.updateFieldValue(field, {
+ type: 'relation',
+ value: newRelations,
+ });
+ }
+ }}
+ />
+ )}
+ </div>
+ ))}
+ <Separator className="w-full my-2" />
+ </React.Fragment>
+ ) : (
+ <p className="text-sm text-muted-foreground">No relations</p>
+ )}
+ </div>
+ {record.canEdit && !readOnly && (
+ <RecordSearch
+ databaseId={field.databaseId}
+ exclude={relationIds}
+ onSelect={(selectedRecord) => {
+ if (!record.canEdit || readOnly) return;
+
+ const newRelations = relationIds.includes(selectedRecord.id)
+ ? relationIds.filter((id) => id !== selectedRecord.id)
+ : [...relationIds, selectedRecord.id];
+
+ if (newRelations.length === 0) {
+ record.removeFieldValue(field);
+ } else {
+ record.updateFieldValue(field, {
+ type: 'relation',
+ value: newRelations,
+ });
+ }
+
+ setOpen(false);
+ }}
+ />
+ )}
+ </PopoverContent>
+ </Popover>
+ );
+};
diff --git a/apps/desktop/src/shared/mutations/databases/field-create.ts b/apps/desktop/src/shared/mutations/databases/field-create.ts
index 9f212cd8..552ff415 100644
--- a/apps/desktop/src/shared/mutations/databases/field-create.ts
+++ b/apps/desktop/src/shared/mutations/databases/field-create.ts
@@ -5,6 +5,7 @@ export type FieldCreateMutationInput = {
databaseId: string;
name: string;
fieldType: FieldType;
+ relationDatabaseId?: string | null;
userId: string;
};
diff --git a/apps/desktop/src/shared/mutations/index.ts b/apps/desktop/src/shared/mutations/index.ts
index 49aa06d1..17afaa42 100644
--- a/apps/desktop/src/shared/mutations/index.ts
+++ b/apps/desktop/src/shared/mutations/index.ts
@@ -50,4 +50,5 @@ export type MutationErrorCode =
| 'message_not_found'
| 'invalid_server_domain'
| 'server_already_exists'
- | 'workspace_not_found';
+ | 'workspace_not_found'
+ | 'relation_database_not_found';
diff --git a/apps/desktop/src/shared/queries/databases/database-list.ts b/apps/desktop/src/shared/queries/databases/database-list.ts
new file mode 100644
index 00000000..e7c05947
--- /dev/null
+++ b/apps/desktop/src/shared/queries/databases/database-list.ts
@@ -0,0 +1,15 @@
+import { DatabaseNode } from '@colanode/core';
+
+export type DatabaseListQueryInput = {
+ type: 'database_list';
+ userId: string;
+};
+
+declare module '@/shared/queries' {
+ interface QueryMap {
+ database_list: {
+ input: DatabaseListQueryInput;
+ output: DatabaseNode[];
+ };
+ }
+}
diff --git a/apps/desktop/src/shared/queries/records/record-search.ts b/apps/desktop/src/shared/queries/records/record-search.ts
new file mode 100644
index 00000000..5cf82913
--- /dev/null
+++ b/apps/desktop/src/shared/queries/records/record-search.ts
@@ -0,0 +1,18 @@
+import { RecordNode } from '@colanode/core';
+
+export type RecordSearchQueryInput = {
+ type: 'record_search';
+ searchQuery: string;
+ userId: string;
+ databaseId: string;
+ exclude?: string[];
+};
+
+declare module '@/shared/queries' {
+ interface QueryMap {
+ record_search: {
+ input: RecordSearchQueryInput;
+ output: RecordNode[];
+ };
+ }
+}
diff --git a/packages/core/src/registry/fields.ts b/packages/core/src/registry/fields.ts
index a113676a..ef367561 100644
--- a/packages/core/src/registry/fields.ts
+++ b/packages/core/src/registry/fields.ts
@@ -191,6 +191,7 @@ export const relationFieldAttributesSchema = z.object({
type: z.literal('relation'),
name: z.string(),
index: z.string(),
+ databaseId: z.string().optional().nullable(),
});
export type RelationFieldAttributes = z.infer<