Skip to content

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

Rename node_permissions to node_collaborators

Hakan Shehu931691eeb700
diff --git a/desktop/src/components/collaborators/node-collaborator-create.tsx b/desktop/src/components/collaborators/node-collaborator-create.tsx
index 19fae324..36fc196a 100644
--- a/desktop/src/components/collaborators/node-collaborator-create.tsx
+++ b/desktop/src/components/collaborators/node-collaborator-create.tsx
@@ -3,7 +3,7 @@ import { NodeCollaboratorSearch } from '@/components/collaborators/node-collabor
import { NodeCollaboratorNode } from '@/types/nodes';
import { Button } from '@/components/ui/button';
import { Spinner } from '@/components/ui/spinner';
-import { NodeCollaboratorPermissionDropdown } from './node-collaborator-permission-dropdown';
+import { NodeCollaboratorRoleDropdown } from '@/components/collaborators/node-collaborator-role-dropdown';
import { useNodeCollaboratorCreateMutation } from '@/mutations/use-node-collaborator-create-mutation';
import { toast } from '../ui/use-toast';
@@ -21,7 +21,7 @@ export const NodeCollaboratorCreate = ({
const [collaborators, setCollaborators] = React.useState<
NodeCollaboratorNode[]
>([]);
- const [permission, setPermission] = React.useState('collaborator');
+ const [role, setRole] = React.useState('collaborator');
return (
<div className="flex flex-col gap-2">
@@ -31,10 +31,7 @@ export const NodeCollaboratorCreate = ({
excluded={existingCollaborators}
/>
<div className="flex justify-end space-x-2">
- <NodeCollaboratorPermissionDropdown
- value={permission}
- onChange={setPermission}
- />
+ <NodeCollaboratorRoleDropdown value={role} onChange={setRole} />
<Button
variant="default"
className="shrink-0"
@@ -51,7 +48,7 @@ export const NodeCollaboratorCreate = ({
collaboratorIds: collaborators.map(
(collaborator) => collaborator.id,
),
- permission: permission,
+ role: role,
},
{
onSuccess() {
diff --git a/desktop/src/components/collaborators/node-collaborator-permission-dropdown.tsx b/desktop/src/components/collaborators/node-collaborator-role-dropdown.tsx
similarity index 73%
rename from desktop/src/components/collaborators/node-collaborator-permission-dropdown.tsx
rename to desktop/src/components/collaborators/node-collaborator-role-dropdown.tsx
index f10337fd..95539ccb 100644
--- a/desktop/src/components/collaborators/node-collaborator-permission-dropdown.tsx
+++ b/desktop/src/components/collaborators/node-collaborator-role-dropdown.tsx
@@ -7,14 +7,14 @@ import {
} from '@/components/ui/dropdown-menu';
import { Icon } from '@/components/ui/icon';
-interface NodeCollaboratorPermission {
+interface NodeCollaboratorRole {
name: string;
value: string;
description: string;
enabled: boolean;
}
-const permissions: NodeCollaboratorPermission[] = [
+const roles: NodeCollaboratorRole[] = [
{
name: 'Owner',
value: 'owner',
@@ -35,22 +35,22 @@ const permissions: NodeCollaboratorPermission[] = [
},
];
-interface NodeCollaboratorPermissionDropdownProps {
+interface NodeCollaboratorRoleDropdownProps {
value: string;
onChange: (value: string) => void;
}
-export const NodeCollaboratorPermissionDropdown = ({
+export const NodeCollaboratorRoleDropdown = ({
value,
onChange,
-}: NodeCollaboratorPermissionDropdownProps) => {
- const currentPermission = permissions.find((role) => role.value === value);
+}: NodeCollaboratorRoleDropdownProps) => {
+ const currentRole = roles.find((role) => role.value === value);
return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<p className="flex cursor-pointer flex-row items-center p-1 text-sm text-muted-foreground hover:bg-gray-50">
- {currentPermission?.name}
+ {currentRole?.name}
<Icon
name="arrow-down-s-line"
className="ml-2 h-4 w-4 text-muted-foreground"
@@ -58,23 +58,23 @@ export const NodeCollaboratorPermissionDropdown = ({
</p>
</DropdownMenuTrigger>
<DropdownMenuContent>
- {permissions.map((permission) => (
+ {roles.map((role) => (
<DropdownMenuItem
- key={permission.value}
+ key={role.value}
onSelect={() => {
- onChange(permission.value);
+ onChange(role.value);
}}
>
<div className="flex w-full flex-row items-center justify-between">
<div className="flex w-full flex-col">
<p className="mb-1 text-sm font-medium leading-none">
- {permission.name}
+ {role.name}
</p>
<p className="text-sm text-muted-foreground">
- {permission.description}
+ {role.description}
</p>
</div>
- {value === permission.value && (
+ {value === role.value && (
<Icon name="check-line" className="mr-2 h-4 w-4" />
)}
</div>
diff --git a/desktop/src/components/collaborators/node-collaborator.tsx b/desktop/src/components/collaborators/node-collaborator.tsx
index f8fb7241..29e35432 100644
--- a/desktop/src/components/collaborators/node-collaborator.tsx
+++ b/desktop/src/components/collaborators/node-collaborator.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { NodeCollaboratorNode } from '@/types/nodes';
import { Avatar } from '@/components/ui/avatar';
-import { NodeCollaboratorPermissionDropdown } from './node-collaborator-permission-dropdown';
import { Icon } from '@/components/ui/icon';
+import { NodeCollaboratorRoleDropdown } from '@/components/collaborators/node-collaborator-role-dropdown';
import { useNodeCollaboratorDeleteMutation } from '@/mutations/use-node-collaborator-delete-mutation';
import { useNodeCollaboratorUpdateMutation } from '@/mutations/use-node-collaborator-update-mutation';
@@ -35,13 +35,13 @@ export const NodeCollaborator = ({
</div>
</div>
<div className="flex flex-row items-center gap-1">
- <NodeCollaboratorPermissionDropdown
- value={collaborator.permission}
- onChange={(newPermission) => {
+ <NodeCollaboratorRoleDropdown
+ value={collaborator.role}
+ onChange={(newRole) => {
updateCollaborator({
nodeId: nodeId,
collaboratorId: collaborator.id,
- permission: newPermission,
+ role: newRole,
});
}}
/>
diff --git a/desktop/src/electron/migrations/workspace.ts b/desktop/src/electron/migrations/workspace.ts
index 5d132ffc..45353190 100644
--- a/desktop/src/electron/migrations/workspace.ts
+++ b/desktop/src/electron/migrations/workspace.ts
@@ -64,17 +64,17 @@ const createNodeNamesTable: Migration = {
},
};
-const createNodePermissionsTable: Migration = {
+const createNodeCollaboratorsTable: Migration = {
up: async (db) => {
await db.schema
- .createTable('node_permissions')
+ .createTable('node_collaborators')
.addColumn('node_id', 'text', (col) =>
col.notNull().references('nodes.id').onDelete('cascade'),
)
.addColumn('collaborator_id', 'text', (col) =>
col.notNull().references('nodes.id').onDelete('cascade'),
)
- .addColumn('permission', 'text', (col) => col.notNull())
+ .addColumn('role', 'text', (col) => col.notNull())
.addColumn('created_at', 'text', (col) => col.notNull())
.addColumn('updated_at', 'text')
.addColumn('created_by', 'text', (col) => col.notNull())
@@ -90,7 +90,7 @@ const createNodePermissionsTable: Migration = {
.execute();
},
down: async (db) => {
- await db.schema.dropTable('node_permissions').execute();
+ await db.schema.dropTable('node_collaborators').execute();
},
};
@@ -329,22 +329,22 @@ const createNodeDeleteNameTrigger: Migration = {
},
};
-const createNodePermissionInsertMutationTrigger: Migration = {
+const createNodeCollaboratorInsertMutationTrigger: Migration = {
up: async (db) => {
await sql`
- CREATE TRIGGER node_permission_insert_mutation
- AFTER INSERT ON node_permissions
+ CREATE TRIGGER node_collaborator_insert_mutation
+ AFTER INSERT ON node_collaborators
FOR EACH ROW
WHEN NEW.server_version_id IS NULL
BEGIN
INSERT INTO mutations ('action', 'table', 'after', 'created_at')
VALUES (
'insert',
- 'node_permissions',
+ 'node_collaborators',
json_object(
'node_id', NEW.'node_id',
'collaborator_id', NEW.'collaborator_id',
- 'permission', NEW.'permission',
+ 'role', NEW.'role',
'created_at', NEW.'created_at',
'updated_at', NEW.'updated_at',
'created_by', NEW.'created_by',
@@ -360,26 +360,26 @@ const createNodePermissionInsertMutationTrigger: Migration = {
`.execute(db);
},
down: async (db) => {
- await sql`DROP TRIGGER node_insert_mutation`.execute(db);
+ await sql`DROP TRIGGER node_collaborator_insert_mutation`.execute(db);
},
};
-const createNodePermissionUpdateMutationTrigger: Migration = {
+const createNodeCollaboratorUpdateMutationTrigger: Migration = {
up: async (db) => {
await sql`
- CREATE TRIGGER node_permission_update_mutation
- AFTER UPDATE ON node_permission
+ CREATE TRIGGER node_collaborator_update_mutation
+ AFTER UPDATE ON node_collaborators
FOR EACH ROW
WHEN NEW.server_version_id IS NULL OR NEW.version_id != NEW.server_version_id
BEGIN
INSERT INTO mutations ('action', 'table', 'before', 'after', 'created_at')
VALUES (
'update',
- 'node_permissions',
+ 'node_collaborators',
json_object(
'node_id', OLD.'node_id',
'collaborator_id', OLD.'collaborator_id',
- 'permission', OLD.'permission',
+ 'role', OLD.'role',
'created_at', OLD.'created_at',
'updated_at', OLD.'updated_at',
'created_by', OLD.'created_by',
@@ -392,7 +392,7 @@ const createNodePermissionUpdateMutationTrigger: Migration = {
json_object(
'node_id', NEW.'node_id',
'collaborator_id', NEW.'collaborator_id',
- 'permission', NEW.'permission',
+ 'role', NEW.'role',
'created_at', NEW.'created_at',
'updated_at', NEW.'updated_at',
'created_by', NEW.'created_by',
@@ -408,25 +408,25 @@ const createNodePermissionUpdateMutationTrigger: Migration = {
`.execute(db);
},
down: async (db) => {
- await sql`DROP TRIGGER node_update_mutation`.execute(db);
+ await sql`DROP TRIGGER node_collaborator_update_mutation`.execute(db);
},
};
-const createNodePermissionDeleteMutationTrigger: Migration = {
+const createNodeCollaboratorDeleteMutationTrigger: Migration = {
up: async (db) => {
await sql`
- CREATE TRIGGER node_permission_delete_mutation
- AFTER DELETE ON node_permissions
+ CREATE TRIGGER node_collaborator_delete_mutation
+ AFTER DELETE ON node_collaborators
FOR EACH ROW
BEGIN
INSERT INTO mutations ('action', 'table', 'before', 'created_at')
VALUES (
'delete',
- 'node_permissions',
+ 'node_collaborators',
json_object(
'node_id', OLD.'node_id',
'collaborator_id', OLD.'collaborator_id',
- 'permission', OLD.'permission',
+ 'role', OLD.'role',
'created_at', OLD.'created_at',
'updated_at', OLD.'updated_at',
'created_by', OLD.'created_by',
@@ -442,7 +442,7 @@ const createNodePermissionDeleteMutationTrigger: Migration = {
`.execute(db);
},
down: async (db) => {
- await sql`DROP TRIGGER node_delete_mutation`.execute(db);
+ await sql`DROP TRIGGER node_collaborator_delete_mutation`.execute(db);
},
};
@@ -509,7 +509,7 @@ export const workspaceDatabaseMigrations: Record<string, Migration> = {
createNodesParentIdAndTypeIndex,
'00003_create_node_reactions_table': createNodeReactionsTable,
'00004_create_node_names_table': createNodeNamesTable,
- '00005_create_node_permissions_table': createNodePermissionsTable,
+ '00005_create_node_collaborators_table': createNodeCollaboratorsTable,
'00006_create_mutations_table': createMutationsTable,
'00007_create_node_insert_mutation_trigger': createNodeInsertMutationTrigger,
'00008_create_node_update_mutation_trigger': createNodeUpdateMutationTrigger,
@@ -517,12 +517,12 @@ export const workspaceDatabaseMigrations: Record<string, Migration> = {
'00010_create_node_insert_name_trigger': createNodeInsertNameTrigger,
'00011_create_node_update_name_trigger': createNodeUpdateNameTrigger,
'00012_create_node_delete_name_trigger': createNodeDeleteNameTrigger,
- '00013_create_node_permission_insert_mutation_trigger':
- createNodePermissionInsertMutationTrigger,
- '00014_create_node_permission_update_mutation_trigger':
- createNodePermissionUpdateMutationTrigger,
- '00015_create_node_permission_delete_mutation_trigger':
- createNodePermissionDeleteMutationTrigger,
+ '00013_create_node_collaborator_insert_mutation_trigger':
+ createNodeCollaboratorInsertMutationTrigger,
+ '00014_create_node_collaborator_update_mutation_trigger':
+ createNodeCollaboratorUpdateMutationTrigger,
+ '00015_create_node_collaborator_delete_mutation_trigger':
+ createNodeCollaboratorDeleteMutationTrigger,
'00016_create_node_reaction_insert_mutation_trigger':
createNodeReactionInsertMutationTrigger,
'00017_create_node_reaction_delete_mutation_trigger':
diff --git a/desktop/src/electron/schemas/workspace.ts b/desktop/src/electron/schemas/workspace.ts
index 7c8ef5e6..af3ea52a 100644
--- a/desktop/src/electron/schemas/workspace.ts
+++ b/desktop/src/electron/schemas/workspace.ts
@@ -21,10 +21,10 @@ export type SelectNode = Selectable<NodeTable>;
export type CreateNode = Insertable<NodeTable>;
export type UpdateNode = Updateable<NodeTable>;
-interface NodePermissionTable {
+interface NodeCollaboratorTable {
node_id: ColumnType<string, string, never>;
collaborator_id: ColumnType<string, string, never>;
- permission: ColumnType<string, string, string>;
+ role: ColumnType<string, string, string>;
created_at: ColumnType<string, string, never>;
updated_at: ColumnType<string | null, string | null, string | null>;
created_by: ColumnType<string, string, never>;
@@ -35,9 +35,9 @@ interface NodePermissionTable {
server_version_id: ColumnType<string | null, string | null, string | null>;
}
-export type SelectNodePermission = Selectable<NodePermissionTable>;
-export type CreateNodePermission = Insertable<NodePermissionTable>;
-export type UpdateNodePermission = Updateable<NodePermissionTable>;
+export type SelectNodeCollaborator = Selectable<NodeCollaboratorTable>;
+export type CreateNodeCollaborator = Insertable<NodeCollaboratorTable>;
+export type UpdateNodeCollaborator = Updateable<NodeCollaboratorTable>;
interface NodeReactionTable {
node_id: ColumnType<string, string, never>;
@@ -68,6 +68,6 @@ export type UpdateMutation = Updateable<MutationTable>;
export interface WorkspaceDatabaseSchema {
nodes: NodeTable;
mutations: MutationTable;
- node_permissions: NodePermissionTable;
+ node_collaborators: NodeCollaboratorTable;
node_reactions: NodeReactionTable;
}
diff --git a/desktop/src/electron/workspace-manager.ts b/desktop/src/electron/workspace-manager.ts
index 129d44ec..ca8e610e 100644
--- a/desktop/src/electron/workspace-manager.ts
+++ b/desktop/src/electron/workspace-manager.ts
@@ -9,7 +9,7 @@ import {
} from 'kysely';
import { Workspace, WorkspaceSyncData } from '@/types/workspaces';
import {
- SelectNodePermission,
+ SelectNodeCollaborator,
WorkspaceDatabaseSchema,
} from '@/electron/schemas/workspace';
import { workspaceDatabaseMigrations } from '@/electron/migrations/workspace';
@@ -28,7 +28,7 @@ import { AxiosInstance } from 'axios';
import { debounce, isEqual } from 'lodash';
import {
ServerNode,
- ServerNodePermission,
+ ServerNodeCollaborator,
ServerNodeReaction,
} from '@/types/nodes';
import { SelectNode } from '@/electron/schemas/workspace';
@@ -236,8 +236,8 @@ export class WorkspaceManager {
public async executeServerMutation(mutation: ServerMutation): Promise<void> {
if (mutation.table === 'nodes') {
await this.executeNodeServerMutation(mutation);
- } else if (mutation.table === 'node_permissions') {
- await this.executeNodePermissionServerMutation(mutation);
+ } else if (mutation.table === 'node_collaborators') {
+ await this.executeNodeCollaboratorServerMutation(mutation);
} else if (mutation.table === 'node_reactions') {
await this.executeNodeReactionServerMutation(mutation);
}
@@ -262,16 +262,16 @@ export class WorkspaceManager {
}
}
- private async executeNodePermissionServerMutation(
+ private async executeNodeCollaboratorServerMutation(
mutation: ServerMutation,
): Promise<void> {
if (mutation.action === 'insert' && mutation.after) {
- await this.syncNodePermissionFromServer(mutation.after);
+ await this.syncNodeCollaboratorFromServer(mutation.after);
} else if (mutation.action === 'update' && mutation.after) {
- await this.syncNodePermissionFromServer(mutation.after);
+ await this.syncNodeCollaboratorFromServer(mutation.after);
} else if (mutation.action === 'delete' && mutation.before) {
await this.database
- .deleteFrom('node_permissions')
+ .deleteFrom('node_collaborators')
.where((eb) =>
eb.and([
eb('node_id', '=', mutation.before.node_id),
@@ -280,7 +280,7 @@ export class WorkspaceManager {
)
.execute();
- this.debouncedNotifyQuerySubscribers(['node_permissions']);
+ this.debouncedNotifyQuerySubscribers(['node_collaborators']);
}
}
@@ -426,68 +426,68 @@ export class WorkspaceManager {
}
}
- public async syncNodePermissionFromServer(
- nodePermission: ServerNodePermission,
+ public async syncNodeCollaboratorFromServer(
+ nodeCollaborator: ServerNodeCollaborator,
): Promise<void> {
- const existingNodePermission = await this.database
- .selectFrom('node_permissions')
+ const existingNodeCollaborator = await this.database
+ .selectFrom('node_collaborators')
.selectAll()
.where((eb) =>
eb.and([
- eb('node_id', '=', nodePermission.nodeId),
- eb('collaborator_id', '=', nodePermission.collaboratorId),
+ eb('node_id', '=', nodeCollaborator.nodeId),
+ eb('collaborator_id', '=', nodeCollaborator.collaboratorId),
]),
)
.executeTakeFirst();
- if (!existingNodePermission) {
+ if (!existingNodeCollaborator) {
await this.database
- .insertInto('node_permissions')
+ .insertInto('node_collaborators')
.values({
- node_id: nodePermission.nodeId,
- collaborator_id: nodePermission.collaboratorId,
- permission: nodePermission.permission,
- created_at: nodePermission.createdAt,
- created_by: nodePermission.createdBy,
- updated_by: nodePermission.updatedBy,
- updated_at: nodePermission.updatedAt,
- version_id: nodePermission.versionId,
- server_created_at: nodePermission.serverCreatedAt,
- server_updated_at: nodePermission.serverUpdatedAt,
- server_version_id: nodePermission.versionId,
+ node_id: nodeCollaborator.nodeId,
+ collaborator_id: nodeCollaborator.collaboratorId,
+ role: nodeCollaborator.role,
+ created_at: nodeCollaborator.createdAt,
+ created_by: nodeCollaborator.createdBy,
+ updated_by: nodeCollaborator.updatedBy,
+ updated_at: nodeCollaborator.updatedAt,
+ version_id: nodeCollaborator.versionId,
+ server_created_at: nodeCollaborator.serverCreatedAt,
+ server_updated_at: nodeCollaborator.serverUpdatedAt,
+ server_version_id: nodeCollaborator.versionId,
})
.execute();
- this.debouncedNotifyQuerySubscribers(['node_permissions']);
+ this.debouncedNotifyQuerySubscribers(['node_collaborators']);
return;
}
if (
- this.shouldUpdateNodePermissionFromServer(
- existingNodePermission,
- nodePermission,
+ this.shouldUpdateNodeCollaboratorFromServer(
+ existingNodeCollaborator,
+ nodeCollaborator,
)
) {
await this.database
- .updateTable('node_permissions')
+ .updateTable('node_collaborators')
.set({
- permission: nodePermission.permission,
- updated_at: nodePermission.updatedAt,
- updated_by: nodePermission.updatedBy,
- version_id: nodePermission.versionId,
- server_created_at: nodePermission.serverCreatedAt,
- server_updated_at: nodePermission.serverUpdatedAt,
- server_version_id: nodePermission.versionId,
+ role: nodeCollaborator.role,
+ updated_at: nodeCollaborator.updatedAt,
+ updated_by: nodeCollaborator.updatedBy,
+ version_id: nodeCollaborator.versionId,
+ server_created_at: nodeCollaborator.serverCreatedAt,
+ server_updated_at: nodeCollaborator.serverUpdatedAt,
+ server_version_id: nodeCollaborator.versionId,
})
.where((eb) =>
eb.and([
- eb('node_id', '=', nodePermission.nodeId),
- eb('collaborator_id', '=', nodePermission.collaboratorId),
+ eb('node_id', '=', nodeCollaborator.nodeId),
+ eb('collaborator_id', '=', nodeCollaborator.collaboratorId),
]),
)
.execute();
- this.debouncedNotifyQuerySubscribers(['nodes']);
+ this.debouncedNotifyQuerySubscribers(['node_collaborators']);
}
}
@@ -524,22 +524,23 @@ export class WorkspaceManager {
return true;
}
- public shouldUpdateNodePermissionFromServer(
- localNodePermission: SelectNodePermission,
- serverNodePermission: ServerNodePermission,
+ public shouldUpdateNodeCollaboratorFromServer(
+ localNodeCollaborator: SelectNodeCollaborator,
+ serverNodeCollaborator: ServerNodeCollaborator,
): boolean {
if (
- localNodePermission.server_version_id === serverNodePermission.versionId
+ localNodeCollaborator.server_version_id ===
+ serverNodeCollaborator.versionId
) {
return false;
}
- if (localNodePermission.updated_at) {
- if (!serverNodePermission.updatedAt) {
+ if (localNodeCollaborator.updated_at) {
+ if (!serverNodeCollaborator.updatedAt) {
return false;
}
- const localUpdatedAt = new Date(localNodePermission.updated_at);
- const serverUpdatedAt = new Date(serverNodePermission.updatedAt);
+ const localUpdatedAt = new Date(localNodeCollaborator.updated_at);
+ const serverUpdatedAt = new Date(serverNodeCollaborator.updatedAt);
if (localUpdatedAt > serverUpdatedAt) {
return false;
}
diff --git a/desktop/src/lib/constants.ts b/desktop/src/lib/constants.ts
index a4fbba43..e793666a 100644
--- a/desktop/src/lib/constants.ts
+++ b/desktop/src/lib/constants.ts
@@ -71,7 +71,7 @@ export const SortDirections = {
Descending: 'desc',
};
-export const NodePermission = {
+export const NodeRole = {
Owner: 'owner',
Admin: 'admin',
Collaborator: 'collaborator',
diff --git a/desktop/src/mutations/use-node-collaborator-create-mutation.tsx b/desktop/src/mutations/use-node-collaborator-create-mutation.tsx
index bd69f454..6d93c44f 100644
--- a/desktop/src/mutations/use-node-collaborator-create-mutation.tsx
+++ b/desktop/src/mutations/use-node-collaborator-create-mutation.tsx
@@ -1,12 +1,12 @@
import { useWorkspace } from '@/contexts/workspace';
-import { CreateNodePermission } from '@/electron/schemas/workspace';
+import { CreateNodeCollaborator } from '@/electron/schemas/workspace';
import { NeuronId } from '@/lib/id';
import { useMutation } from '@tanstack/react-query';
interface ReactionCreateInput {
nodeId: string;
collaboratorIds: string[];
- permission: string;
+ role: string;
}
export const useNodeCollaboratorCreateMutation = () => {
@@ -18,12 +18,12 @@ export const useNodeCollaboratorCreateMutation = () => {
return;
}
- const nodePermissionToCreate: CreateNodePermission[] =
+ const nodeCollaboratorsToCreate: CreateNodeCollaborator[] =
input.collaboratorIds.map((collaboratorId) => {
return {
node_id: input.nodeId,
collaborator_id: collaboratorId,
- permission: input.permission,
+ role: input.role,
created_at: new Date().toISOString(),
created_by: workspace.userId,
version_id: NeuronId.generate(NeuronId.Type.Version),
@@ -31,8 +31,8 @@ export const useNodeCollaboratorCreateMutation = () => {
});
const query = workspace.schema
- .insertInto('node_permissions')
- .values(nodePermissionToCreate)
+ .insertInto('node_collaborators')
+ .values(nodeCollaboratorsToCreate)
.onConflict((b) => b.doNothing())
.compile();
diff --git a/desktop/src/mutations/use-node-collaborator-delete-mutation.tsx b/desktop/src/mutations/use-node-collaborator-delete-mutation.tsx
index ecf75247..961ccbd0 100644
--- a/desktop/src/mutations/use-node-collaborator-delete-mutation.tsx
+++ b/desktop/src/mutations/use-node-collaborator-delete-mutation.tsx
@@ -12,7 +12,7 @@ export const useNodeCollaboratorDeleteMutation = () => {
return useMutation({
mutationFn: async (input: NodeCollaboratorDeleteInput) => {
const mutation = workspace.schema
- .deleteFrom('node_permissions')
+ .deleteFrom('node_collaborators')
.where((eb) =>
eb.and([
eb('node_id', '=', input.nodeId),
diff --git a/desktop/src/mutations/use-node-collaborator-update-mutation.tsx b/desktop/src/mutations/use-node-collaborator-update-mutation.tsx
index bb33803a..9592f1dd 100644
--- a/desktop/src/mutations/use-node-collaborator-update-mutation.tsx
+++ b/desktop/src/mutations/use-node-collaborator-update-mutation.tsx
@@ -5,7 +5,7 @@ import { useMutation } from '@tanstack/react-query';
interface NodeCollaboratorUpdateInput {
nodeId: string;
collaboratorId: string;
- permission: string;
+ role: string;
}
export const useNodeCollaboratorUpdateMutation = () => {
@@ -14,9 +14,9 @@ export const useNodeCollaboratorUpdateMutation = () => {
return useMutation({
mutationFn: async (input: NodeCollaboratorUpdateInput) => {
const mutation = workspace.schema
- .updateTable('node_permissions')
+ .updateTable('node_collaborators')
.set({
- permission: input.permission,
+ role: input.role,
updated_at: new Date().toISOString(),
updated_by: workspace.userId,
version_id: NeuronId.generate(NeuronId.Type.Version),
diff --git a/desktop/src/mutations/use-space-create-mutation.tsx b/desktop/src/mutations/use-space-create-mutation.tsx
index d6ea7c5f..e5595ee0 100644
--- a/desktop/src/mutations/use-space-create-mutation.tsx
+++ b/desktop/src/mutations/use-space-create-mutation.tsx
@@ -1,5 +1,5 @@
import { useWorkspace } from '@/contexts/workspace';
-import { NodePermission, NodeTypes } from '@/lib/constants';
+import { NodeRole, NodeTypes } from '@/lib/constants';
import { NeuronId } from '@/lib/id';
import { buildNodeInsertMutation, generateNodeIndex } from '@/lib/nodes';
import { useMutation } from '@tanstack/react-query';
@@ -54,19 +54,19 @@ export const useSpaceCreateMutation = () => {
],
);
- const insertPermissionQuery = workspace.schema
- .insertInto('node_permissions')
+ const insertCollaboratorQuery = workspace.schema
+ .insertInto('node_collaborators')
.values({
node_id: spaceId,
collaborator_id: workspace.userId,
- permission: NodePermission.Owner,
+ role: NodeRole.Owner,
created_at: new Date().toISOString(),
created_by: workspace.userId,
version_id: NeuronId.generate(NeuronId.Type.Version),
})
.compile();
- await workspace.mutate([insertNodesQuery, insertPermissionQuery]);
+ await workspace.mutate([insertNodesQuery, insertCollaboratorQuery]);
return spaceId;
},
});
diff --git a/desktop/src/queries/use-node-collaborator-search-query.tsx b/desktop/src/queries/use-node-collaborator-search-query.tsx
index d54429fd..04040fa0 100644
--- a/desktop/src/queries/use-node-collaborator-search-query.tsx
+++ b/desktop/src/queries/use-node-collaborator-search-query.tsx
@@ -51,7 +51,7 @@ export const useNodeCollaboratorSearchQuery = (
name: attributes.name,
email: attributes.email,
avatar: attributes.avatar,
- permission: 'collaborator',
+ role: 'collaborator',
};
});
},
diff --git a/desktop/src/queries/use-node-collaborators-query.tsx b/desktop/src/queries/use-node-collaborators-query.tsx
index cba4cdad..427ebbba 100644
--- a/desktop/src/queries/use-node-collaborators-query.tsx
+++ b/desktop/src/queries/use-node-collaborators-query.tsx
@@ -15,7 +15,7 @@ type NodeCollaboratorRow = {
node_parent_id: string | null;
collaborator_id: string;
collaborator_attributes: string;
- permission: string;
+ role: string;
};
export const useNodeCollaboratorsQuery = (nodeId: string) => {
@@ -39,17 +39,17 @@ export const useNodeCollaboratorsQuery = (nodeId: string) => {
INNER JOIN ancestors a ON n.id = a.parent_id
)
SELECT
- np.node_id,
+ nc.node_id,
a.level AS node_level,
nn.attributes AS node_attributes,
nn.parent_id AS node_parent_id,
- np.collaborator_id,
+ nc.collaborator_id,
cn.attributes AS collaborator_attributes,
- np.permission
- FROM node_permissions np
- JOIN ancestors a ON np.node_id = a.id
- JOIN nodes nn ON np.node_id = nn.id
- JOIN nodes cn ON np.collaborator_id = cn.id
+ nc.role
+ FROM node_collaborators nc
+ JOIN ancestors a ON nc.node_id = a.id
+ JOIN nodes nn ON nc.node_id = nn.id
+ JOIN nodes cn ON nc.collaborator_id = cn.id
WHERE cn.type = ${NodeTypes.User};
`.compile(workspace.schema);
@@ -83,7 +83,7 @@ const buildNodeCollaborators = (
name: collaboratorAttributes.name,
email: collaboratorAttributes.email,
avatar: collaboratorAttributes.avatar || null,
- permission: row.permission,
+ role: row.role,
};
direct.push(collaborator);
@@ -120,7 +120,7 @@ const buildNodeCollaborators = (
name: collaboratorAttributes.name,
avatar: collaboratorAttributes.avatar,
email: collaboratorAttributes.email,
- permission: row.permission,
+ role: row.role,
});
}
diff --git a/desktop/src/types/nodes.ts b/desktop/src/types/nodes.ts
index 2e2b5137..e4aff6fd 100644
--- a/desktop/src/types/nodes.ts
+++ b/desktop/src/types/nodes.ts
@@ -62,10 +62,10 @@ export type ServerNodeAttributes = {
[key: string]: any;
};
-export type ServerNodePermission = {
+export type ServerNodeCollaborator = {
nodeId: string;
collaboratorId: string;
- permission: string;
+ role: string;
workspaceId: string;
createdAt: string;
createdBy: string;
@@ -107,5 +107,5 @@ export type NodeCollaboratorNode = {
name: string;
email: string;
avatar: string | null;
- permission: string;
+ role: string;
};
diff --git a/server/src/consumers/node-permission-changes.ts b/server/src/consumers/node-collaborator-changes.ts
similarity index 64%
rename from server/src/consumers/node-permission-changes.ts
rename to server/src/consumers/node-collaborator-changes.ts
index 917740c5..a5991425 100644
--- a/server/src/consumers/node-permission-changes.ts
+++ b/server/src/consumers/node-collaborator-changes.ts
@@ -1,17 +1,17 @@
import { kafka, TOPIC_NAMES, CONSUMER_IDS } from '@/data/kafka';
-import { ChangeMessage, NodePermissionChangeData } from '@/types/changes';
+import { ChangeMessage, NodeCollaboratorChangeData } from '@/types/changes';
import { PostgresOperation } from '@/lib/constants';
import { database } from '@/data/database';
import { NeuronId } from '@/lib/id';
-import { ServerNodePermission } from '@/types/nodes';
+import { ServerNodeCollaborator } from '@/types/nodes';
-export const initNodePermissionChangesConsumer = async () => {
+export const initNodeCollaboratorChangesConsumer = async () => {
const consumer = kafka.consumer({
- groupId: CONSUMER_IDS.NODE_PERMISSION_CHANGES,
+ groupId: CONSUMER_IDS.NODE_COLLABORATOR_CHANGES,
});
await consumer.connect();
- await consumer.subscribe({ topic: TOPIC_NAMES.NODE_PERMISSION_CHANGES });
+ await consumer.subscribe({ topic: TOPIC_NAMES.NODE_COLLABORATOR_CHANGES });
await consumer.run({
eachMessage: async ({ message }) => {
@@ -21,34 +21,34 @@ export const initNodePermissionChangesConsumer = async () => {
const change = JSON.parse(
message.value.toString(),
- ) as ChangeMessage<NodePermissionChangeData>;
+ ) as ChangeMessage<NodeCollaboratorChangeData>;
- await handleNodePermissionChange(change);
+ await handleNodeCollaboratorChange(change);
},
});
};
-const handleNodePermissionChange = async (
- change: ChangeMessage<NodePermissionChangeData>,
+const handleNodeCollaboratorChange = async (
+ change: ChangeMessage<NodeCollaboratorChangeData>,
) => {
switch (change.op) {
case PostgresOperation.CREATE: {
- await handleNodePermissionCreate(change);
+ await handleNodeCollaboratorCreate(change);
break;
}
case PostgresOperation.UPDATE: {
- await handleNodePermissionUpdate(change);
+ await handleNodeCollaboratorUpdate(change);
break;
}
case PostgresOperation.DELETE: {
- await handleNodePermissionDelete(change);
+ await handleNodeCollaboratorDelete(change);
break;
}
}
};
-const handleNodePermissionCreate = async (
- change: ChangeMessage<NodePermissionChangeData>,
+const handleNodeCollaboratorCreate = async (
+ change: ChangeMessage<NodeCollaboratorChangeData>,
) => {
const reaction = change.after;
if (!reaction) {
@@ -60,24 +60,24 @@ const handleNodePermissionCreate = async (
return;
}
- const serverNodePermission: ServerNodePermission =
- mapNodePermission(reaction);
+ const serverNodeCollaborator: ServerNodeCollaborator =
+ mapNodeCollaborator(reaction);
await database
.insertInto('mutations')
.values({
id: NeuronId.generate(NeuronId.Type.Mutation),
- table: 'node_permissions',
+ table: 'node_collaborators',
action: 'insert',
workspace_id: reaction.workspace_id,
created_at: new Date(),
- after: JSON.stringify(serverNodePermission),
+ after: JSON.stringify(serverNodeCollaborator),
device_ids: deviceIds,
})
.execute();
};
-const handleNodePermissionUpdate = async (
- change: ChangeMessage<NodePermissionChangeData>,
+const handleNodeCollaboratorUpdate = async (
+ change: ChangeMessage<NodeCollaboratorChangeData>,
) => {
const reaction = change.after;
if (!reaction) {
@@ -89,24 +89,24 @@ const handleNodePermissionUpdate = async (
return;
}
- const serverNodePermission: ServerNodePermission =
- mapNodePermission(reaction);
+ const serverNodeCollaborator: ServerNodeCollaborator =
+ mapNodeCollaborator(reaction);
await database
.insertInto('mutations')
.values({
id: NeuronId.generate(NeuronId.Type.Mutation),
- table: 'node_permissions',
+ table: 'node_collaborators',
action: 'update',
workspace_id: reaction.workspace_id,
created_at: new Date(),
- after: JSON.stringify(serverNodePermission),
+ after: JSON.stringify(serverNodeCollaborator),
device_ids: deviceIds,
})
.execute();
};
-const handleNodePermissionDelete = async (
- change: ChangeMessage<NodePermissionChangeData>,
+const handleNodeCollaboratorDelete = async (
+ change: ChangeMessage<NodeCollaboratorChangeData>,
) => {
const reaction = change.before;
if (!reaction) {
@@ -118,17 +118,17 @@ const handleNodePermissionDelete = async (
return;
}
- const serverNodePermission: ServerNodePermission =
- mapNodePermission(reaction);
+ const serverNodeCollaborator: ServerNodeCollaborator =
+ mapNodeCollaborator(reaction);
await database
.insertInto('mutations')
.values({
id: NeuronId.generate(NeuronId.Type.Mutation),
- table: 'node_permissions',
+ table: 'node_collaborators',
action: 'delete',
workspace_id: reaction.workspace_id,
created_at: new Date(),
- before: JSON.stringify(serverNodePermission),
+ before: JSON.stringify(serverNodeCollaborator),
after: null,
device_ids: deviceIds,
})
@@ -153,13 +153,13 @@ const getDeviceIds = async (workspaceId: string) => {
return deviceIds;
};
-const mapNodePermission = (
- reaction: NodePermissionChangeData,
-): ServerNodePermission => {
+const mapNodeCollaborator = (
+ reaction: NodeCollaboratorChangeData,
+): ServerNodeCollaborator => {
return {
nodeId: reaction.node_id,
collaboratorId: reaction.collaborator_id,
- permission: reaction.permission,
+ role: reaction.role,
workspaceId: reaction.workspace_id,
createdAt: new Date(reaction.created_at),
createdBy: reaction.created_by,
diff --git a/server/src/data/kafka.ts b/server/src/data/kafka.ts
index 7bb355af..1776a8e5 100644
--- a/server/src/data/kafka.ts
+++ b/server/src/data/kafka.ts
@@ -23,9 +23,9 @@ export const producer = kafka.producer();
export const TOPIC_NAMES = {
NODE_CHANGES:
process.env.KAFKA_NODE_CHANGES_TOPIC_NAME ?? 'neuron_node_changes',
- NODE_PERMISSION_CHANGES:
- process.env.KAFKA_NODE_PERMISSION_CHANGES_TOPIC_NAME ??
- 'neuron_node_permission_changes',
+ NODE_COLLABORATOR_CHANGES:
+ process.env.KAFKA_NODE_COLLABORATOR_CHANGES_TOPIC_NAME ??
+ 'neuron_node_collaborator_changes',
NODE_REACTION_CHANGES:
process.env.KAFKA_NODE_REACTION_CHANGES_TOPIC_NAME ??
'neuron_node_reaction_changes',
@@ -37,9 +37,9 @@ export const CONSUMER_IDS = {
NODE_CHANGES:
process.env.KAFKA_NODE_CHANGES_CONSUMER_ID ??
'neuron_node_changes_consumer',
- NODE_PERMISSION_CHANGES:
- process.env.KAFKA_NODE_PERMISSION_CHANGES_CONSUMER_ID ??
- 'neuron_node_permission_changes_consumer',
+ NODE_COLLABORATOR_CHANGES:
+ process.env.KAFKA_NODE_COLLABORATOR_CHANGES_CONSUMER_ID ??
+ 'neuron_node_collaborator_changes_consumer',
NODE_REACTION_CHANGES:
process.env.KAFKA_NODE_REACTION_CHANGES_CONSUMER_ID ??
'neuron_node_reaction_changes_consumer',
diff --git a/server/src/data/migrations.ts b/server/src/data/migrations.ts
index d4f2e6d2..0532d1b1 100644
--- a/server/src/data/migrations.ts
+++ b/server/src/data/migrations.ts
@@ -49,7 +49,7 @@ const createWorkspaceAccountsTable: Migration = {
.addColumn('workspace_id', 'varchar(30)', (col) => col.notNull())
.addColumn('account_id', 'varchar(30)', (col) => col.notNull())
.addColumn('user_id', 'varchar(30)', (col) => col.notNull())
- .addColumn('role', 'integer', (col) => col.notNull())
+ .addColumn('role', 'varchar(30)', (col) => col.notNull())
.addColumn('attrs', 'jsonb')
.addColumn('created_at', 'timestamptz', (col) => col.notNull())
.addColumn('created_by', 'varchar(30)', (col) => col.notNull())
@@ -105,17 +105,17 @@ const createNodesTable: Migration = {
},
};
-const createNodePermissionsTable: Migration = {
+const createNodeCollaboratorsTable: Migration = {
up: async (db) => {
await db.schema
- .createTable('node_permissions')
+ .createTable('node_collaborators')
.addColumn('node_id', 'varchar(30)', (col) =>
col.notNull().references('nodes.id').onDelete('cascade'),
)
.addColumn('collaborator_id', 'varchar(30)', (col) =>
col.notNull().references('nodes.id').onDelete('cascade'),
)
- .addColumn('permission', 'varchar(30)', (col) => col.notNull())
+ .addColumn('role', 'varchar(30)', (col) => col.notNull())
.addColumn('workspace_id', 'varchar(30)', (col) => col.notNull())
.addColumn('created_at', 'timestamptz', (col) => col.notNull())
.addColumn('updated_at', 'timestamptz')
@@ -124,14 +124,14 @@ const createNodePermissionsTable: Migration = {
.addColumn('version_id', 'varchar(30)', (col) => col.notNull())
.addColumn('server_created_at', 'timestamptz')
.addColumn('server_updated_at', 'timestamptz')
- .addPrimaryKeyConstraint('node_permissions_pkey', [
+ .addPrimaryKeyConstraint('node_collaborators_pkey', [
'node_id',
'collaborator_id',
])
.execute();
},
down: async (db) => {
- await db.schema.dropTable('node_permissions').execute();
+ await db.schema.dropTable('node_collaborators').execute();
},
};
@@ -206,7 +206,7 @@ export const databaseMigrations: Record<string, Migration> = {
'00002_create_workspaces_table': createWorkspacesTable,
'00003_create_workspace_accounts_table': createWorkspaceAccountsTable,
'00004_create_nodes_table': createNodesTable,
- '00005_create_node_permissions_table': createNodePermissionsTable,
+ '00005_create_node_collaborators_table': createNodeCollaboratorsTable,
'00006_create_node_reactions_table': createNodeReactionsTable,
'00007_create_account_devices_table': createAccountDevicesTable,
'00008_create_mutations_table': createMutationsTable,
diff --git a/server/src/data/schema.ts b/server/src/data/schema.ts
index 8b9f0077..052ba94b 100644
--- a/server/src/data/schema.ts
+++ b/server/src/data/schema.ts
@@ -45,7 +45,7 @@ interface WorkspaceAccountTable {
workspace_id: ColumnType<string, string, never>;
account_id: ColumnType<string, string, never>;
user_id: ColumnType<string, string, never>;
- role: ColumnType<number, number, number>;
+ role: ColumnType<string, string, string>;
attrs: ColumnType<string | null, string | null, string | null>;
created_at: ColumnType<Date, Date, never>;
created_by: ColumnType<string, string, never>;
@@ -101,10 +101,10 @@ export type SelectNode = Selectable<NodeTable>;
export type CreateNode = Insertable<NodeTable>;
export type UpdateNode = Updateable<NodeTable>;
-interface NodePermissionTable {
+interface NodeCollaboratorTable {
node_id: ColumnType<string, string, never>;
collaborator_id: ColumnType<string, string, never>;
- permission: ColumnType<string, string, string>;
+ role: ColumnType<string, string, string>;
workspace_id: ColumnType<string, string, never>;
created_at: ColumnType<Date, Date, never>;
updated_at: ColumnType<Date | null, Date | null, Date>;
@@ -115,9 +115,9 @@ interface NodePermissionTable {
server_updated_at: ColumnType<Date | null, Date | null, Date>;
}
-export type SelectNodePermission = Selectable<NodePermissionTable>;
-export type CreateNodePermission = Insertable<NodePermissionTable>;
-export type UpdateNodePermission = Updateable<NodePermissionTable>;
+export type SelectNodeCollaborator = Selectable<NodeCollaboratorTable>;
+export type CreateNodeCollaborator = Insertable<NodeCollaboratorTable>;
+export type UpdateNodeCollaborator = Updateable<NodeCollaboratorTable>;
interface NodeReactionTable {
node_id: ColumnType<string, string, never>;
@@ -153,7 +153,7 @@ export interface DatabaseSchema {
workspace_accounts: WorkspaceAccountTable;
account_devices: AccountDeviceTable;
nodes: NodeTable;
- node_permissions: NodePermissionTable;
+ node_collaborators: NodeCollaboratorTable;
node_reactions: NodeReactionTable;
mutations: MutationTable;
}
diff --git a/server/src/index.ts b/server/src/index.ts
index c91ae486..046dac0c 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -3,7 +3,7 @@ import { initRedis } from '@/data/redis';
import { initNodeChangesConsumer } from '@/consumers/node-changes';
import { initMutationChangesConsumer } from '@/consumers/mutation-changes';
import { initMutationsSubscriber } from '@/consumers/mutations';
-import { initNodePermissionChangesConsumer } from '@/consumers/node-permission-changes';
+import { initNodeCollaboratorChangesConsumer } from '@/consumers/node-collaborator-changes';
import { initNodeReactionChangesConsumer } from '@/consumers/node-reaction-changes';
import { migrate } from '@/data/database';
@@ -14,8 +14,8 @@ migrate().then(() => {
console.log('Node changes consumer started');
});
- initNodePermissionChangesConsumer().then(() => {
- console.log('Node permission change consumer started');
+ initNodeCollaboratorChangesConsumer().then(() => {
+ console.log('Node collaborator change consumer started');
});
initNodeReactionChangesConsumer().then(() => {
diff --git a/server/src/routes/mutations.ts b/server/src/routes/mutations.ts
index 847ca1f3..4e48b860 100644
--- a/server/src/routes/mutations.ts
+++ b/server/src/routes/mutations.ts
@@ -4,7 +4,7 @@ import {
ExecuteLocalMutationsInput,
LocalMutation,
LocalNodeMutationData,
- LocalNodePermissionMutationData,
+ LocalNodeCollaboratorMutationData,
LocalNodeReactionMutationData,
} from '@/types/mutations';
import { database } from '@/data/database';
@@ -36,24 +36,24 @@ mutationsRouter.post('/', async (req: NeuronRequest, res: NeuronResponse) => {
}
break;
}
- case 'node_permissions': {
+ case 'node_collaborators': {
switch (mutation.action) {
case 'insert': {
- await handleCreateNodePermissionMutation(
+ await handleCreateNodeCollaboratorMutation(
input.workspaceId,
mutation,
);
break;
}
case 'update': {
- await handleUpdateNodePermissionMutation(
+ await handleUpdateNodeCollaboratorMutation(
input.workspaceId,
mutation,
);
break;
}
case 'delete': {
- await handleDeleteNodePermissionMutation(
+ await handleDeleteNodeCollaboratorMutation(
input.workspaceId,
mutation,
);
@@ -193,7 +193,7 @@ const handleDeleteNodeMutation = async (
await database.deleteFrom('nodes').where('id', '=', nodeData.id).execute();
};
-const handleCreateNodePermissionMutation = async (
+const handleCreateNodeCollaboratorMutation = async (
workspaceId: string,
mutation: LocalMutation,
): Promise<void> => {
@@ -201,26 +201,26 @@ const handleCreateNodePermissionMutation = async (
return;
}
- const nodePermissionData = JSON.parse(
+ const nodeCollaboratorData = JSON.parse(
mutation.after,
- ) as LocalNodePermissionMutationData;
+ ) as LocalNodeCollaboratorMutationData;
await database
- .insertInto('node_permissions')
+ .insertInto('node_collaborators')
.values({
- node_id: nodePermissionData.node_id,
- collaborator_id: nodePermissionData.collaborator_id,
- permission: nodePermissionData.permission,
+ node_id: nodeCollaboratorData.node_id,
+ collaborator_id: nodeCollaboratorData.collaborator_id,
+ role: nodeCollaboratorData.role,
workspace_id: workspaceId,
- created_at: new Date(nodePermissionData.created_at),
- created_by: nodePermissionData.created_by,
+ created_at: new Date(nodeCollaboratorData.created_at),
+ created_by: nodeCollaboratorData.created_by,
server_created_at: new Date(),
- version_id: nodePermissionData.version_id,
+ version_id: nodeCollaboratorData.version_id,
})
.onConflict((ob) => ob.doNothing())
.execute();
};
-const handleUpdateNodePermissionMutation = async (
+const handleUpdateNodeCollaboratorMutation = async (
workspaceId: string,
mutation: LocalMutation,
): Promise<void> => {
@@ -228,62 +228,64 @@ const handleUpdateNodePermissionMutation = async (
return;
}
- const nodePermissionData = JSON.parse(
+ const nodeCollaboratorData = JSON.parse(
mutation.after,
- ) as LocalNodePermissionMutationData;
+ ) as LocalNodeCollaboratorMutationData;
- const existingNodePermissions = await database
- .selectFrom('node_permissions')
+ const existingNodeCollaborator = await database
+ .selectFrom('node_collaborators')
.selectAll()
.where((eb) =>
eb.and([
- eb('node_id', '=', nodePermissionData.node_id),
- eb('collaborator_id', '=', nodePermissionData.collaborator_id),
+ eb('node_id', '=', nodeCollaboratorData.node_id),
+ eb('collaborator_id', '=', nodeCollaboratorData.collaborator_id),
]),
)
.executeTakeFirst();
if (
- !existingNodePermissions ||
- existingNodePermissions.workspace_id != workspaceId ||
- existingNodePermissions.updated_at === null ||
- existingNodePermissions.updated_by === null
+ !existingNodeCollaborator ||
+ existingNodeCollaborator.workspace_id != workspaceId ||
+ existingNodeCollaborator.updated_at === null ||
+ existingNodeCollaborator.updated_by === null
) {
return;
}
- if (existingNodePermissions.permission === nodePermissionData.permission) {
+ if (existingNodeCollaborator.role === nodeCollaboratorData.role) {
return;
}
- const updatedAt = new Date(existingNodePermissions.updated_at);
- if (existingNodePermissions.server_updated_at !== null) {
- const serverUpdatedAt = new Date(existingNodePermissions.server_updated_at);
+ const updatedAt = new Date(existingNodeCollaborator.updated_at);
+ if (existingNodeCollaborator.server_updated_at !== null) {
+ const serverUpdatedAt = new Date(
+ existingNodeCollaborator.server_updated_at,
+ );
if (serverUpdatedAt > updatedAt) {
return;
}
}
await database
- .updateTable('node_permissions')
+ .updateTable('node_collaborators')
.set({
- permission: nodePermissionData.permission,
+ role: nodeCollaboratorData.role,
updated_at: updatedAt,
updated_by:
- nodePermissionData.updated_by ?? existingNodePermissions.created_by,
- version_id: nodePermissionData.version_id,
+ nodeCollaboratorData.updated_by ?? existingNodeCollaborator.created_by,
+ version_id: nodeCollaboratorData.version_id,
server_updated_at: new Date(),
})
.where((eb) =>
eb.and([
- eb('node_id', '=', nodePermissionData.node_id),
- eb('collaborator_id', '=', nodePermissionData.collaborator_id),
+ eb('node_id', '=', nodeCollaboratorData.node_id),
+ eb('collaborator_id', '=', nodeCollaboratorData.collaborator_id),
]),
)
.execute();
};
-const handleDeleteNodePermissionMutation = async (
+const handleDeleteNodeCollaboratorMutation = async (
workspaceId: string,
mutation: LocalMutation,
): Promise<void> => {
@@ -291,34 +293,34 @@ const handleDeleteNodePermissionMutation = async (
return;
}
- const nodePermissionData = JSON.parse(
+ const nodeCollaboratorData = JSON.parse(
mutation.before,
- ) as LocalNodePermissionMutationData;
+ ) as LocalNodeCollaboratorMutationData;
- const existingNodePermissions = await database
- .selectFrom('node_permissions')
+ const existingNodeCollaborator = await database
+ .selectFrom('node_collaborators')
.selectAll()
.where((eb) =>
eb.and([
- eb('node_id', '=', nodePermissionData.node_id),
- eb('collaborator_id', '=', nodePermissionData.collaborator_id),
+ eb('node_id', '=', nodeCollaboratorData.node_id),
+ eb('collaborator_id', '=', nodeCollaboratorData.collaborator_id),
]),
)
.executeTakeFirst();
if (
- !existingNodePermissions ||
- existingNodePermissions.workspace_id != workspaceId
+ !existingNodeCollaborator ||
+ existingNodeCollaborator.workspace_id != workspaceId
) {
return;
}
await database
- .deleteFrom('node_permissions')
+ .deleteFrom('node_collaborators')
.where((eb) =>
eb.and([
- eb('node_id', '=', nodePermissionData.node_id),
- eb('collaborator_id', '=', nodePermissionData.collaborator_id),
+ eb('node_id', '=', nodeCollaboratorData.node_id),
+ eb('collaborator_id', '=', nodeCollaboratorData.collaborator_id),
]),
)
.execute();
diff --git a/server/src/types/changes.ts b/server/src/types/changes.ts
index 6444c72e..ffdcdb6c 100644
--- a/server/src/types/changes.ts
+++ b/server/src/types/changes.ts
@@ -53,10 +53,10 @@ export type NodeChangeData = {
server_updated_at: string | null;
};
-export type NodePermissionChangeData = {
+export type NodeCollaboratorChangeData = {
node_id: string;
collaborator_id: string;
- permission: string;
+ role: string;
workspace_id: string;
created_at: string;
created_by: string;
diff --git a/server/src/types/mutations.ts b/server/src/types/mutations.ts
index e4c2b051..503ea7a3 100644
--- a/server/src/types/mutations.ts
+++ b/server/src/types/mutations.ts
@@ -26,10 +26,10 @@ export type LocalNodeMutationData = {
server_version_id: string;
};
-export type LocalNodePermissionMutationData = {
+export type LocalNodeCollaboratorMutationData = {
node_id: string;
collaborator_id: string;
- permission: string;
+ role: string;
created_at: string;
updated_at?: string | null;
created_by: string;
diff --git a/server/src/types/nodes.ts b/server/src/types/nodes.ts
index e37b1b76..7a6c2a4d 100644
--- a/server/src/types/nodes.ts
+++ b/server/src/types/nodes.ts
@@ -23,10 +23,10 @@ export type ServerNodeAttributes = {
[key: string]: any;
};
-export type ServerNodePermission = {
+export type ServerNodeCollaborator = {
nodeId: string;
collaboratorId: string;
- permission: string;
+ role: string;
workspaceId: string;
createdAt: Date;
createdBy: string;
diff --git a/server/src/types/workspaces.ts b/server/src/types/workspaces.ts
index 68bf97a5..3cffb139 100644
--- a/server/src/types/workspaces.ts
+++ b/server/src/types/workspaces.ts
@@ -4,10 +4,10 @@ export enum WorkspaceStatus {
}
export enum WorkspaceRole {
- Owner = 1,
- Admin = 2,
- Collaborator = 3,
- Viewer = 4,
+ Owner = 'owner',
+ Admin = 'admin',
+ Collaborator = 'collaborator',
+ Viewer = 'viewer',
}
export enum WorkspaceAccountStatus {
@@ -54,7 +54,7 @@ export type WorkspaceOutput = {
avatar?: string | null;
versionId: string;
accountId: string;
- role: WorkspaceRole;
+ role: string;
userId: string;
};