Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

fix(frontend:files): fix DataTransfer usage after async operations and delay overwrite until analysis completes to restore overwrite on dropped files

johavend9935e5a3887
diff --git a/frontend/src/app/applications/files/services/files-upload.service.ts b/frontend/src/app/applications/files/services/files-upload.service.ts
index f7620afb..1dc2c634 100644
--- a/frontend/src/app/applications/files/services/files-upload.service.ts
+++ b/frontend/src/app/applications/files/services/files-upload.service.ts
@@ -57,11 +57,15 @@ export class FilesUploadService {
}
}
- onDropFiles(ev: any, overwrite: boolean) {
+ onDropFiles(ev: any, exist: FileModel[]) {
+ /*
+ Important: dataTransfer.items must be accessed synchronously before any async operation; overwrite is handled after all analyses.
+ Parameter `exist`: files already present in the current drop target.
+ */
if (ev.dataTransfer.items && ev.dataTransfer.items[0]?.webkitGetAsEntry) {
- this.webkitReadDataTransfer(ev, overwrite)
+ this.webkitReadDataTransfer(ev, exist)
} else {
- this.addFiles(ev.dataTransfer.files, overwrite).catch(console.error)
+ this.addFiles(ev.dataTransfer.files, exist.length > 0).catch(console.error)
}
}
@@ -101,7 +105,7 @@ export class FilesUploadService {
return sort
}
- private webkitReadDataTransfer(ev: any, overwrite: boolean) {
+ private webkitReadDataTransfer(ev: any, exist: FileModel[]) {
let queue = ev.dataTransfer.items.length
const files: FileUpload[] = []
const readDirectory = (reader: any) => {
@@ -134,7 +138,18 @@ export class FilesUploadService {
}
const decrement = () => {
if (--queue == 0) {
- this.addFiles(files, overwrite).catch(console.error)
+ if (exist.length <= 0) {
+ this.addFiles(files, false).catch(console.error)
+ return
+ }
+ this.filesService
+ .openOverwriteDialog(exist)
+ .then((overwrite) => {
+ if (overwrite) {
+ this.addFiles(files, true).catch(console.error)
+ }
+ })
+ .catch(console.error)
}
}
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
index 78064c35..b442f6a3 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
@@ -574,33 +574,31 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy
async onUploadFiles(ev: { files: File[] }, isDirectory = false) {
let overwrite = false
+ const selectedFiles = [...ev.files]
if (isDirectory) {
- const dirName = ev.files[0].webkitRelativePath.split('/')[0]
- const dirExists = this.files.find((f) => f.name.toLowerCase() === dirName.toLowerCase())
+ const dirName = selectedFiles[0].webkitRelativePath.split('/')[0].normalize()
+ const dirExists = this.files.find((f) => f.name.normalize().toLowerCase() === dirName.normalize().toLowerCase())
if (dirExists) {
overwrite = await this.filesService.openOverwriteDialog([dirExists])
if (!overwrite) return
}
} else {
- const exist: FileModel[] = this.files.filter((x: FileModel) => [...ev.files].some((f) => f.name.toLowerCase() === x.name.toLowerCase()))
+ const exist: FileModel[] = this.files.filter((x: FileModel) =>
+ selectedFiles.some((f) => f.name.normalize().toLowerCase() === x.name.normalize().toLowerCase())
+ )
if (exist.length > 0) {
overwrite = await this.filesService.openOverwriteDialog(exist)
if (!overwrite) return
}
}
- this.filesUpload.addFiles(ev.files, overwrite).catch(console.error)
+ this.filesUpload.addFiles(selectedFiles, overwrite).catch(console.error)
}
- async onDropFiles(ev: { dataTransfer: { files: File[] } }) {
- let overwrite = false
+ onDropFiles(ev: { dataTransfer: { files: File[] } }) {
const exist: FileModel[] = this.files.filter((x: FileModel) =>
- [...ev.dataTransfer.files].some((f) => f.name.toLowerCase() === x.name.toLowerCase())
+ [...ev.dataTransfer.files].some((f) => f.name.normalize().toLowerCase() === x.name.normalize().toLowerCase())
)
- if (exist.length > 0) {
- overwrite = await this.filesService.openOverwriteDialog(exist)
- if (!overwrite) return
- }
- this.filesUpload.onDropFiles(ev, overwrite)
+ this.filesUpload.onDropFiles(ev, exist)
}
decompressFile() {