Skip to content

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

Rename some pending entries to nodes

Hakan Shehuf7a13885361b
diff --git a/apps/desktop/src/main/databases/workspace/migrations/00005-create-node-interactions-table.ts b/apps/desktop/src/main/databases/workspace/migrations/00005-create-node-interactions-table.ts
index 13ff76cc..96f4a3d4 100644
--- a/apps/desktop/src/main/databases/workspace/migrations/00005-create-node-interactions-table.ts
+++ b/apps/desktop/src/main/databases/workspace/migrations/00005-create-node-interactions-table.ts
@@ -19,6 +19,6 @@ export const createNodeInteractionsTable: Migration = {
.execute();
},
down: async (db) => {
- await db.schema.dropTable('entry_interactions').execute();
+ await db.schema.dropTable('node_interactions').execute();
},
};
diff --git a/apps/desktop/src/main/lib/utils.ts b/apps/desktop/src/main/lib/utils.ts
index 2303ff17..de4ed1de 100644
--- a/apps/desktop/src/main/lib/utils.ts
+++ b/apps/desktop/src/main/lib/utils.ts
@@ -148,12 +148,12 @@ export const fetchNode = async (
database:
| Kysely<WorkspaceDatabaseSchema>
| Transaction<WorkspaceDatabaseSchema>,
- entryId: string
+ nodeId: string
): Promise<LocalNode | undefined> => {
const node = await database
.selectFrom('nodes')
.selectAll()
- .where('id', '=', entryId)
+ .where('id', '=', nodeId)
.executeTakeFirst();
return node ? mapNode(node) : undefined;
diff --git a/apps/desktop/src/main/mutations/nodes/node-collaborator-update.ts b/apps/desktop/src/main/mutations/nodes/node-collaborator-update.ts
index b5df1549..16fa21ce 100644
--- a/apps/desktop/src/main/mutations/nodes/node-collaborator-update.ts
+++ b/apps/desktop/src/main/mutations/nodes/node-collaborator-update.ts
@@ -28,14 +28,14 @@ export class NodeCollaboratorUpdateMutationHandler
if (result === 'unauthorized') {
throw new MutationError(
MutationErrorCode.NodeCollaboratorUpdateForbidden,
- "You don't have permission to update collaborators for this entry."
+ "You don't have permission to update collaborators for this node."
);
}
if (result !== 'success') {
throw new MutationError(
MutationErrorCode.NodeCollaboratorUpdateFailed,
- 'Something went wrong while updating collaborators for the entry.'
+ 'Something went wrong while updating collaborators for the node.'
);
}
diff --git a/apps/desktop/src/main/mutations/nodes/node-mark-opened.ts b/apps/desktop/src/main/mutations/nodes/node-mark-opened.ts
index 47525e2f..e7d71c7e 100644
--- a/apps/desktop/src/main/mutations/nodes/node-mark-opened.ts
+++ b/apps/desktop/src/main/mutations/nodes/node-mark-opened.ts
@@ -106,7 +106,7 @@ export class NodeMarkOpenedMutationHandler
});
if (!createdInteraction || !createdMutation) {
- throw new Error('Failed to create entry interaction');
+ throw new Error('Failed to create node interaction');
}
workspace.mutations.triggerSync();
diff --git a/apps/desktop/src/main/mutations/nodes/node-mark-seen.ts b/apps/desktop/src/main/mutations/nodes/node-mark-seen.ts
index d5cd7f78..381386fb 100644
--- a/apps/desktop/src/main/mutations/nodes/node-mark-seen.ts
+++ b/apps/desktop/src/main/mutations/nodes/node-mark-seen.ts
@@ -107,7 +107,7 @@ export class NodeMarkSeenMutationHandler
});
if (!createdInteraction || !createdMutation) {
- throw new Error('Failed to create entry interaction');
+ throw new Error('Failed to create node interaction');
}
workspace.mutations.triggerSync();
diff --git a/apps/desktop/src/main/services/workspaces/node-service.ts b/apps/desktop/src/main/services/workspaces/node-service.ts
index 055a3bbd..39e803f4 100644
--- a/apps/desktop/src/main/services/workspaces/node-service.ts
+++ b/apps/desktop/src/main/services/workspaces/node-service.ts
@@ -97,7 +97,7 @@ export class NodeService {
.executeTakeFirst();
if (!createdNode) {
- throw new Error('Failed to create entry');
+ throw new Error('Failed to create node');
}
const createdNodeUpdate = await trx
@@ -156,7 +156,7 @@ export class NodeService {
});
if (!createdNode) {
- throw new Error('Failed to create entry');
+ throw new Error('Failed to create node');
}
this.debug(`Created node ${createdNode.id} with type ${createdNode.type}`);
diff --git a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
index 6083a2c5..27257c90 100644
--- a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
@@ -17,11 +17,11 @@ import { Spinner } from '@/renderer/components/ui/spinner';
interface DatabaseDeleteDialogProps {
open: boolean;
onOpenChange: (open: boolean) => void;
- entryId: string;
+ databaseId: string;
}
export const DatabaseDeleteDialog = ({
- entryId,
+ databaseId,
open,
onOpenChange,
}: DatabaseDeleteDialogProps) => {
@@ -50,13 +50,13 @@ export const DatabaseDeleteDialog = ({
mutate({
input: {
type: 'database_delete',
- databaseId: entryId,
+ databaseId,
accountId: workspace.accountId,
workspaceId: workspace.id,
},
onSuccess() {
onOpenChange(false);
- layout.close(entryId);
+ layout.close(databaseId);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/databases/database-settings.tsx b/apps/desktop/src/renderer/components/databases/database-settings.tsx
index 24d18618..99a01bf1 100644
--- a/apps/desktop/src/renderer/components/databases/database-settings.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-settings.tsx
@@ -105,7 +105,7 @@ export const DatabaseSettings = ({ database, role }: DatabaseSettingsProps) => {
</DropdownMenuContent>
</DropdownMenu>
<DatabaseDeleteDialog
- entryId={database.id}
+ databaseId={database.id}
open={showDeleteDialog}
onOpenChange={setShowDeleteModal}
/>
diff --git a/apps/desktop/src/renderer/components/folders/folder-body.tsx b/apps/desktop/src/renderer/components/folders/folder-body.tsx
index 59675927..041822b2 100644
--- a/apps/desktop/src/renderer/components/folders/folder-body.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-body.tsx
@@ -101,8 +101,6 @@ export const FolderBody = ({ folder }: FolderBodyProps) => {
workspaceId: workspace.id,
filePath,
parentId: folder.id,
- entryId: folder.id,
- rootId: folder.rootId,
});
if (!mutationResult.success) {
diff --git a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
index 8642173e..67a76bbf 100644
--- a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
@@ -17,11 +17,11 @@ import { Spinner } from '@/renderer/components/ui/spinner';
interface FolderDeleteDialogProps {
open: boolean;
onOpenChange: (open: boolean) => void;
- entryId: string;
+ folderId: string;
}
export const FolderDeleteDialog = ({
- entryId,
+ folderId,
open,
onOpenChange,
}: FolderDeleteDialogProps) => {
@@ -50,13 +50,13 @@ export const FolderDeleteDialog = ({
mutate({
input: {
type: 'folder_delete',
- folderId: entryId,
+ folderId: folderId,
accountId: workspace.accountId,
workspaceId: workspace.id,
},
onSuccess() {
onOpenChange(false);
- layout.close(entryId);
+ layout.close(folderId);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/folders/folder-settings.tsx b/apps/desktop/src/renderer/components/folders/folder-settings.tsx
index 1acca423..d90e97d3 100644
--- a/apps/desktop/src/renderer/components/folders/folder-settings.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-settings.tsx
@@ -105,7 +105,7 @@ export const FolderSettings = ({ folder, role }: FolderSettingsProps) => {
</DropdownMenuContent>
</DropdownMenu>
<FolderDeleteDialog
- entryId={folder.id}
+ folderId={folder.id}
open={showDeleteDialog}
onOpenChange={setShowDeleteModal}
/>
diff --git a/apps/desktop/src/renderer/components/layouts/containers/container-breadrumb.tsx b/apps/desktop/src/renderer/components/layouts/containers/container-breadrumb.tsx
index 30d73a29..d7ec8470 100644
--- a/apps/desktop/src/renderer/components/layouts/containers/container-breadrumb.tsx
+++ b/apps/desktop/src/renderer/components/layouts/containers/container-breadrumb.tsx
@@ -29,7 +29,7 @@ export const ContainerBreadcrumb = ({
// Show ellipsis if we have more than 3 nodes (first + last two)
const showEllipsis = breadcrumb.length > 3;
- // Get visible entries: first entry + last two entries
+ // Get visible entries: first node + last two entries
const visibleItems = showEllipsis
? [breadcrumb[0], ...breadcrumb.slice(-2)]
: breadcrumb;
diff --git a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
index bff19223..78160d0a 100644
--- a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
@@ -17,11 +17,11 @@ import { Spinner } from '@/renderer/components/ui/spinner';
interface RecordDeleteDialogProps {
open: boolean;
onOpenChange: (open: boolean) => void;
- entryId: string;
+ recordId: string;
}
export const RecordDeleteDialog = ({
- entryId,
+ recordId,
open,
onOpenChange,
}: RecordDeleteDialogProps) => {
@@ -50,13 +50,13 @@ export const RecordDeleteDialog = ({
mutate({
input: {
type: 'record_delete',
- recordId: entryId,
+ recordId: recordId,
accountId: workspace.accountId,
workspaceId: workspace.id,
},
onSuccess() {
onOpenChange(false);
- layout.close(entryId);
+ layout.close(recordId);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/records/record-settings.tsx b/apps/desktop/src/renderer/components/records/record-settings.tsx
index 8a3175b8..8b307427 100644
--- a/apps/desktop/src/renderer/components/records/record-settings.tsx
+++ b/apps/desktop/src/renderer/components/records/record-settings.tsx
@@ -76,7 +76,7 @@ export const RecordSettings = ({ record, role }: RecordSettingsProps) => {
</DropdownMenuContent>
</DropdownMenu>
<RecordDeleteDialog
- entryId={record.id}
+ recordId={record.id}
open={showDeleteDialog}
onOpenChange={setShowDeleteModal}
/>
diff --git a/apps/desktop/src/renderer/contexts/container.ts b/apps/desktop/src/renderer/contexts/container.ts
deleted file mode 100644
index 9ef8514d..00000000
--- a/apps/desktop/src/renderer/contexts/container.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { createContext, useContext } from 'react';
-
-interface ContainerContext {
- entryId: string;
- mode: 'main' | 'modal' | 'panel';
-}
-
-export const ContainerContext = createContext<ContainerContext>(
- {} as ContainerContext
-);
-
-export const useContainer = () => useContext(ContainerContext);
diff --git a/apps/desktop/src/renderer/contexts/folder.ts b/apps/desktop/src/renderer/contexts/folder.ts
index 3847be87..f252ae1a 100644
--- a/apps/desktop/src/renderer/contexts/folder.ts
+++ b/apps/desktop/src/renderer/contexts/folder.ts
@@ -8,7 +8,7 @@ interface FolderContext {
files: LocalFileNode[];
onClick: (event: React.MouseEvent<HTMLElement>, id: string) => void;
onDoubleClick: (event: React.MouseEvent<HTMLElement>, id: string) => void;
- onMove: (entryId: string, targetId: string) => void;
+ onMove: (nodeId: string, targetId: string) => void;
}
export const FolderContext = createContext<FolderContext>({} as FolderContext);
diff --git a/apps/desktop/src/renderer/contexts/radar.ts b/apps/desktop/src/renderer/contexts/radar.ts
index 3aa50859..148ee3e8 100644
--- a/apps/desktop/src/renderer/contexts/radar.ts
+++ b/apps/desktop/src/renderer/contexts/radar.ts
@@ -16,12 +16,12 @@ interface RadarContext {
getChatState: (
accountId: string,
workspaceId: string,
- entryId: string
+ chatId: string
) => ChatReadState;
getChannelState: (
accountId: string,
workspaceId: string,
- entryId: string
+ channelId: string
) => ChannelReadState;
markNodeAsSeen: (
accountId: string,
diff --git a/apps/desktop/src/renderer/editor/commands/file.tsx b/apps/desktop/src/renderer/editor/commands/file.tsx
index 57682fcf..b667f229 100644
--- a/apps/desktop/src/renderer/editor/commands/file.tsx
+++ b/apps/desktop/src/renderer/editor/commands/file.tsx
@@ -32,15 +32,13 @@ export const FileCommand: EditorCommand = {
return;
}
- const { accountId, workspaceId, documentId, rootId } = context;
+ const { accountId, workspaceId, documentId } = context;
const output = await window.colanode.executeMutation({
type: 'file_create',
filePath,
accountId,
workspaceId,
parentId: documentId,
- rootId,
- entryId: documentId,
});
if (!output.success) {
diff --git a/apps/desktop/src/renderer/editor/extensions/file.tsx b/apps/desktop/src/renderer/editor/extensions/file.tsx
index 5e95700f..c5e3d3b5 100644
--- a/apps/desktop/src/renderer/editor/extensions/file.tsx
+++ b/apps/desktop/src/renderer/editor/extensions/file.tsx
@@ -50,8 +50,6 @@ export const FileNode = Node.create<FileNodeOptions>({
(async () => {
const fileCreateResult = await window.colanode.executeMutation({
type: 'file_create',
- entryId: options.context.documentId,
- rootId: options.context.rootId,
filePath: path,
accountId: options.context.accountId,
workspaceId: options.context.workspaceId,
diff --git a/apps/desktop/src/renderer/radar-provider.tsx b/apps/desktop/src/renderer/radar-provider.tsx
index 1e0f23d3..a513e22a 100644
--- a/apps/desktop/src/renderer/radar-provider.tsx
+++ b/apps/desktop/src/renderer/radar-provider.tsx
@@ -52,10 +52,10 @@ export const RadarProvider = ({ children }: RadarProviderProps) => {
hasUnseenChanges: false,
};
},
- getChatState: (accountId, workspaceId, entryId) => {
+ getChatState: (accountId, workspaceId, chatId) => {
const workspaceState = radarData[accountId]?.[workspaceId];
if (workspaceState) {
- const chatState = workspaceState.nodeStates[entryId];
+ const chatState = workspaceState.nodeStates[chatId];
if (chatState && chatState.type === 'chat') {
return chatState;
}
@@ -63,15 +63,15 @@ export const RadarProvider = ({ children }: RadarProviderProps) => {
return {
type: 'chat',
- chatId: entryId,
+ chatId: chatId,
unseenMessagesCount: 0,
mentionsCount: 0,
};
},
- getChannelState: (accountId, workspaceId, entryId) => {
+ getChannelState: (accountId, workspaceId, channelId) => {
const workspaceState = radarData[accountId]?.[workspaceId];
if (workspaceState) {
- const channelState = workspaceState.nodeStates[entryId];
+ const channelState = workspaceState.nodeStates[channelId];
if (channelState && channelState.type === 'channel') {
return channelState;
}
@@ -79,7 +79,7 @@ export const RadarProvider = ({ children }: RadarProviderProps) => {
return {
type: 'channel',
- channelId: entryId,
+ channelId: channelId,
unseenMessagesCount: 0,
mentionsCount: 0,
};
diff --git a/apps/desktop/src/shared/mutations/files/file-create.ts b/apps/desktop/src/shared/mutations/files/file-create.ts
index 9e070c5b..c6e147df 100644
--- a/apps/desktop/src/shared/mutations/files/file-create.ts
+++ b/apps/desktop/src/shared/mutations/files/file-create.ts
@@ -3,8 +3,6 @@ export type FileCreateMutationInput = {
accountId: string;
workspaceId: string;
parentId: string;
- entryId: string;
- rootId: string;
filePath: string;
};
diff --git a/packages/core/src/lib/constants.ts b/packages/core/src/lib/constants.ts
index cb99e0e4..661005f1 100644
--- a/packages/core/src/lib/constants.ts
+++ b/packages/core/src/lib/constants.ts
@@ -18,10 +18,3 @@ export const EditorNodeTypes = {
};
export type SortDirection = 'asc' | 'desc';
-
-export const EntryRoles = {
- Admin: 'admin',
- Editor: 'editor',
- Collaborator: 'collaborator',
- Viewer: 'viewer',
-};
diff --git a/packages/core/src/lib/texts.ts b/packages/core/src/lib/texts.ts
index 927457cc..d6c5b5ce 100644
--- a/packages/core/src/lib/texts.ts
+++ b/packages/core/src/lib/texts.ts
@@ -6,14 +6,14 @@ export const extractDocumentText = (id: string, content: DocumentContent) => {
};
export const extractBlockTexts = (
- entryId: string,
+ nodeId: string,
blocks: Record<string, Block> | undefined | null
): string | null => {
if (!blocks) {
return null;
}
- const result = collectBlockText(entryId, blocks);
+ const result = collectBlockText(nodeId, blocks);
return result.length > 0 ? result : null;
};