Skip to content

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

Refactor workspace create and sync

Hakan Shehuafbaa9500ade
diff --git a/desktop/src/components/workspaces/sidebars/sidebar-header.tsx b/desktop/src/components/workspaces/sidebars/sidebar-header.tsx
index ed61dd8e..1cf2af01 100644
--- a/desktop/src/components/workspaces/sidebars/sidebar-header.tsx
+++ b/desktop/src/components/workspaces/sidebars/sidebar-header.tsx
@@ -8,13 +8,17 @@ import {
import { Icon } from '@/components/ui/icon';
import { Avatar } from '@/components/ui/avatar';
import { useAccount } from '@/contexts/account';
+import { useNavigate } from 'react-router-dom';
export const SidebarHeader = () => {
const workspace = useWorkspace();
const account = useAccount();
+ const navigate = useNavigate();
+
+ const [open, setOpen] = React.useState(false);
return (
- <Popover>
+ <Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<div className="mb-1 flex h-12 cursor-pointer items-center justify-between border-b-2 border-gray-100 p-2 text-foreground/80 hover:bg-gray-200">
<div className="flex flex-grow items-center gap-2">
@@ -49,6 +53,10 @@ export const SidebarHeader = () => {
<li
key={w.id}
className="flex flex-row items-center gap-2 rounded-md p-2 pl-1 hover:cursor-pointer hover:bg-gray-100"
+ onClick={() => {
+ navigate(`/${w.id}`);
+ setOpen(false);
+ }}
>
<Avatar id={w.id} name={w.name} className="h-7 w-7" />
<p>{w.name}</p>
@@ -58,7 +66,12 @@ export const SidebarHeader = () => {
</ul>
<hr />
<div className="flex flex-col">
- <button className="flex flex-row items-center gap-2 rounded-md p-1 pl-0 text-sm outline-none hover:cursor-pointer hover:bg-gray-100">
+ <button
+ className="flex flex-row items-center gap-2 rounded-md p-1 pl-0 text-sm outline-none hover:cursor-pointer hover:bg-gray-100"
+ onClick={() => {
+ navigate('/create');
+ }}
+ >
<Icon name="add-line" />
<span>Create workspace</span>
</button>
diff --git a/desktop/src/components/workspaces/workspace-create.tsx b/desktop/src/components/workspaces/workspace-create.tsx
index 6fa18d07..3da6fda4 100644
--- a/desktop/src/components/workspaces/workspace-create.tsx
+++ b/desktop/src/components/workspaces/workspace-create.tsx
@@ -16,10 +16,7 @@ import { Input } from '@/components/ui/input';
import { Textarea } from '@/components/ui/textarea';
import { toast } from '@/components/ui/use-toast';
import { parseApiError } from '@/lib/axios';
-import { useMutation } from '@tanstack/react-query';
-import { Workspace } from '@/types/workspaces';
-import { useAppDatabase } from '@/contexts/app-database';
-import { useAxios } from '@/contexts/axios';
+import { useWorkspaceCreateMutation } from '@/mutations/use-workspace-create-mutation';
const formSchema = z.object({
name: z.string().min(3, 'Name must be at least 3 characters long.'),
@@ -29,15 +26,7 @@ const formSchema = z.object({
type formSchemaType = z.infer<typeof formSchema>;
export const WorkspaceCreate = () => {
- const appDatabase = useAppDatabase();
- const axios = useAxios();
- const { mutate, isPending } = useMutation({
- mutationFn: async (input: formSchemaType) => {
- const { data } = await axios.post<Workspace>('v1/workspaces', input);
- return data;
- },
- });
-
+ const { mutate, isPending } = useWorkspaceCreateMutation();
const form = useForm<formSchemaType>({
resolver: zodResolver(formSchema),
defaultValues: {
@@ -47,36 +36,25 @@ export const WorkspaceCreate = () => {
});
const handleSubmit = async (values: formSchemaType) => {
- mutate(values, {
- onSuccess: async (data) => {
- const insertWorkspaceQuery = appDatabase.database
- .insertInto('workspaces')
- .values({
- id: data.id,
- account_id: data.accountId,
- name: data.name,
- description: data.description,
- avatar: data.avatar,
- role: data.role,
- synced: 0,
- user_id: data.userId,
- version_id: data.versionId,
- })
- .compile();
-
- await appDatabase.mutate(insertWorkspaceQuery);
-
- window.location.href = '/';
+ mutate(
+ {
+ name: values.name,
+ description: values.description,
},
- onError: (error) => {
- const apiError = parseApiError(error);
- toast({
- title: 'Failed to create workspace',
- description: apiError.message,
- variant: 'destructive',
- });
+ {
+ onSuccess: () => {
+ window.location.href = '/';
+ },
+ onError: (error) => {
+ const apiError = parseApiError(error);
+ toast({
+ title: 'Failed to create workspace',
+ description: apiError.message,
+ variant: 'destructive',
+ });
+ },
},
- });
+ );
};
return (
diff --git a/desktop/src/electron/workspace-manager.ts b/desktop/src/electron/workspace-manager.ts
index 95b25a9e..d0d6c693 100644
--- a/desktop/src/electron/workspace-manager.ts
+++ b/desktop/src/electron/workspace-manager.ts
@@ -291,41 +291,55 @@ export class WorkspaceManager {
return false;
}
- await this.database
- .insertInto('nodes')
- .values(
- data.nodes.map((node) => {
- return {
- id: node.id,
- attributes: JSON.stringify(node.attributes),
- state: node.state,
- created_at: node.createdAt,
- created_by: node.createdBy,
- updated_by: node.updatedBy,
- updated_at: node.updatedAt,
- version_id: node.versionId,
- server_created_at: node.serverCreatedAt,
- server_updated_at: node.serverUpdatedAt,
- server_version_id: node.versionId,
- };
- }),
- )
- .execute();
+ if (data.nodes.length === 0 && data.nodeReactions.length === 0) {
+ return true;
+ }
- await this.database
- .insertInto('node_reactions')
- .values(
- data.nodeReactions.map((nodeReaction) => {
- return {
- node_id: nodeReaction.nodeId,
- reactor_id: nodeReaction.reactorId,
- reaction: nodeReaction.reaction,
- created_at: nodeReaction.createdAt,
- server_created_at: nodeReaction.serverCreatedAt,
- };
- }),
- )
- .execute();
+ await this.database.transaction().execute(async (trx) => {
+ if (data.nodes.length > 0) {
+ await trx.deleteFrom('nodes').execute();
+
+ await trx
+ .insertInto('nodes')
+ .values(
+ data.nodes.map((node) => {
+ return {
+ id: node.id,
+ attributes: JSON.stringify(node.attributes),
+ state: node.state,
+ created_at: node.createdAt,
+ created_by: node.createdBy,
+ updated_by: node.updatedBy,
+ updated_at: node.updatedAt,
+ version_id: node.versionId,
+ server_created_at: node.serverCreatedAt,
+ server_updated_at: node.serverUpdatedAt,
+ server_version_id: node.versionId,
+ };
+ }),
+ )
+ .execute();
+ }
+
+ if (data.nodeReactions.length > 0) {
+ await trx.deleteFrom('node_reactions').execute();
+
+ await trx
+ .insertInto('node_reactions')
+ .values(
+ data.nodeReactions.map((nodeReaction) => {
+ return {
+ node_id: nodeReaction.nodeId,
+ reactor_id: nodeReaction.reactorId,
+ reaction: nodeReaction.reaction,
+ created_at: nodeReaction.createdAt,
+ server_created_at: nodeReaction.serverCreatedAt,
+ };
+ }),
+ )
+ .execute();
+ }
+ });
this.workspace.synced = true;
this.debouncedNotifyQuerySubscribers(['nodes', 'node_reactions']);
diff --git a/desktop/src/mutations/use-workspace-create-mutation.tsx b/desktop/src/mutations/use-workspace-create-mutation.tsx
new file mode 100644
index 00000000..cca63cdb
--- /dev/null
+++ b/desktop/src/mutations/use-workspace-create-mutation.tsx
@@ -0,0 +1,36 @@
+import { useAppDatabase } from '@/contexts/app-database';
+import { useAxios } from '@/contexts/axios';
+import { Workspace } from '@/types/workspaces';
+import { useMutation } from '@tanstack/react-query';
+
+interface CreateWorkspaceInput {
+ name: string;
+ description: string;
+}
+
+export const useWorkspaceCreateMutation = () => {
+ const appDatabase = useAppDatabase();
+ const axios = useAxios();
+
+ return useMutation({
+ mutationFn: async (input: CreateWorkspaceInput) => {
+ const { data } = await axios.post<Workspace>('v1/workspaces', input);
+ const insertWorkspaceQuery = appDatabase.database
+ .insertInto('workspaces')
+ .values({
+ id: data.id,
+ account_id: data.accountId,
+ name: data.name,
+ description: data.description,
+ avatar: data.avatar,
+ role: data.role,
+ synced: 0,
+ user_id: data.userId,
+ version_id: data.versionId,
+ })
+ .compile();
+
+ await appDatabase.mutate(insertWorkspaceQuery);
+ },
+ });
+};