Skip to content

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

Add extra handles for file deletion

Hakan Shehu70503d5a98c7
diff --git a/desktop/src/main/file-manager.ts b/desktop/src/main/file-manager.ts
index ad58de5f..14ade384 100644
--- a/desktop/src/main/file-manager.ts
+++ b/desktop/src/main/file-manager.ts
@@ -53,6 +53,12 @@ class FileManager {
shell.openPath(filePath);
}
+ public deleteFile(userId: string, id: string, extension: string): void {
+ const filesDir = getWorkspaceFilesDirectoryPath(userId);
+ const filePath = path.join(filesDir, `${id}${extension}`);
+ fs.rmSync(filePath, { force: true });
+ }
+
public async checkForUploads(
credentials: WorkspaceCredentials,
): Promise<void> {
diff --git a/desktop/src/main/handlers/mutations/node-delete.ts b/desktop/src/main/handlers/mutations/node-delete.ts
index 509b192d..f9950c74 100644
--- a/desktop/src/main/handlers/mutations/node-delete.ts
+++ b/desktop/src/main/handlers/mutations/node-delete.ts
@@ -1,5 +1,11 @@
+import { NodeTypes } from '@/lib/constants';
import { databaseManager } from '@/main/data/database-manager';
-import { MutationHandler, MutationResult } from '@/operations/mutations';
+import { fileManager } from '@/main/file-manager';
+import {
+ MutationChange,
+ MutationHandler,
+ MutationResult,
+} from '@/operations/mutations';
import { NodeDeleteMutationInput } from '@/operations/mutations/node-delete';
import { LocalDeleteNodeChangeData } from '@/types/sync';
@@ -15,7 +21,7 @@ export class NodeDeleteMutationHandler
const node = await workspaceDatabase
.selectFrom('nodes')
- .select(['id'])
+ .select(['id', 'type', 'attributes'])
.where('id', '=', input.nodeId)
.executeTakeFirst();
@@ -34,9 +40,23 @@ export class NodeDeleteMutationHandler
deletedBy: input.userId,
};
+ const isFile = node.type === NodeTypes.File;
+
await workspaceDatabase.transaction().execute(async (trx) => {
await trx.deleteFrom('nodes').where('id', '=', input.nodeId).execute();
+ if (isFile) {
+ await trx
+ .deleteFrom('uploads')
+ .where('node_id', '=', node.id)
+ .execute();
+
+ await trx
+ .deleteFrom('downloads')
+ .where('node_id', '=', node.id)
+ .execute();
+ }
+
await trx
.insertInto('changes')
.values({
@@ -46,22 +66,41 @@ export class NodeDeleteMutationHandler
.execute();
});
+ const changes: MutationChange[] = [
+ {
+ type: 'workspace',
+ table: 'nodes',
+ userId: input.userId,
+ },
+ {
+ type: 'workspace',
+ table: 'changes',
+ userId: input.userId,
+ },
+ ];
+
+ if (isFile) {
+ const attributes = JSON.parse(node.attributes);
+ fileManager.deleteFile(input.userId, node.id, attributes.extension);
+
+ changes.push({
+ type: 'workspace',
+ table: 'uploads',
+ userId: input.userId,
+ });
+
+ changes.push({
+ type: 'workspace',
+ table: 'downloads',
+ userId: input.userId,
+ });
+ }
+
return {
output: {
success: true,
},
- changes: [
- {
- type: 'workspace',
- table: 'nodes',
- userId: input.userId,
- },
- {
- type: 'workspace',
- table: 'changes',
- userId: input.userId,
- },
- ],
+ changes,
};
}
}
diff --git a/desktop/src/renderer/components/files/file-context-menu.tsx b/desktop/src/renderer/components/files/file-context-menu.tsx
index 0e65d36f..9eb750e7 100644
--- a/desktop/src/renderer/components/files/file-context-menu.tsx
+++ b/desktop/src/renderer/components/files/file-context-menu.tsx
@@ -47,7 +47,7 @@ export const FileContextMenu = ({ id, children }: FileContextMenuProps) => {
</ContextMenuContent>
</ContextMenu>
<FileDeleteDialog
- id={id}
+ nodeId={id}
open={openDelete}
onOpenChange={setOpenDelete}
/>
diff --git a/desktop/src/renderer/components/files/file-delete-dialog.tsx b/desktop/src/renderer/components/files/file-delete-dialog.tsx
index 171e59a1..fea5697c 100644
--- a/desktop/src/renderer/components/files/file-delete-dialog.tsx
+++ b/desktop/src/renderer/components/files/file-delete-dialog.tsx
@@ -13,13 +13,13 @@ import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface FileDeleteDialogProps {
- id: string;
+ nodeId: string;
open: boolean;
onOpenChange: (open: boolean) => void;
}
export const FileDeleteDialog = ({
- id,
+ nodeId,
open,
onOpenChange,
}: FileDeleteDialogProps) => {
@@ -47,7 +47,7 @@ export const FileDeleteDialog = ({
mutate({
input: {
type: 'node_delete',
- nodeId: id,
+ nodeId,
userId: workspace.userId,
},
onSuccess() {
diff --git a/desktop/src/renderer/components/files/file-settings.tsx b/desktop/src/renderer/components/files/file-settings.tsx
new file mode 100644
index 00000000..7cc0c8af
--- /dev/null
+++ b/desktop/src/renderer/components/files/file-settings.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@/renderer/components/ui/dropdown-menu';
+import { Copy, Settings, Trash2 } from 'lucide-react';
+import { FileDeleteDialog } from '@/renderer/components/files/file-delete-dialog';
+
+interface FileSettingsProps {
+ nodeId: string;
+}
+
+export const FileSettings = ({ nodeId }: FileSettingsProps) => {
+ const [showDeleteModal, setShowDeleteModal] = React.useState(false);
+ return (
+ <React.Fragment>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Settings className="size-5 cursor-pointer text-muted-foreground hover:text-foreground" />
+ </DropdownMenuTrigger>
+ <DropdownMenuContent side="bottom" className="mr-2 w-56">
+ <DropdownMenuItem className="flex items-center gap-2" disabled>
+ <Copy className="size-4" />
+ Duplicate
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ className="flex items-center gap-2"
+ onClick={() => {
+ setShowDeleteModal(true);
+ }}
+ >
+ <Trash2 className="size-4" />
+ Delete
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ <FileDeleteDialog
+ nodeId={nodeId}
+ open={showDeleteModal}
+ onOpenChange={setShowDeleteModal}
+ />
+ </React.Fragment>
+ );
+};
diff --git a/desktop/src/renderer/components/workspaces/containers/container-settings.tsx b/desktop/src/renderer/components/workspaces/containers/container-settings.tsx
index cc2078a7..e89413d8 100644
--- a/desktop/src/renderer/components/workspaces/containers/container-settings.tsx
+++ b/desktop/src/renderer/components/workspaces/containers/container-settings.tsx
@@ -7,6 +7,7 @@ import { PageSettings } from '@/renderer/components/pages/page-settings';
import { DatabaseSettings } from '@/renderer/components/databases/database-settings';
import { RecordSettings } from '@/renderer/components/records/record-settings';
import { FolderSettings } from '@/renderer/components/folders/folder-settings';
+import { FileSettings } from '@/renderer/components/files/file-settings';
interface ContainerSettingsProps {
nodeId: string;
@@ -20,5 +21,6 @@ export const ContainerSettings = ({ nodeId }: ContainerSettingsProps) => {
.with(IdType.Database, () => <DatabaseSettings nodeId={nodeId} />)
.with(IdType.Record, () => <RecordSettings nodeId={nodeId} />)
.with(IdType.Folder, () => <FolderSettings nodeId={nodeId} />)
+ .with(IdType.File, () => <FileSettings nodeId={nodeId} />)
.otherwise(() => null);
};
diff --git a/server/src/lib/constants.ts b/server/src/lib/constants.ts
index b9951b4e..67dacb75 100644
--- a/server/src/lib/constants.ts
+++ b/server/src/lib/constants.ts
@@ -21,4 +21,5 @@ export const NodeTypes = {
CalendarView: 'calendar_view',
Field: 'field',
SelectOption: 'select_option',
+ File: 'file',
};
diff --git a/server/src/queues/events.ts b/server/src/queues/events.ts
index e0d0ee28..b5dce3a2 100644
--- a/server/src/queues/events.ts
+++ b/server/src/queues/events.ts
@@ -1,6 +1,8 @@
import { database } from '@/data/database';
import { CHANNEL_NAMES, redis, redisConfig } from '@/data/redis';
import { CreateNodeUserState } from '@/data/schema';
+import { filesStorage } from '@/data/storage';
+import { BUCKET_NAMES } from '@/data/storage';
import { NodeTypes } from '@/lib/constants';
import { generateId, IdType } from '@/lib/id';
import { fetchNodeCollaborators, fetchWorkspaceUsers } from '@/lib/nodes';
@@ -11,6 +13,7 @@ import {
NodeUpdatedEvent,
} from '@/types/events';
import { ServerNodeAttributes } from '@/types/nodes';
+import { DeleteObjectCommand } from '@aws-sdk/client-s3';
import { Job, Queue, Worker } from 'bullmq';
import { difference } from 'lodash';
@@ -71,6 +74,15 @@ const handleNodeUpdatedEvent = async (
const handleNodeDeletedEvent = async (
event: NodeDeletedEvent,
): Promise<void> => {
+ if (event.attributes.type === NodeTypes.File) {
+ const command = new DeleteObjectCommand({
+ Bucket: BUCKET_NAMES.FILES,
+ Key: `files/${event.id}${event.attributes.extension}`,
+ });
+
+ await filesStorage.send(command);
+ }
+
await publishChange(event.id, event.workspaceId, 'node_delete');
};
diff --git a/server/src/routes/sync.ts b/server/src/routes/sync.ts
index b4127fdd..269470ce 100644
--- a/server/src/routes/sync.ts
+++ b/server/src/routes/sync.ts
@@ -261,7 +261,7 @@ const handleDeleteNodeChange = async (
const existingNode = await database
.selectFrom('nodes')
.where('id', '=', changeData.id)
- .select(['id', 'workspace_id'])
+ .select(['id', 'workspace_id', 'attributes'])
.executeTakeFirst();
if (!existingNode) {
@@ -288,6 +288,8 @@ const handleDeleteNodeChange = async (
type: 'node_deleted',
id: changeData.id,
workspaceId: workspaceUser.workspace_id,
+ attributes: existingNode.attributes,
+ deletedAt: new Date().toISOString(),
};
await enqueueEvent(event);
diff --git a/server/src/types/events.ts b/server/src/types/events.ts
index 7d574c78..6b7bb2b1 100644
--- a/server/src/types/events.ts
+++ b/server/src/types/events.ts
@@ -29,4 +29,6 @@ export type NodeDeletedEvent = {
type: 'node_deleted';
id: string;
workspaceId: string;
+ attributes: ServerNodeAttributes;
+ deletedAt: string;
};