Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Add foreign key constraints for nodes
Hakan Shehu02469c04de76
diff --git a/desktop/src/components/spaces/space-create-dialog.tsx b/desktop/src/components/spaces/space-create-dialog.tsxindex d21249e7..4b8a7646 100644--- a/desktop/src/components/spaces/space-create-dialog.tsx+++ b/desktop/src/components/spaces/space-create-dialog.tsx@@ -1,23 +1,30 @@-import React from "react";-import {useWorkspace} from "@/contexts/workspace";+import React from 'react';+import { useWorkspace } from '@/contexts/workspace';import {Dialog,DialogContent,DialogDescription,DialogFooter,DialogHeader,- DialogTitle-} from "@/components/ui/dialog";-import {z} from "zod";-import {Form, FormControl, FormField, FormItem, FormLabel, FormMessage} from "@/components/ui/form";-import {Input} from "@/components/ui/input";-import {Textarea} from "@/components/ui/textarea";-import {Button} from "@/components/ui/button";-import {Spinner} from "@/components/ui/spinner";-import {useForm} from "react-hook-form";-import {zodResolver} from "@hookform/resolvers/zod";-import {Node} from "@/types/nodes";-import {NeuronId} from "@/lib/id";+ DialogTitle,+} from '@/components/ui/dialog';+import { z } from 'zod';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@/components/ui/form';+import { Input } from '@/components/ui/input';+import { Textarea } from '@/components/ui/textarea';+import { Button } from '@/components/ui/button';+import { Spinner } from '@/components/ui/spinner';+import { useForm } from 'react-hook-form';+import { zodResolver } from '@hookform/resolvers/zod';+import { Node } from '@/types/nodes';+import { NeuronId } from '@/lib/id';const formSchema = z.object({name: z.string().min(3, 'Name must be at least 3 characters long.'),@@ -30,8 +37,8 @@ interface SpaceCreateDialogProps {}export const SpaceCreateDialog = ({- open,- onOpenChange,+ open,+ onOpenChange,}: SpaceCreateDialogProps) => {const workspace = useWorkspace();const [isPending, setIsPending] = React.useState(false);@@ -46,7 +53,7 @@ export const SpaceCreateDialog = ({const handleCancel = () => {form.reset();onOpenChange(false);- }+ };const handleSubmit = async (values: z.infer<typeof formSchema>) => {setIsPending(true);@@ -56,31 +63,32 @@ export const SpaceCreateDialog = ({id: NeuronId.generate(NeuronId.Type.Page),type: 'page',attrs: {- name: 'Home'+ name: 'Home',},workspaceId: workspace.id,parentId: spaceId,createdAt: new Date(),createdBy: workspace.userNodeId,- versionId: NeuronId.generate(NeuronId.Type.Version)+ versionId: NeuronId.generate(NeuronId.Type.Version),};const channelNode: Node = {id: NeuronId.generate(NeuronId.Type.Channel),type: 'channel',attrs: {- name: 'Discussions'+ name: 'Discussions',},workspaceId: workspace.id,parentId: spaceId,createdAt: new Date(),createdBy: workspace.userNodeId,- versionId: NeuronId.generate(NeuronId.Type.Version)+ versionId: NeuronId.generate(NeuronId.Type.Version),};const spaceNode: Node = {- id: NeuronId.generate(NeuronId.Type.Space),+ id: spaceId,type: 'space',+ parentId: null,attrs: {name: values.name,description: values.description,@@ -88,23 +96,23 @@ export const SpaceCreateDialog = ({content: [{type: 'page',- id: pageNode.id+ id: pageNode.id,},{type: 'channel',- id: channelNode.id- }+ id: channelNode.id,+ },],workspaceId: workspace.id,createdAt: new Date(),createdBy: workspace.userNodeId,- versionId: NeuronId.generate(NeuronId.Type.Version)+ versionId: NeuronId.generate(NeuronId.Type.Version),};await workspace.addNodes([spaceNode, pageNode, channelNode]);setIsPending(false);onOpenChange(false);- }+ };return (<Dialog open={open} onOpenChange={onOpenChange}>@@ -124,20 +132,20 @@ export const SpaceCreateDialog = ({<FormFieldcontrol={form.control}name="name"- render={({field}) => (+ render={({ field }) => (<FormItem className="flex-1"><FormLabel>Name *</FormLabel><FormControl><Input placeholder="Name" {...field} /></FormControl>- <FormMessage/>+ <FormMessage /></FormItem>)}/><FormFieldcontrol={form.control}name="description"- render={({field}) => (+ render={({ field }) => (<FormItem><FormLabel>Description</FormLabel><FormControl>@@ -146,7 +154,7 @@ export const SpaceCreateDialog = ({{...field}/></FormControl>- <FormMessage/>+ <FormMessage /></FormItem>)}/>@@ -165,4 +173,4 @@ export const SpaceCreateDialog = ({</DialogContent></Dialog>);-}\ No newline at end of file+};diff --git a/desktop/src/electron/database/global/migrations.ts b/desktop/src/electron/database/global/migrations.tsindex d77a0e49..4bb2fcf4 100644--- a/desktop/src/electron/database/global/migrations.ts+++ b/desktop/src/electron/database/global/migrations.ts@@ -4,7 +4,7 @@ const createAccountsTable: Migration = {up: async (db) => {await db.schema.createTable('accounts')- .addColumn('id', 'text', (col) => col.notNull())+ .addColumn('id', 'text', (col) => col.notNull().primaryKey()).addColumn('name', 'text', (col) => col.notNull()).addColumn('email', 'text', (col) => col.notNull()).addColumn('avatar', 'text')@@ -39,7 +39,7 @@ const createTransactionsTable: Migration = {up: async (db) => {await db.schema.createTable('transactions')- .addColumn('id', 'text', (col) => col.notNull())+ .addColumn('id', 'text', (col) => col.notNull().primaryKey()).addColumn('workspace_id', 'text', (col) => col.notNull()).addColumn('account_id', 'text', (col) => col.notNull()).addColumn('type', 'text', (col) => col.notNull())diff --git a/desktop/src/electron/database/workspace/migrations.ts b/desktop/src/electron/database/workspace/migrations.tsindex c7bfacf2..035468a1 100644--- a/desktop/src/electron/database/workspace/migrations.ts+++ b/desktop/src/electron/database/workspace/migrations.ts@@ -4,9 +4,11 @@ const createNodesTable: Migration = {up: async (db) => {await db.schema.createTable('nodes')- .addColumn('id', 'text', (col) => col.notNull())+ .addColumn('id', 'text', (col) => col.notNull().primaryKey()).addColumn('workspace_id', 'text', (col) => col.notNull())- .addColumn('parent_id', 'text')+ .addColumn('parent_id', 'text', (col) =>+ col.references('nodes.id').onDelete('cascade'),+ ).addColumn('type', 'text', (col) => col.notNull()).addColumn('attrs', 'text').addColumn('content', 'text')diff --git a/desktop/src/types/nodes.ts b/desktop/src/types/nodes.tsindex 64c9c3bc..090c2c74 100644--- a/desktop/src/types/nodes.ts+++ b/desktop/src/types/nodes.ts@@ -1,7 +1,7 @@export type Node = {id: string;workspaceId: string;- parentId?: string;+ parentId?: string | null;type: string;attrs: any;content?: NodeContent[] | null;diff --git a/server/prisma/migrations/20240801071514_init_db/migration.sql b/server/prisma/migrations/20240804091557_init_db/migration.sqlsimilarity index 91%rename from server/prisma/migrations/20240801071514_init_db/migration.sqlrename to server/prisma/migrations/20240804091557_init_db/migration.sqlindex e61f4962..24b3890b 100644--- a/server/prisma/migrations/20240801071514_init_db/migration.sql+++ b/server/prisma/migrations/20240804091557_init_db/migration.sql@@ -66,3 +66,6 @@ CREATE TABLE "nodes" (-- CreateIndexCREATE UNIQUE INDEX "IX_accounts_email" ON "accounts"("email");++-- AddForeignKey+ALTER TABLE "nodes" ADD CONSTRAINT "nodes_parent_id_fkey" FOREIGN KEY ("parent_id") REFERENCES "nodes"("id") ON DELETE CASCADE ON UPDATE CASCADE;diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prismaindex 94c0e620..61c0a831 100644--- a/server/prisma/schema.prisma+++ b/server/prisma/schema.prisma@@ -67,5 +67,8 @@ model nodes {updatedBy String? @db.VarChar(30) @map("updated_by")versionId String @db.VarChar(30) @map("version_id")+ parent nodes? @relation("node_parent_child", fields: [parentId], references: [id], onDelete: Cascade)+ children nodes[] @relation("node_parent_child")+@@map("nodes")}