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
Fix workspace update (#310)
Hakan Shehu4217eedad542
diff --git a/packages/client/src/handlers/mutations/workspaces/workspace-update.ts b/packages/client/src/handlers/mutations/workspaces/workspace-update.tsindex bbb0b4f7..0e3786da 100644--- a/packages/client/src/handlers/mutations/workspaces/workspace-update.ts+++ b/packages/client/src/handlers/mutations/workspaces/workspace-update.ts@@ -12,9 +12,7 @@ import { AppService } from '@colanode/client/services/app-service';import { Workspace } from '@colanode/client/types';import { WorkspaceUpdateInput } from '@colanode/core';-export class WorkspaceUpdateMutationHandler- implements MutationHandler<WorkspaceUpdateMutationInput>-{+export class WorkspaceUpdateMutationHandler implements MutationHandler<WorkspaceUpdateMutationInput> {private readonly app: AppService;constructor(app: AppService) {@@ -24,15 +22,6 @@ export class WorkspaceUpdateMutationHandlerasync handleMutation(input: WorkspaceUpdateMutationInput): Promise<WorkspaceUpdateMutationOutput> {- const accountService = this.app.getAccount(input.userId);-- if (!accountService) {- throw new MutationError(- MutationErrorCode.AccountNotFound,- 'Account not found or has been logged out.'- );- }-const workspaceService = this.app.getWorkspace(input.userId);if (!workspaceService) {throw new MutationError(@@ -48,8 +37,8 @@ export class WorkspaceUpdateMutationHandleravatar: input.avatar,};- const response = await accountService.client- .patch(`v1/workspaces/${input.id}`, {+ const response = await workspaceService.account.client+ .patch(`v1/workspaces/${workspaceService.workspace.workspaceId}`, {json: body,}).json<Workspace>();diff --git a/packages/client/src/mutations/workspaces/workspace-update.ts b/packages/client/src/mutations/workspaces/workspace-update.tsindex 2080a505..04f556d2 100644--- a/packages/client/src/mutations/workspaces/workspace-update.ts+++ b/packages/client/src/mutations/workspaces/workspace-update.ts@@ -1,10 +1,9 @@export type WorkspaceUpdateMutationInput = {type: 'workspace.update';- id: string;+ userId: string;name: string;description: string;avatar: string | null;- userId: string;};export type WorkspaceUpdateMutationOutput = {diff --git a/packages/ui/src/components/workspaces/workspace-settings-container.tsx b/packages/ui/src/components/workspaces/workspace-settings-container.tsxindex 0c53191d..8fe02c69 100644--- a/packages/ui/src/components/workspaces/workspace-settings-container.tsx+++ b/packages/ui/src/components/workspaces/workspace-settings-container.tsx@@ -20,15 +20,13 @@ export const WorkspaceSettingsContainer = () => {(q) =>q.from({ workspaces: collections.workspaces })- .where(({ workspaces }) =>- eq(workspaces.accountId, workspace.accountId)- )+ .where(({ workspaces }) => eq(workspaces.userId, workspace.userId)).select(({ workspaces }) => ({name: workspaces.name,description: workspaces.description,avatar: workspaces.avatar,})),- [workspace.accountId]+ [workspace.userId]);const currentWorkspace = currentWorkspaceQuery.data?.[0];@@ -57,7 +55,6 @@ export const WorkspaceSettingsContainer = () => {mutate({input: {type: 'workspace.update',- id: workspace.workspaceId,userId: workspace.userId,name: values.name,description: values.description,