Skip to content

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

Fix some workspace user mutations

Hakan Shehu87fa77f6aa02
diff --git a/desktop/src/main/handlers/mutations/index.ts b/desktop/src/main/handlers/mutations/index.ts
index e9ed8258..e0316f5b 100644
--- a/desktop/src/main/handlers/mutations/index.ts
+++ b/desktop/src/main/handlers/mutations/index.ts
@@ -22,8 +22,8 @@ import { RecordCreateMutationHandler } from '@/main/handlers/mutations/record-cr
import { SelectOptionCreateMutationHandler } from '@/main/handlers/mutations/select-option-create';
import { ServerCreateMutationHandler } from '@/main/handlers/mutations/server-create';
import { SpaceCreateMutationHandler } from '@/main/handlers/mutations/space-create';
-import { WorkspaceAccountRoleUpdateMutationHandler } from '@/main/handlers/mutations/workspace-account-role-update';
-import { WorkspaceAccountsInviteMutationHandler } from '@/main/handlers/mutations/workspace-accounts-invite';
+import { WorkspaceUserRoleUpdateMutationHandler } from '@/main/handlers/mutations/workspace-user-role-update';
+import { WorkspaceUsersInviteMutationHandler } from '@/main/handlers/mutations/workspace-users-invite';
import { WorkspaceCreateMutationHandler } from '@/main/handlers/mutations/workspace-create';
import { WorkspaceUpdateMutationHandler } from '@/main/handlers/mutations/workspace-update';
import { DocumentSaveMutationHandler } from '@/main/handlers/mutations/document-save';
@@ -62,9 +62,8 @@ export const mutationHandlerMap: MutationHandlerMap = {
select_option_create: new SelectOptionCreateMutationHandler(),
server_create: new ServerCreateMutationHandler(),
space_create: new SpaceCreateMutationHandler(),
- workspace_account_role_update:
- new WorkspaceAccountRoleUpdateMutationHandler(),
- workspace_accounts_invite: new WorkspaceAccountsInviteMutationHandler(),
+ workspace_user_role_update: new WorkspaceUserRoleUpdateMutationHandler(),
+ workspace_users_invite: new WorkspaceUsersInviteMutationHandler(),
workspace_create: new WorkspaceCreateMutationHandler(),
workspace_update: new WorkspaceUpdateMutationHandler(),
document_save: new DocumentSaveMutationHandler(),
diff --git a/desktop/src/main/handlers/mutations/workspace-account-role-update.ts b/desktop/src/main/handlers/mutations/workspace-user-role-update.ts
similarity index 77%
rename from desktop/src/main/handlers/mutations/workspace-account-role-update.ts
rename to desktop/src/main/handlers/mutations/workspace-user-role-update.ts
index 3455a1ae..cbad9a7e 100644
--- a/desktop/src/main/handlers/mutations/workspace-account-role-update.ts
+++ b/desktop/src/main/handlers/mutations/workspace-user-role-update.ts
@@ -1,19 +1,19 @@
import { databaseManager } from '@/main/data/database-manager';
import { buildAxiosInstance } from '@/lib/servers';
-import { WorkspaceAccountRoleUpdateMutationInput } from '@/operations/mutations/workspace-account-role-update';
+import { WorkspaceUserRoleUpdateMutationInput } from '@/operations/mutations/workspace-user-role-update';
import {
MutationChange,
MutationHandler,
MutationResult,
} from '@/operations/mutations';
-import { WorkspaceAccountRoleUpdateOutput } from '@/types/workspaces';
+import { WorkspaceUserRoleUpdateOutput } from '@/types/workspaces';
-export class WorkspaceAccountRoleUpdateMutationHandler
- implements MutationHandler<WorkspaceAccountRoleUpdateMutationInput>
+export class WorkspaceUserRoleUpdateMutationHandler
+ implements MutationHandler<WorkspaceUserRoleUpdateMutationInput>
{
async handleMutation(
- input: WorkspaceAccountRoleUpdateMutationInput,
- ): Promise<MutationResult<WorkspaceAccountRoleUpdateMutationInput>> {
+ input: WorkspaceUserRoleUpdateMutationInput,
+ ): Promise<MutationResult<WorkspaceUserRoleUpdateMutationInput>> {
const workspace = await databaseManager.appDatabase
.selectFrom('workspaces')
.selectAll()
@@ -61,8 +61,8 @@ export class WorkspaceAccountRoleUpdateMutationHandler
server.attributes,
account.token,
);
- const { data } = await axios.post<WorkspaceAccountRoleUpdateOutput>(
- `/v1/workspaces/${workspace.workspace_id}/users/${input.accountId}`,
+ const { data } = await axios.put<WorkspaceUserRoleUpdateOutput>(
+ `/v1/workspaces/${workspace.workspace_id}/users/${input.userToUpdateId}`,
{
role: input.role,
},
diff --git a/desktop/src/main/handlers/mutations/workspace-accounts-invite.ts b/desktop/src/main/handlers/mutations/workspace-users-invite.ts
similarity index 83%
rename from desktop/src/main/handlers/mutations/workspace-accounts-invite.ts
rename to desktop/src/main/handlers/mutations/workspace-users-invite.ts
index 8a4ced61..4a57054a 100644
--- a/desktop/src/main/handlers/mutations/workspace-accounts-invite.ts
+++ b/desktop/src/main/handlers/mutations/workspace-users-invite.ts
@@ -1,20 +1,20 @@
import { databaseManager } from '@/main/data/database-manager';
import { buildAxiosInstance } from '@/lib/servers';
-import { WorkspaceAccountsInviteMutationInput } from '@/operations/mutations/workspace-accounts-invite';
+import { WorkspaceUsersInviteMutationInput } from '@/operations/mutations/workspace-users-invite';
import {
MutationChange,
MutationHandler,
MutationResult,
} from '@/operations/mutations';
-import { WorkspaceAccountsInviteOutput } from '@/types/workspaces';
+import { WorkspaceUsersInviteOutput } from '@/types/workspaces';
import { CreateNode } from '@/main/data/workspace/schema';
-export class WorkspaceAccountsInviteMutationHandler
- implements MutationHandler<WorkspaceAccountsInviteMutationInput>
+export class WorkspaceUsersInviteMutationHandler
+ implements MutationHandler<WorkspaceUsersInviteMutationInput>
{
async handleMutation(
- input: WorkspaceAccountsInviteMutationInput,
- ): Promise<MutationResult<WorkspaceAccountsInviteMutationInput>> {
+ input: WorkspaceUsersInviteMutationInput,
+ ): Promise<MutationResult<WorkspaceUsersInviteMutationInput>> {
const workspace = await databaseManager.appDatabase
.selectFrom('workspaces')
.selectAll()
@@ -62,7 +62,7 @@ export class WorkspaceAccountsInviteMutationHandler
server.attributes,
account.token,
);
- const { data } = await axios.post<WorkspaceAccountsInviteOutput>(
+ const { data } = await axios.post<WorkspaceUsersInviteOutput>(
`/v1/workspaces/${workspace.workspace_id}/users`,
{
emails: input.emails,
diff --git a/desktop/src/operations/mutations/workspace-account-role-update.ts b/desktop/src/operations/mutations/workspace-account-role-update.ts
deleted file mode 100644
index 37b33e4e..00000000
--- a/desktop/src/operations/mutations/workspace-account-role-update.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export type WorkspaceAccountRoleUpdateMutationInput = {
- type: 'workspace_account_role_update';
- accountId: string;
- role: string;
- userId: string;
-};
-
-export type WorkspaceAccountRoleUpdateMutationOutput = {
- success: boolean;
-};
-
-declare module '@/operations/mutations' {
- interface MutationMap {
- workspace_account_role_update: {
- input: WorkspaceAccountRoleUpdateMutationInput;
- output: WorkspaceAccountRoleUpdateMutationOutput;
- };
- }
-}
diff --git a/desktop/src/operations/mutations/workspace-accounts-invite.ts b/desktop/src/operations/mutations/workspace-accounts-invite.ts
deleted file mode 100644
index 699db51a..00000000
--- a/desktop/src/operations/mutations/workspace-accounts-invite.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export type WorkspaceAccountsInviteMutationInput = {
- type: 'workspace_accounts_invite';
- emails: string[];
- userId: string;
-};
-
-export type WorkspaceAccountsInviteMutationOutput = {
- success: boolean;
-};
-
-declare module '@/operations/mutations' {
- interface MutationMap {
- workspace_accounts_invite: {
- input: WorkspaceAccountsInviteMutationInput;
- output: WorkspaceAccountsInviteMutationOutput;
- };
- }
-}
diff --git a/desktop/src/operations/mutations/workspace-user-role-update.ts b/desktop/src/operations/mutations/workspace-user-role-update.ts
new file mode 100644
index 00000000..c045200d
--- /dev/null
+++ b/desktop/src/operations/mutations/workspace-user-role-update.ts
@@ -0,0 +1,19 @@
+export type WorkspaceUserRoleUpdateMutationInput = {
+ type: 'workspace_user_role_update';
+ userToUpdateId: string;
+ role: string;
+ userId: string;
+};
+
+export type WorkspaceUserRoleUpdateMutationOutput = {
+ success: boolean;
+};
+
+declare module '@/operations/mutations' {
+ interface MutationMap {
+ workspace_user_role_update: {
+ input: WorkspaceUserRoleUpdateMutationInput;
+ output: WorkspaceUserRoleUpdateMutationOutput;
+ };
+ }
+}
diff --git a/desktop/src/operations/mutations/workspace-users-invite.ts b/desktop/src/operations/mutations/workspace-users-invite.ts
new file mode 100644
index 00000000..b36cbc50
--- /dev/null
+++ b/desktop/src/operations/mutations/workspace-users-invite.ts
@@ -0,0 +1,18 @@
+export type WorkspaceUsersInviteMutationInput = {
+ type: 'workspace_users_invite';
+ emails: string[];
+ userId: string;
+};
+
+export type WorkspaceUsersInviteMutationOutput = {
+ success: boolean;
+};
+
+declare module '@/operations/mutations' {
+ interface MutationMap {
+ workspace_users_invite: {
+ input: WorkspaceUsersInviteMutationInput;
+ output: WorkspaceUsersInviteMutationOutput;
+ };
+ }
+}
diff --git a/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx b/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx
index 5f99f15a..14d22f28 100644
--- a/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx
+++ b/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx
@@ -77,7 +77,7 @@ export const WorkspaceUserInvite = () => {
mutate({
input: {
- type: 'workspace_accounts_invite',
+ type: 'workspace_users_invite',
emails: emails,
userId: workspace.userId,
},
diff --git a/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx b/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
index 7eeb3c2c..38abea8a 100644
--- a/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
+++ b/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
@@ -41,12 +41,12 @@ const roles: WorkspaceRoleItem[] = [
];
interface WorkspaceUserRoleDropdownProps {
- accountId: string;
+ userId: string;
value: WorkspaceRole;
}
export const WorkspaceUserRoleDropdown = ({
- accountId,
+ userId,
value,
}: WorkspaceUserRoleDropdownProps) => {
const workspace = useWorkspace();
@@ -79,8 +79,8 @@ export const WorkspaceUserRoleDropdown = ({
mutate({
input: {
- type: 'workspace_account_role_update',
- accountId: accountId,
+ type: 'workspace_user_role_update',
+ userToUpdateId: userId,
role: role.value,
userId: workspace.userId,
},
diff --git a/desktop/src/renderer/components/workspaces/workspace-users.tsx b/desktop/src/renderer/components/workspaces/workspace-users.tsx
index e3a5cea7..e49961ed 100644
--- a/desktop/src/renderer/components/workspaces/workspace-users.tsx
+++ b/desktop/src/renderer/components/workspaces/workspace-users.tsx
@@ -75,7 +75,7 @@ export const WorkspaceUsers = () => {
<p className="text-sm font-medium leading-none">{name}</p>
<p className="text-sm text-muted-foreground">{email}</p>
</div>
- <WorkspaceUserRoleDropdown accountId={accountId} value={role} />
+ <WorkspaceUserRoleDropdown userId={user.id} value={role} />
</div>
);
})}
diff --git a/desktop/src/types/workspaces.ts b/desktop/src/types/workspaces.ts
index a9d273fd..ecba692d 100644
--- a/desktop/src/types/workspaces.ts
+++ b/desktop/src/types/workspaces.ts
@@ -34,11 +34,11 @@ export type WorkspaceUserOutput = {
node: ServerNode;
};
-export type WorkspaceAccountsInviteOutput = {
+export type WorkspaceUsersInviteOutput = {
users: ServerNode[];
};
-export type WorkspaceAccountRoleUpdateOutput = {
+export type WorkspaceUserRoleUpdateOutput = {
user: ServerNode;
};