From 6a8f661b1c67a8992a495aa604d5c54e78724040 Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 20 Nov 2025 14:25:59 -0500 Subject: [PATCH 1/3] fix(files): Fix drag and drop file moves --- .../confirm-move-file-dialog.component.ts | 4 ++-- src/app/features/files/pages/files/files.component.html | 2 +- src/app/features/files/pages/files/files.component.ts | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/features/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.ts b/src/app/features/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.ts index 373a517f2..82667ec46 100644 --- a/src/app/features/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.ts +++ b/src/app/features/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.ts @@ -74,7 +74,7 @@ export class ConfirmMoveFileDialogComponent { files.forEach((file) => { const link = file.links.move; this.filesService - .moveFile(link, path, this.fileProjectId, this.provider(), action) + .moveFile(link, path, this.fileProjectId, this.provider, action) .pipe( takeUntilDestroyed(this.destroyRef), catchError((error) => { @@ -116,7 +116,7 @@ export class ConfirmMoveFileDialogComponent { acceptLabelKey: 'common.buttons.replace', onConfirm: () => { const replaceRequests$ = conflictFiles.map(({ link }) => - this.filesService.moveFile(link, path, this.fileProjectId, this.provider(), action, true).pipe( + this.filesService.moveFile(link, path, this.fileProjectId, this.provider, action, true).pipe( takeUntilDestroyed(this.destroyRef), catchError(() => of(null)) ) diff --git a/src/app/features/files/pages/files/files.component.html b/src/app/features/files/pages/files/files.component.html index c264f5b0c..631eceea2 100644 --- a/src/app/features/files/pages/files/files.component.html +++ b/src/app/features/files/pages/files/files.component.html @@ -150,7 +150,7 @@ (setCurrentFolder)="setCurrentFolder($event)" (setMoveDialogCurrentFolder)="setMoveDialogCurrentFolder($event)" (updateFoldersStack)="onUpdateFoldersStack($event)" - (resetFilesProvider)="resetProvider()" + (resetFilesProvider)="resetOnDialogClose()" > diff --git a/src/app/features/files/pages/files/files.component.ts b/src/app/features/files/pages/files/files.component.ts index 38e8620cd..35672adb3 100644 --- a/src/app/features/files/pages/files/files.component.ts +++ b/src/app/features/files/pages/files/files.component.ts @@ -542,6 +542,12 @@ export class FilesComponent { } } + resetOnDialogClose(): void { + this.filesSelection = []; + this.resetProvider(); + this.updateFilesList(); + } + createFolder(): void { const currentFolder = this.currentFolder(); const newFolderLink = currentFolder?.links.newFolder; From f11f711e4a0fb0c39caa1e8fbab533ca089891a6 Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Thu, 20 Nov 2025 16:08:16 -0500 Subject: [PATCH 2/3] fix(files): Fix duplicate items when shift-clicking files --- src/app/features/files/pages/files/files.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/features/files/pages/files/files.component.ts b/src/app/features/files/pages/files/files.component.ts index 35672adb3..f1eda6150 100644 --- a/src/app/features/files/pages/files/files.component.ts +++ b/src/app/features/files/pages/files/files.component.ts @@ -445,7 +445,8 @@ export class FilesComponent { } onFileTreeSelected(file: FileModel): void { - this.filesSelection = [...this.filesSelection, file]; + this.filesSelection.push(file); + this.filesSelection = [...new Set(this.filesSelection)]; // Remove potential duplicates } onFileTreeUnselected(file: FileModel): void { @@ -543,7 +544,7 @@ export class FilesComponent { } resetOnDialogClose(): void { - this.filesSelection = []; + this.onClearSelection(); this.resetProvider(); this.updateFilesList(); } From 41756847f414d8bfc30f6ec701842affe4e97418 Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Mon, 24 Nov 2025 11:35:52 -0500 Subject: [PATCH 3/3] chore(files): Remove comment --- src/app/features/files/pages/files/files.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/files/pages/files/files.component.ts b/src/app/features/files/pages/files/files.component.ts index f1eda6150..3653caa67 100644 --- a/src/app/features/files/pages/files/files.component.ts +++ b/src/app/features/files/pages/files/files.component.ts @@ -446,7 +446,7 @@ export class FilesComponent { onFileTreeSelected(file: FileModel): void { this.filesSelection.push(file); - this.filesSelection = [...new Set(this.filesSelection)]; // Remove potential duplicates + this.filesSelection = [...new Set(this.filesSelection)]; } onFileTreeUnselected(file: FileModel): void {