Skip to content

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

Workspace role improvements and moved some types into colanode/core

Hakan Shehu64d9703efcc3
diff --git a/apps/desktop/src/main/data/app/schema.ts b/apps/desktop/src/main/data/app/schema.ts
index d0835e0b..0ceafd3e 100644
--- a/apps/desktop/src/main/data/app/schema.ts
+++ b/apps/desktop/src/main/data/app/schema.ts
@@ -1,3 +1,4 @@
+import { WorkspaceRole } from '@colanode/core';
import { ColumnType, Insertable, Selectable, Updateable } from 'kysely';
interface ServerTable {
@@ -37,7 +38,7 @@ interface WorkspaceTable {
description: ColumnType<string | null, string | null, string | null>;
avatar: ColumnType<string | null, string | null, string | null>;
version_id: ColumnType<string, string, string>;
- role: ColumnType<string, string, string>;
+ role: ColumnType<WorkspaceRole, WorkspaceRole, WorkspaceRole>;
}
export type SelectWorkspace = Selectable<WorkspaceTable>;
diff --git a/apps/desktop/src/main/handlers/mutations/space-create.ts b/apps/desktop/src/main/handlers/mutations/space-create.ts
index b3f1d628..7628e4b7 100644
--- a/apps/desktop/src/main/handlers/mutations/space-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/space-create.ts
@@ -8,6 +8,7 @@ import {
SpaceAttributes,
} from '@colanode/core';
import { nodeManager } from '@/main/node-manager';
+import { databaseManager } from '@/main/data/database-manager';
export class SpaceCreateMutationHandler
implements MutationHandler<SpaceCreateMutationInput>
@@ -15,6 +16,20 @@ export class SpaceCreateMutationHandler
async handleMutation(
input: SpaceCreateMutationInput
): Promise<MutationResult<SpaceCreateMutationInput>> {
+ const workspace = await databaseManager.appDatabase
+ .selectFrom('workspaces')
+ .where('user_id', '=', input.userId)
+ .selectAll()
+ .executeTakeFirst();
+
+ if (!workspace) {
+ throw new Error('Workspace not found');
+ }
+
+ if (workspace.role === 'guest' || workspace.role === 'none') {
+ throw new Error('You are not allowed to create spaces in this workspace');
+ }
+
const spaceId = generateId(IdType.Space);
const spaceAttributes: SpaceAttributes = {
type: 'space',
diff --git a/apps/desktop/src/main/handlers/mutations/workspace-create.ts b/apps/desktop/src/main/handlers/mutations/workspace-create.ts
index 5b9bbca4..b06da684 100644
--- a/apps/desktop/src/main/handlers/mutations/workspace-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/workspace-create.ts
@@ -2,7 +2,7 @@ import { databaseManager } from '@/main/data/database-manager';
import { httpClient } from '@/lib/http-client';
import { WorkspaceCreateMutationInput } from '@/operations/mutations/workspace-create';
import { MutationHandler, MutationResult } from '@/main/types';
-import { WorkspaceOutput } from '@/types/workspaces';
+import { WorkspaceOutput } from '@colanode/core';
export class WorkspaceCreateMutationHandler
implements MutationHandler<WorkspaceCreateMutationInput>
diff --git a/apps/desktop/src/main/handlers/mutations/workspace-user-role-update.ts b/apps/desktop/src/main/handlers/mutations/workspace-user-role-update.ts
index 22351352..622c4da3 100644
--- a/apps/desktop/src/main/handlers/mutations/workspace-user-role-update.ts
+++ b/apps/desktop/src/main/handlers/mutations/workspace-user-role-update.ts
@@ -2,7 +2,7 @@ import { databaseManager } from '@/main/data/database-manager';
import { httpClient } from '@/lib/http-client';
import { WorkspaceUserRoleUpdateMutationInput } from '@/operations/mutations/workspace-user-role-update';
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
-import { WorkspaceUserRoleUpdateOutput } from '@/types/workspaces';
+import { WorkspaceUserRoleUpdateOutput } from '@colanode/core';
import { toUint8Array } from 'js-base64';
export class WorkspaceUserRoleUpdateMutationHandler
diff --git a/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts b/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts
index a947499e..eb80f387 100644
--- a/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts
+++ b/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts
@@ -2,7 +2,7 @@ import { databaseManager } from '@/main/data/database-manager';
import { httpClient } from '@/lib/http-client';
import { WorkspaceUsersInviteMutationInput } from '@/operations/mutations/workspace-users-invite';
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
-import { WorkspaceUsersInviteOutput } from '@/types/workspaces';
+import { WorkspaceUsersInviteOutput } from '@colanode/core';
import { CreateNode } from '@/main/data/workspace/schema';
import { toUint8Array } from 'js-base64';
diff --git a/apps/desktop/src/main/handlers/queries/workspace-list.ts b/apps/desktop/src/main/handlers/queries/workspace-list.ts
index b29b3c3c..a071785e 100644
--- a/apps/desktop/src/main/handlers/queries/workspace-list.ts
+++ b/apps/desktop/src/main/handlers/queries/workspace-list.ts
@@ -1,6 +1,7 @@
import { WorkspaceListQueryInput } from '@/operations/queries/workspace-list';
import { databaseManager } from '@/main/data/database-manager';
-import { Workspace, WorkspaceRole } from '@/types/workspaces';
+import { Workspace } from '@/types/workspaces';
+import { WorkspaceRole } from '@colanode/core';
import { SelectWorkspace } from '@/main/data/app/schema';
import {
MutationChange,
diff --git a/apps/desktop/src/main/node-manager.ts b/apps/desktop/src/main/node-manager.ts
index 7ab62bf1..8c6e4038 100644
--- a/apps/desktop/src/main/node-manager.ts
+++ b/apps/desktop/src/main/node-manager.ts
@@ -65,6 +65,7 @@ class NodeManager {
workspace.account_id,
workspace.workspace_id,
userId,
+ workspace.role,
ancestors
);
@@ -179,6 +180,7 @@ class NodeManager {
workspace.account_id,
workspace.workspace_id,
userId,
+ workspace.role,
ancestors
);
@@ -277,6 +279,7 @@ class NodeManager {
workspace.account_id,
workspace.workspace_id,
userId,
+ workspace.role,
ancestors
);
diff --git a/apps/desktop/src/operations/mutations/email-login.ts b/apps/desktop/src/operations/mutations/email-login.ts
index 3a5d63a0..b8a080f0 100644
--- a/apps/desktop/src/operations/mutations/email-login.ts
+++ b/apps/desktop/src/operations/mutations/email-login.ts
@@ -1,5 +1,5 @@
import { Account } from '@/types/accounts';
-import { WorkspaceOutput } from '@/types/workspaces';
+import { WorkspaceOutput } from '@colanode/core';
export type EmailLoginMutationInput = {
type: 'email_login';
diff --git a/apps/desktop/src/operations/mutations/email-register.ts b/apps/desktop/src/operations/mutations/email-register.ts
index c0e485b2..a02a1c3f 100644
--- a/apps/desktop/src/operations/mutations/email-register.ts
+++ b/apps/desktop/src/operations/mutations/email-register.ts
@@ -1,5 +1,5 @@
import { Account } from '@/types/accounts';
-import { WorkspaceOutput } from '@/types/workspaces';
+import { WorkspaceOutput } from '@colanode/core';
export type EmailRegisterMutationInput = {
type: 'email_register';
diff --git a/apps/desktop/src/renderer/components/workspaces/sidebars/sidebar-spaces.tsx b/apps/desktop/src/renderer/components/workspaces/sidebars/sidebar-spaces.tsx
index dab85ee5..16ab3b9b 100644
--- a/apps/desktop/src/renderer/components/workspaces/sidebars/sidebar-spaces.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/sidebars/sidebar-spaces.tsx
@@ -1,7 +1,6 @@
import { SidebarSpaceItem } from '@/renderer/components/workspaces/sidebars/sidebar-space-item';
import { useQuery } from '@/renderer/hooks/use-query';
import { useWorkspace } from '@/renderer/contexts/workspace';
-
import {
SidebarGroup,
SidebarGroupAction,
@@ -12,6 +11,9 @@ import { SpaceCreateButton } from '@/renderer/components/spaces/space-create-but
export const SidebarSpaces = () => {
const workspace = useWorkspace();
+ const canCreateSpace =
+ workspace.role !== 'guest' && workspace.role !== 'none';
+
const { data } = useQuery({
type: 'sidebar_space_list',
userId: workspace.userId,
@@ -20,9 +22,11 @@ export const SidebarSpaces = () => {
return (
<SidebarGroup className="group/sidebar-spaces">
<SidebarGroupLabel>Spaces</SidebarGroupLabel>
- <SidebarGroupAction className="text-muted-foreground opacity-0 transition-opacity group-hover/sidebar-spaces:opacity-100">
- <SpaceCreateButton />
- </SidebarGroupAction>
+ {canCreateSpace && (
+ <SidebarGroupAction className="text-muted-foreground opacity-0 transition-opacity group-hover/sidebar-spaces:opacity-100">
+ <SpaceCreateButton />
+ </SidebarGroupAction>
+ )}
<SidebarMenu>
{data?.map((space) => <SidebarSpaceItem node={space} key={space.id} />)}
</SidebarMenu>
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
index 043d0a6d..bae1be54 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
@@ -4,7 +4,7 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from '@/renderer/components/ui/dropdown-menu';
-import { WorkspaceRole } from '@/types/workspaces';
+import { WorkspaceRole } from '@colanode/core';
import { Spinner } from '@/renderer/components/ui/spinner';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx
index d76a5fca..0417a156 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx
@@ -6,7 +6,7 @@ import { Avatar } from '@/renderer/components/avatars/avatar';
import { Spinner } from '@/renderer/components/ui/spinner';
import { InView } from 'react-intersection-observer';
import { WorkspaceUserRoleDropdown } from '@/renderer/components/workspaces/workspace-user-role-dropdown';
-import { WorkspaceRole } from '@/types/workspaces';
+import { WorkspaceRole } from '@colanode/core';
import { useWorkspace } from '@/renderer/contexts/workspace';
const USERS_PER_PAGE = 50;
diff --git a/apps/desktop/src/types/accounts.ts b/apps/desktop/src/types/accounts.ts
index f72a62f6..ee15a62a 100644
--- a/apps/desktop/src/types/accounts.ts
+++ b/apps/desktop/src/types/accounts.ts
@@ -1,4 +1,4 @@
-import { WorkspaceOutput } from '@/types/workspaces';
+import { WorkspaceOutput } from '@colanode/core';
export type LoginOutput = {
account: Account;
diff --git a/apps/desktop/src/types/nodes.ts b/apps/desktop/src/types/nodes.ts
index 527e590b..e1c92b28 100644
--- a/apps/desktop/src/types/nodes.ts
+++ b/apps/desktop/src/types/nodes.ts
@@ -1,21 +1,3 @@
-import { NodeAttributes } from '@colanode/core';
-
-export type ServerNode = {
- id: string;
- parentId: string | null;
- type: string;
- index: string | null;
- attributes: NodeAttributes;
- state: string;
- createdAt: string;
- createdBy: string;
- updatedAt: string | null;
- updatedBy: string | null;
- versionId: string;
- serverCreatedAt: string | null;
- serverUpdatedAt: string | null;
-};
-
export type NodeCollaboratorsWrapper = {
direct: NodeCollaborator[];
inherit: InheritNodeCollaboratorsGroup[];
diff --git a/apps/desktop/src/types/workspaces.ts b/apps/desktop/src/types/workspaces.ts
index fe43899f..18c302fb 100644
--- a/apps/desktop/src/types/workspaces.ts
+++ b/apps/desktop/src/types/workspaces.ts
@@ -1,11 +1,4 @@
-import { ServerNode } from '@/types/nodes';
-
-export type WorkspaceRole =
- | 'owner'
- | 'admin'
- | 'collaborator'
- | 'guest'
- | 'none';
+import { WorkspaceRole } from '@colanode/core';
export type Workspace = {
id: string;
@@ -18,33 +11,6 @@ export type Workspace = {
userId: string;
};
-export type WorkspaceOutput = {
- id: string;
- name: string;
- description?: string | null;
- avatar?: string | null;
- versionId: string;
- user: WorkspaceUserOutput;
-};
-
-export type WorkspaceUserOutput = {
- id: string;
- accountId: string;
- role: WorkspaceRole;
-};
-
-export type WorkspaceUsersInviteOutput = {
- users: ServerNode[];
-};
-
-export type WorkspaceUserRoleUpdateOutput = {
- user: ServerNode;
-};
-
-export type WorkspaceUserRemoveOutput = {
- user: ServerNode;
-};
-
export type SidebarNode = {
id: string;
type: string;
diff --git a/apps/server/src/data/schema.ts b/apps/server/src/data/schema.ts
index cd89fcd6..39555361 100644
--- a/apps/server/src/data/schema.ts
+++ b/apps/server/src/data/schema.ts
@@ -1,4 +1,4 @@
-import { NodeAttributes } from '@colanode/core';
+import { NodeAttributes, WorkspaceRole } from '@colanode/core';
import {
ColumnType,
Insertable,
@@ -67,7 +67,7 @@ interface WorkspaceUserTable {
id: ColumnType<string, string, never>;
workspace_id: ColumnType<string, string, never>;
account_id: ColumnType<string, string, never>;
- role: ColumnType<string, string, string>;
+ role: ColumnType<WorkspaceRole, WorkspaceRole, WorkspaceRole>;
attrs: ColumnType<string | null, string | null, string | null>;
created_at: ColumnType<Date, Date, never>;
created_by: ColumnType<string, string, never>;
@@ -84,7 +84,7 @@ export type UpdateWorkspaceUser = Updateable<WorkspaceUserTable>;
interface NodeTable {
id: ColumnType<string, string, never>;
workspace_id: ColumnType<string, string, never>;
- parent_id: ColumnType<string | null, never, never>;
+ parent_id: ColumnType<string, never, never>;
type: ColumnType<string, never, never>;
index: ColumnType<string | null, never, never>;
attributes: JSONColumnType<NodeAttributes, string | null, string | null>;
diff --git a/apps/server/src/lib/nodes.ts b/apps/server/src/lib/nodes.ts
index a9807453..a6d97636 100644
--- a/apps/server/src/lib/nodes.ts
+++ b/apps/server/src/lib/nodes.ts
@@ -1,6 +1,7 @@
import { database } from '@/data/database';
import { SelectNode } from '@/data/schema';
-import { NodeCollaborator, ServerNode } from '@/types/nodes';
+import { NodeCollaborator } from '@/types/nodes';
+import { NodeOutput } from '@colanode/core';
import { fromUint8Array } from 'js-base64';
import {
extractNodeCollaborators,
@@ -9,7 +10,7 @@ import {
NodeType,
} from '@colanode/core';
-export const mapServerNode = (node: SelectNode): ServerNode => {
+export const mapNodeOutput = (node: SelectNode): NodeOutput => {
return {
id: node.id,
parentId: node.parent_id,
@@ -18,13 +19,13 @@ export const mapServerNode = (node: SelectNode): ServerNode => {
index: node.index,
attributes: node.attributes,
state: fromUint8Array(node.state),
- createdAt: node.created_at,
+ createdAt: node.created_at.toISOString(),
createdBy: node.created_by,
versionId: node.version_id,
- updatedAt: node.updated_at,
- updatedBy: node.updated_by,
- serverCreatedAt: node.server_created_at,
- serverUpdatedAt: node.server_updated_at,
+ updatedAt: node.updated_at?.toISOString() ?? null,
+ updatedBy: node.updated_by ?? null,
+ serverCreatedAt: node.server_created_at.toISOString(),
+ serverUpdatedAt: node.server_updated_at?.toISOString() ?? null,
};
};
diff --git a/apps/server/src/lib/workspaces.ts b/apps/server/src/lib/workspaces.ts
index 3bc70de5..d9f8bb66 100644
--- a/apps/server/src/lib/workspaces.ts
+++ b/apps/server/src/lib/workspaces.ts
@@ -1,10 +1,6 @@
import { database } from '@/data/database';
import { CreateNode, SelectAccount } from '@/data/schema';
-import {
- WorkspaceRole,
- WorkspaceStatus,
- WorkspaceUserStatus,
-} from '@/types/workspaces';
+import { WorkspaceStatus, WorkspaceUserStatus } from '@colanode/core';
import {
ChannelAttributes,
generateId,
diff --git a/apps/server/src/routes/accounts.ts b/apps/server/src/routes/accounts.ts
index 3cc70aca..3569ca28 100644
--- a/apps/server/src/routes/accounts.ts
+++ b/apps/server/src/routes/accounts.ts
@@ -14,7 +14,7 @@ import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';
import { generateId, IdType } from '@colanode/core';
import { database } from '@/data/database';
import bcrypt from 'bcrypt';
-import { WorkspaceOutput, WorkspaceRole } from '@/types/workspaces';
+import { WorkspaceOutput, WorkspaceRole } from '@colanode/core';
import { authMiddleware } from '@/middlewares/auth';
import { generateToken } from '@/lib/tokens';
import { enqueueTask } from '@/queues/tasks';
diff --git a/apps/server/src/routes/sync.ts b/apps/server/src/routes/sync.ts
index bfcf7164..38b10a4e 100644
--- a/apps/server/src/routes/sync.ts
+++ b/apps/server/src/routes/sync.ts
@@ -134,6 +134,7 @@ const handleCreateNodeChange = async (
workspaceUser.account_id,
workspaceUser.workspace_id,
changeData.createdBy,
+ workspaceUser.role,
ancestors
);
@@ -226,6 +227,7 @@ const handleUpdateNodeChange = async (
workspaceUser.account_id,
workspaceUser.workspace_id,
changeData.updatedBy,
+ workspaceUser.role,
ancestors
);
@@ -311,6 +313,7 @@ const handleDeleteNodeChange = async (
workspaceUser.account_id,
workspaceUser.workspace_id,
changeData.deletedBy,
+ workspaceUser.role,
ancestors
);
diff --git a/apps/server/src/routes/workspaces.ts b/apps/server/src/routes/workspaces.ts
index 35eae2c5..047de6ff 100644
--- a/apps/server/src/routes/workspaces.ts
+++ b/apps/server/src/routes/workspaces.ts
@@ -1,12 +1,14 @@
import {
- WorkspaceAccountRoleUpdateInput,
- WorkspaceAccountsInviteInput,
- WorkspaceUserStatus,
- WorkspaceInput,
+ WorkspaceUsersInviteInput,
+ WorkspaceUserRoleUpdateInput,
+ WorkspaceCreateInput,
WorkspaceOutput,
WorkspaceRole,
WorkspaceStatus,
-} from '@/types/workspaces';
+ WorkspaceUserStatus,
+ WorkspaceUpdateInput,
+ NodeOutput,
+} from '@colanode/core';
import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';
import {
generateId,
@@ -25,8 +27,7 @@ import {
} from '@/data/schema';
import { getNameFromEmail } from '@/lib/utils';
import { AccountStatus } from '@/types/accounts';
-import { ServerNode } from '@/types/nodes';
-import { mapServerNode } from '@/lib/nodes';
+import { mapNodeOutput } from '@/lib/nodes';
import { NodeCreatedEvent, NodeUpdatedEvent } from '@/types/events';
import { enqueueEvent } from '@/queues/events';
import { YDoc } from '@colanode/crdt';
@@ -36,7 +37,7 @@ export const workspacesRouter = Router();
workspacesRouter.post(
'/',
async (req: ColanodeRequest, res: ColanodeResponse) => {
- const input: WorkspaceInput = req.body;
+ const input: WorkspaceCreateInput = req.body;
if (!req.account) {
return res.status(401).json({
@@ -202,7 +203,7 @@ workspacesRouter.put(
'/:id',
async (req: ColanodeRequest, res: ColanodeResponse) => {
const id = req.params.id as string;
- const input: WorkspaceInput = req.body;
+ const input: WorkspaceUpdateInput = req.body;
if (!req.account) {
return res.status(401).json({
@@ -449,7 +450,7 @@ workspacesRouter.post(
'/:id/users',
async (req: ColanodeRequest, res: ColanodeResponse) => {
const id = req.params.id as string;
- const input: WorkspaceAccountsInviteInput = req.body;
+ const input: WorkspaceUsersInviteInput = req.body;
if (!input.emails || input.emails.length === 0) {
return res.status(400).json({
@@ -536,7 +537,7 @@ workspacesRouter.post(
const workspaceUsersToCreate: CreateWorkspaceUser[] = [];
const usersToCreate: CreateNode[] = [];
- const users: ServerNode[] = [];
+ const users: NodeOutput[] = [];
for (const email of input.emails) {
let account = existingAccounts.find((account) => account.email === email);
@@ -577,7 +578,7 @@ workspacesRouter.post(
});
}
- users.push(mapServerNode(existingUser));
+ users.push(mapNodeOutput(existingUser));
continue;
}
@@ -590,7 +591,7 @@ workspacesRouter.post(
name: account!.name,
avatar: account!.avatar,
email: account!.email,
- role: 'collaborator',
+ role: input.role,
accountId: account!.id,
parentId: workspace.id,
};
@@ -601,21 +602,22 @@ workspacesRouter.post(
id: userId,
account_id: account!.id,
workspace_id: workspace.id,
- role: 'collaborator',
+ role: input.role,
created_at: new Date(),
created_by: req.account.id,
status: WorkspaceUserStatus.Active,
version_id: userVersionId,
});
- const user: ServerNode = {
+ const user: NodeOutput = {
id: userId,
type: 'user',
+ parentId: workspace.id,
attributes: userAttributes,
state: userDoc.getEncodedState(),
- createdAt: new Date(),
+ createdAt: new Date().toISOString(),
createdBy: workspaceUser.id,
- serverCreatedAt: new Date(),
+ serverCreatedAt: new Date().toISOString(),
versionId: userVersionId,
workspaceId: workspace.id,
index: null,
@@ -625,9 +627,9 @@ workspacesRouter.post(
id: user.id,
attributes: JSON.stringify(userAttributes),
state: userDoc.getState(),
- created_at: user.createdAt,
+ created_at: new Date(user.createdAt),
created_by: user.createdBy,
- server_created_at: user.serverCreatedAt,
+ server_created_at: new Date(user.serverCreatedAt),
version_id: user.versionId,
workspace_id: user.workspaceId,
});
@@ -684,7 +686,7 @@ workspacesRouter.put(
async (req: ColanodeRequest, res: ColanodeResponse) => {
const id = req.params.id as string;
const userId = req.params.userId as string;
- const input: WorkspaceAccountRoleUpdateInput = req.body;
+ const input: WorkspaceUserRoleUpdateInput = req.body;
if (!req.account) {
return res.status(401).json({
@@ -771,20 +773,20 @@ workspacesRouter.put(
role: input.role,
});
- const userNode: ServerNode = {
+ const userNode: NodeOutput = {
id: user.id,
type: user.type,
workspaceId: user.workspace_id,
index: null,
- parentId: null,
+ parentId: workspace.id,
attributes: userDoc.getAttributes(),
state: userDoc.getEncodedState(),
- createdAt: user.created_at,
+ createdAt: user.created_at.toISOString(),
createdBy: user.created_by,
- serverCreatedAt: user.server_created_at,
- serverUpdatedAt: updatedAt,
+ serverCreatedAt: user.server_created_at.toISOString(),
+ serverUpdatedAt: updatedAt.toISOString(),
versionId: generateId(IdType.Version),
- updatedAt: updatedAt,
+ updatedAt: updatedAt.toISOString(),
updatedBy: currentWorkspaceUser.id,
};
diff --git a/apps/server/src/types/accounts.ts b/apps/server/src/types/accounts.ts
index 3351126e..a045cb99 100644
--- a/apps/server/src/types/accounts.ts
+++ b/apps/server/src/types/accounts.ts
@@ -1,4 +1,4 @@
-import { WorkspaceOutput } from '@/types/workspaces';
+import { WorkspaceOutput } from '@colanode/core';
export type GoogleLoginInput = {
access_token: string;
diff --git a/apps/server/src/types/nodes.ts b/apps/server/src/types/nodes.ts
index 8f3480b3..b4213520 100644
--- a/apps/server/src/types/nodes.ts
+++ b/apps/server/src/types/nodes.ts
@@ -1,33 +1,3 @@
-import { NodeAttributes } from '@colanode/core';
-
-export type ServerNode = {
- id: string;
- workspaceId: string;
- parentId?: string | null;
- type: string;
- index: string | null;
- attributes: NodeAttributes;
- state: string;
- createdAt: Date;
- createdBy: string;
- updatedAt?: Date | null;
- updatedBy?: string | null;
- versionId: string;
- serverCreatedAt: Date;
- serverUpdatedAt?: Date | null;
-};
-
-export type NodeBlock = {
- type: string;
- text?: string | null;
- marks?: NodeBlockMark[];
-};
-
-export type NodeBlockMark = {
- type: string;
- attrs: any;
-};
-
export type NodeCollaborator = {
nodeId: string;
collaboratorId: string;
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 9293ad29..11841ad5 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -17,3 +17,5 @@ export * from './registry/space';
export * from './registry/user';
export * from './registry/zod';
export * from './registry/workspace';
+export * from './types/workspaces';
+export * from './types/nodes';
diff --git a/packages/core/src/registry/core.ts b/packages/core/src/registry/core.ts
index e425a4f8..59238ab0 100644
--- a/packages/core/src/registry/core.ts
+++ b/packages/core/src/registry/core.ts
@@ -1,6 +1,7 @@
import { ZodSchema } from 'zod';
import { Node, NodeAttributes } from './';
import { extractNodeRole } from '../lib/nodes';
+import { WorkspaceRole } from '../types/workspaces';
export type NodeRole = 'admin' | 'editor' | 'collaborator' | 'viewer';
@@ -9,43 +10,46 @@ export class NodeMutationContext {
public workspaceId: string;
public userId: string;
public ancestors: Node[];
- public role: NodeRole | null;
+ public nodeRole: NodeRole | null;
+ public workspaceRole: WorkspaceRole | null;
constructor(
accountId: string,
workspaceId: string,
userId: string,
+ workspaceRole: WorkspaceRole | null,
ancestors: Node[]
) {
this.accountId = accountId;
this.workspaceId = workspaceId;
this.userId = userId;
+ this.workspaceRole = workspaceRole;
this.ancestors = ancestors;
- this.role = extractNodeRole(ancestors, userId);
+ this.nodeRole = extractNodeRole(ancestors, userId);
}
public hasAdminAccess = () => {
- return this.role === 'admin';
+ return this.nodeRole === 'admin';
};
public hasEditorAccess = () => {
- return this.role === 'admin' || this.role === 'editor';
+ return this.nodeRole === 'admin' || this.nodeRole === 'editor';
};
public hasCollaboratorAccess = () => {
return (
- this.role === 'admin' ||
- this.role === 'editor' ||
- this.role === 'collaborator'
+ this.nodeRole === 'admin' ||
+ this.nodeRole === 'editor' ||
+ this.nodeRole === 'collaborator'
);
};
public hasViewerAccess = () => {
return (
- this.role === 'admin' ||
- this.role === 'editor' ||
- this.role === 'collaborator' ||
- this.role === 'viewer'
+ this.nodeRole === 'admin' ||
+ this.nodeRole === 'editor' ||
+ this.nodeRole === 'collaborator' ||
+ this.nodeRole === 'viewer'
);
};
}
diff --git a/packages/core/src/registry/space.ts b/packages/core/src/registry/space.ts
index eaaa67a3..f32fd739 100644
--- a/packages/core/src/registry/space.ts
+++ b/packages/core/src/registry/space.ts
@@ -15,13 +15,17 @@ export type SpaceAttributes = z.infer<typeof spaceAttributesSchema>;
export const spaceModel: NodeModel = {
type: 'space',
schema: spaceAttributesSchema,
- canCreate: async (_, __) => {
+ canCreate: async (context, __) => {
+ if (context.workspaceRole === 'guest' || context.workspaceRole === 'none') {
+ return false;
+ }
+
return true;
},
- canUpdate: async (_, __, ___) => {
- return true;
+ canUpdate: async (context, _, __) => {
+ return context.hasAdminAccess();
},
- canDelete: async (_, __) => {
- return true;
+ canDelete: async (context, _) => {
+ return context.hasAdminAccess();
},
};
diff --git a/packages/core/src/types/nodes.ts b/packages/core/src/types/nodes.ts
new file mode 100644
index 00000000..c7258233
--- /dev/null
+++ b/packages/core/src/types/nodes.ts
@@ -0,0 +1,18 @@
+import { NodeAttributes } from '../registry';
+
+export type NodeOutput = {
+ id: string;
+ workspaceId: string;
+ parentId: string;
+ type: string;
+ index: string | null;
+ attributes: NodeAttributes;
+ state: string;
+ createdAt: string;
+ createdBy: string;
+ updatedAt?: string | null;
+ updatedBy?: string | null;
+ versionId: string;
+ serverCreatedAt: string;
+ serverUpdatedAt?: string | null;
+};
diff --git a/apps/server/src/types/workspaces.ts b/packages/core/src/types/workspaces.ts
similarity index 61%
rename from apps/server/src/types/workspaces.ts
rename to packages/core/src/types/workspaces.ts
index d8cbdc12..aa4dfc21 100644
--- a/apps/server/src/types/workspaces.ts
+++ b/packages/core/src/types/workspaces.ts
@@ -1,7 +1,4 @@
-export enum WorkspaceStatus {
- Active = 1,
- Inactive = 2,
-}
+import { NodeOutput } from './nodes';
export type WorkspaceRole =
| 'owner'
@@ -10,25 +7,17 @@ export type WorkspaceRole =
| 'guest'
| 'none';
-export enum WorkspaceUserStatus {
+export enum WorkspaceStatus {
Active = 1,
Inactive = 2,
}
-export type WorkspaceUser = {
- id: string;
- workspaceId: string;
- accountId: string;
- role: WorkspaceRole;
- createdAt: Date;
- createdBy: string;
- updatedAt?: Date | null;
- updatedBy?: string | null;
- status: WorkspaceUserStatus;
- versionId: string;
-};
+export enum WorkspaceUserStatus {
+ Active = 1,
+ Inactive = 2,
+}
-export type WorkspaceInput = {
+export type WorkspaceCreateInput = {
name: string;
description?: string | null;
avatar?: string | null;
@@ -49,10 +38,25 @@ export type WorkspaceUserOutput = {
role: WorkspaceRole;
};
-export type WorkspaceAccountsInviteInput = {
+export type WorkspaceUpdateInput = {
+ name: string;
+ description?: string | null;
+ avatar?: string | null;
+};
+
+export type WorkspaceUsersInviteInput = {
emails: string[];
+ role: WorkspaceRole;
+};
+
+export type WorkspaceUsersInviteOutput = {
+ users: NodeOutput[];
};
-export type WorkspaceAccountRoleUpdateInput = {
+export type WorkspaceUserRoleUpdateInput = {
role: WorkspaceRole;
};
+
+export type WorkspaceUserRoleUpdateOutput = {
+ user: NodeOutput;
+};