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
User userId instead of workspaceId in routing
Hakan Shehu4e12a7e66ac5
diff --git a/apps/desktop/src/main/handlers/mutations/workspace-create.ts b/apps/desktop/src/main/handlers/mutations/workspace-create.tsindex 9772c180..5b9bbca4 100644--- a/apps/desktop/src/main/handlers/mutations/workspace-create.ts+++ b/apps/desktop/src/main/handlers/mutations/workspace-create.ts@@ -62,6 +62,7 @@ export class WorkspaceCreateMutationHandlerreturn {output: {id: data.id,+ userId: data.user.id,},changes: [{diff --git a/apps/desktop/src/operations/mutations/workspace-create.ts b/apps/desktop/src/operations/mutations/workspace-create.tsindex 1f7a2d73..e1b53597 100644--- a/apps/desktop/src/operations/mutations/workspace-create.ts+++ b/apps/desktop/src/operations/mutations/workspace-create.ts@@ -8,6 +8,7 @@ export type WorkspaceCreateMutationInput = {export type WorkspaceCreateMutationOutput = {id: string;+ userId: string;};declare module '@/operations/mutations' {diff --git a/apps/desktop/src/renderer/app.tsx b/apps/desktop/src/renderer/app.tsxindex 5838c94f..503848f8 100644--- a/apps/desktop/src/renderer/app.tsx+++ b/apps/desktop/src/renderer/app.tsx@@ -2,7 +2,7 @@ import React from 'react';import { Login } from '@/renderer/components/accounts/login';import { AppLoading } from '@/renderer/app-loading';import { AccountContext } from '@/renderer/contexts/account';-import { Outlet } from 'react-router-dom';+import { Outlet, useParams } from 'react-router-dom';import { AccountLogout } from '@/renderer/components/accounts/account-logout';import { DelayedComponent } from '@/renderer/components/ui/delayed-component';import { useQuery } from '@/renderer/hooks/use-query';@@ -11,6 +11,7 @@ import { AccountSettingsDialog } from '@/renderer/components/accounts/account-seexport const App = () => {const [showLogout, setShowLogout] = React.useState(false);const [showAccountSettings, setShowAccountSettings] = React.useState(false);+ const { userId } = useParams<{ userId: string }>();const { data: servers, isPending: isPendingServers } = useQuery({type: 'server_list',@@ -37,7 +38,21 @@ export const App = () => {return <Login />;}- const account = accounts[0];+ const workspace = workspaces?.find(+ (workspace) => workspace.userId === userId+ );++ let account = accounts[0];+ if (workspace) {+ const workspaceAccount = accounts.find(+ (account) => account.id === workspace.accountId+ );++ if (workspaceAccount) {+ account = workspaceAccount;+ }+ }+const server = servers?.find((server) => server.domain === account?.server);if (!server) {diff --git a/apps/desktop/src/renderer/components/accounts/email-login.tsx b/apps/desktop/src/renderer/components/accounts/email-login.tsxindex b40c522b..8fc625fc 100644--- a/apps/desktop/src/renderer/components/accounts/email-login.tsx+++ b/apps/desktop/src/renderer/components/accounts/email-login.tsx@@ -48,7 +48,7 @@ export const EmailLogin = ({ server }: EmailLoginProps) => {onSuccess(output) {if (output.success) {if (output.workspaces.length > 0) {- navigate(`/${output.workspaces[0].id}`);+ navigate(`/${output.workspaces[0].user.id}`);} else {navigate('/create');}diff --git a/apps/desktop/src/renderer/components/accounts/email-register.tsx b/apps/desktop/src/renderer/components/accounts/email-register.tsxindex e0415d6b..56048b86 100644--- a/apps/desktop/src/renderer/components/accounts/email-register.tsx+++ b/apps/desktop/src/renderer/components/accounts/email-register.tsx@@ -51,7 +51,7 @@ export const EmailRegister = ({ server }: EmailRegisterProps) => {onSuccess(output) {if (output.success) {if (output.workspaces.length > 0) {- navigate(`/${output.workspaces[0].id}`);+ navigate(`/${output.workspaces[0].user.id}`);} else {navigate('/create');}diff --git a/apps/desktop/src/renderer/components/workspaces/sidebars/sidebar-header.tsx b/apps/desktop/src/renderer/components/workspaces/sidebars/sidebar-header.tsxindex a2e61bf7..48d7e764 100644--- a/apps/desktop/src/renderer/components/workspaces/sidebars/sidebar-header.tsx+++ b/apps/desktop/src/renderer/components/workspaces/sidebars/sidebar-header.tsx@@ -71,7 +71,7 @@ export const SidebarHeader = () => {<DropdownMenuItemkey={workspace.id}onClick={() => {- navigate(`/${workspace.id}`);+ navigate(`/${workspace.userId}`);}}className="gap-2 p-2">diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-create.tsxindex ca0b7223..8fb0cdb3 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx@@ -32,7 +32,7 @@ export const WorkspaceCreate = () => {avatar: values.avatar ?? null,},onSuccess(output) {- navigate(`/${output.id}`);+ navigate(`/${output.userId}`);},onError() {toast({diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsxindex 46e3a748..a15096a8 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx@@ -12,7 +12,7 @@ export const WorkspaceRedirect = (): React.ReactNode => {return;}- navigate(`/${account.workspaces[0].id}`);+ navigate(`/${account.workspaces[0].userId}`);}, [account.workspaces, navigate]);return null;diff --git a/apps/desktop/src/renderer/components/workspaces/workspace.tsx b/apps/desktop/src/renderer/components/workspaces/workspace.tsxindex d6e75b01..be1856d7 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace.tsx@@ -16,13 +16,13 @@ import {} from '@/renderer/components/ui/sidebar';export const Workspace = () => {- const { workspaceId } = useParams<{ workspaceId: string }>();+ const { userId } = useParams<{ userId: string }>();const account = useAccount();const navigate = useNavigate();const [searchParams, setSearchParams] = useSearchParams();const [openSettings, setOpenSettings] = React.useState(false);- const workspace = account.workspaces.find((w) => w.id === workspaceId);+ const workspace = account.workspaces.find((w) => w.userId === userId);if (!workspace) {return <p>Workspace not found</p>;@@ -34,7 +34,7 @@ export const Workspace = () => {value={{...workspace,navigateToNode(nodeId) {- navigate(`/${workspaceId}/${nodeId}`);+ navigate(`/${userId}/${nodeId}`);},openModal(modal) {setSearchParams((prev) => {diff --git a/apps/desktop/src/renderer/root.tsx b/apps/desktop/src/renderer/root.tsxindex 731c6e29..c7e0b0cd 100644--- a/apps/desktop/src/renderer/root.tsx+++ b/apps/desktop/src/renderer/root.tsx@@ -25,7 +25,7 @@ const router = createHashRouter([element: <WorkspaceCreate />,},{- path: ':workspaceId',+ path: ':userId',element: <Workspace />,children: [{