Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
feat(backend:spaces): improve trash path resolution for spaces and shares with external paths
johavena37077a5cf4e
diff --git a/backend/src/applications/spaces/utils/paths.ts b/backend/src/applications/spaces/utils/paths.tsindex 12b8670f..ee6e2f7f 100644--- a/backend/src/applications/spaces/utils/paths.ts+++ b/backend/src/applications/spaces/utils/paths.ts@@ -86,13 +86,14 @@ export function realTrashPathFromSpace(user: UserModel, space: SpaceEnv) {return UserModel.getTrashPath(user.login)} else if (space.root?.externalPath) {// external path from space or share+ // space case: use the space trashif (space.root.file?.space?.alias) {- // space casereturn SpaceModel.getTrashPath(space.root.file.space.alias)+ } else if (space.inFilesRepository && !space.inSharesRepository) {+ return SpaceModel.getTrashPath(space.alias)}- // share case- // todo: store the deleted files in the same path with .trash ?- return null+ // share case: use the user's trash because this type of share has no owner+ return UserModel.getTrashPath(user.login)} else if (space.root?.file?.path && space.root.owner?.login) {// space root is linked to a file in a personal spacereturn UserModel.getTrashPath(space.root.owner.login)@@ -102,9 +103,8 @@ export function realTrashPathFromSpace(user: UserModel, space: SpaceEnv) {} else if (space.alias) {// space files (no root)return SpaceModel.getTrashPath(space.alias)- } else {- return null}+ return null}export function realPathFromRootFile(f: FileProps): string {