Skip to content

feat(ENG-9544): implement in tree drag and drop support #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 11, 2025
Merged

feat(ENG-9544): implement in tree drag and drop support #750

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22926a1
feat(files-tree): implement in tree drag and drop support
opaduchak Nov 7, 2025
730b77d
fix(translations): fixed typo
opaduchak Nov 7, 2025
2f2a3d6
test(confirm-move-file-dialog): fixed tests
opaduchak Nov 10, 2025
af2650e
fix(move-file-dialog): fixed toasts
opaduchak Nov 11, 2025
ce0ac16
fix(confirm-move-dialog): fixed pr comments
opaduchak Nov 11, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(confirm-move-dialog): fixed pr comments
  • Loading branch information
@opaduchak
opaduchak committed Nov 11, 2025
commit ce0ac16f72203663fbb9556e92d0b3154f7c1e01
5 changes: 2 additions & 3 deletions ...ures/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { MockComponents, MockPipe } from 'ng-mocks';

import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';

import { signal } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { FileSelectDestinationComponent } from '@osf/shared/components/file-select-destination/file-select-destination.component';
Expand Down Expand Up @@ -55,8 +54,8 @@ describe('ConfirmConfirmMoveFileDialogComponent', () => {
{ provide: CustomConfirmationService, useValue: CustomConfirmationServiceMock.simple() },
provideMockStore({
signals: [
{ selector: FilesSelectors.getMoveDialogFiles, value: signal([]) },
{ selector: FilesSelectors.getProvider, value: signal(null) },
{ selector: FilesSelectors.getMoveDialogFiles, value: [] },
{ selector: FilesSelectors.getProvider, value: null },
],
}),
],
Expand Down
2 changes: 1 addition & 1 deletion .../features/files/components/confirm-move-file-dialog/confirm-move-file-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class ConfirmMoveFileDialogComponent {
private readonly customConfirmationService = inject(CustomConfirmationService);

readonly files = select(FilesSelectors.getMoveDialogFiles);
readonly provider = select(FilesSelectors.getProvider);
readonly provider = this.config.data.storageProvider;

private fileProjectId = this.config.data.resourceId;
protected currentFolder = this.config.data.destination;
Expand Down
17 changes: 8 additions & 9 deletions src/app/features/files/components/move-file-dialog/move-file-dialog.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { MockComponents, MockPipe } from 'ng-mocks';

import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';

import { signal } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { FileSelectDestinationComponent } from '@osf/shared/components/file-select-destination/file-select-destination.component';
Expand Down Expand Up @@ -56,14 +55,14 @@ describe('MoveFileDialogComponent', () => {
{ provide: CustomConfirmationService, useValue: CustomConfirmationServiceMock.simple() },
provideMockStore({
signals: [
{ selector: FilesSelectors.getMoveDialogFiles, value: signal([]) },
{ selector: FilesSelectors.getMoveDialogFilesTotalCount, value: signal(0) },
{ selector: FilesSelectors.isMoveDialogFilesLoading, value: signal(false) },
{ selector: FilesSelectors.getMoveDialogCurrentFolder, value: signal(null) },
{ selector: CurrentResourceSelectors.getCurrentResource, value: signal(null) },
{ selector: CurrentResourceSelectors.getResourceWithChildren, value: signal([]) },
{ selector: CurrentResourceSelectors.isResourceWithChildrenLoading, value: signal(false) },
{ selector: FilesSelectors.isMoveDialogConfiguredStorageAddonsLoading, value: signal(false) },
{ selector: FilesSelectors.getMoveDialogFiles, value: [] },
{ selector: FilesSelectors.getMoveDialogFilesTotalCount, value: 0 },
{ selector: FilesSelectors.isMoveDialogFilesLoading, value: false },
{ selector: FilesSelectors.getMoveDialogCurrentFolder, value: null },
{ selector: CurrentResourceSelectors.getCurrentResource, value: null },
{ selector: CurrentResourceSelectors.getResourceWithChildren, value: [] },
{ selector: CurrentResourceSelectors.isResourceWithChildrenLoading, value: false },
{ selector: FilesSelectors.isMoveDialogConfiguredStorageAddonsLoading, value: false },
],
}),
],
Expand Down
2 changes: 0 additions & 2 deletions src/app/shared/components/files-tree/files-tree.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,6 @@ export class FilesTreeComponent implements OnDestroy, AfterViewInit {
destination,
resourceId: this.resourceId(),
storageProvider: this.storage()?.folder.provider,
foldersStack: structuredClone(this.foldersStack),
initialFolder: structuredClone(this.currentFolder()),
},
})
.onClose.subscribe(() => {
Expand Down