Soft deleting of files (tldraw#4992)

Instead of deleting the files we now soft delete them. I kept the whole delete logic the same as before, which should allow us to delete the file from postgres which will trigger all other necessary file deletes. ### Change type - [ ] `bugfix` - [ ] `improvement` - [x] `feature` - [ ] `api` - [ ] `other` ### Release notes - Add soft deleting of files. --------- Co-authored-by: David Sheldrick <[email protected]>
Ganjiali · Nov 25, 2024 · d9448fa · d9448fa
1 parent 5bcd587
commit d9448fa
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/apps/dotcom/client/src/tla/app/TldrawApp.ts b/apps/dotcom/client/src/tla/app/TldrawApp.ts
@@ -179,13 +179,13 @@ export class TldrawApp {
 		const nextRecentFileOrdering = []
 
 		for (const fileId of myFileIds) {
+			const file = myFiles[fileId]
+			if (!file) continue
 			const existing = this.lastRecentFileOrdering?.find((f) => f.fileId === fileId)
 			if (existing) {
 				nextRecentFileOrdering.push(existing)
 				continue
 			}
-			const file = myFiles[fileId]
-			if (!file) continue
 			const state = myStates[fileId]
 
 			nextRecentFileOrdering.push({
@@ -238,6 +238,7 @@ export class TldrawApp {
 			sharedLinkType: 'edit',
 			thumbnail: '',
 			updatedAt: Date.now(),
+			isDeleted: false,
 		}
 		if (typeof fileOrId === 'object') {
 			Object.assign(file, fileOrId)
@@ -420,7 +421,7 @@ export class TldrawApp {
 		this.z.mutate((tx) => {
 			tx.file_state.delete({ fileId, userId: this.userId })
 			if (file?.ownerId === this.userId) {
-				tx.file.delete({ id: fileId })
+				tx.file.update({ ...file, isDeleted: true })
 			}
 		})
 	}
@@ -458,7 +459,7 @@ export class TldrawApp {
 	async getOrCreateFileState(fileId: string) {
 		let fileState = this.getFileState(fileId)
 		if (!fileState) {
-			await this.z.mutate.file_state.create({
+			this.z.mutate.file_state.create({
 				fileId,
 				userId: this.userId,
 				firstVisitAt: Date.now(),

diff --git a/apps/dotcom/client/src/tla/app/zero-polyfill.ts b/apps/dotcom/client/src/tla/app/zero-polyfill.ts
@@ -124,7 +124,7 @@ export class Zero {
 	query = {
 		file: this.makeQuery(
 			'file',
-			computed('files', () => this.store.getFullData()?.files)
+			computed('files', () => this.store.getFullData()?.files.filter((f) => !f.isDeleted))
 		),
 		file_state: this.makeQuery(
 			'file_state',

diff --git a/apps/dotcom/sync-worker/src/TLDrawDurableObject.ts b/apps/dotcom/sync-worker/src/TLDrawDurableObject.ts
@@ -338,6 +338,9 @@ export class TLDrawDurableObject extends DurableObject {
 			const file = await this.getAppFileRecord()
 
 			if (file) {
+				if (file.isDeleted) {
+					return closeSocket(TLSyncErrorCloseEventReason.NOT_FOUND)
+				}
 				if (!auth && !file.shared) {
 					return closeSocket(TLSyncErrorCloseEventReason.NOT_AUTHENTICATED)
 				}
@@ -623,6 +626,10 @@ export class TLDrawDurableObject extends DurableObject {
 		const roomIsReadOnlyForGuests = file.shared && file.sharedLinkType === 'view'
 
 		for (const session of room.getSessions()) {
+			if (file.isDeleted) {
+				room.closeSession(session.sessionId, TLSyncErrorCloseEventReason.NOT_FOUND)
+				continue
+			}
 			// allow the owner to stay connected
 			if (session.meta.userId === file.ownerId) continue
 

diff --git a/apps/dotcom/zero-cache/docker/006_add_file_soft_delete.sql b/apps/dotcom/zero-cache/docker/006_add_file_soft_delete.sql
@@ -0,0 +1 @@
+ALTER TABLE public.file ADD COLUMN "isDeleted" BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/packages/dotcom-shared/src/tlaSchema.ts b/packages/dotcom-shared/src/tlaSchema.ts
@@ -57,6 +57,7 @@ export const tlaFileSchema = {
 		createdAt: { type: 'number' },
 		updatedAt: { type: 'number' },
 		isEmpty: { type: 'boolean' },
+		isDeleted: { type: 'boolean' },
 	},
 	primaryKey: ['id'],
 	relationships: {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE public.file ADD COLUMN "isDeleted" BOOLEAN NOT NULL DEFAULT FALSE;