rt/wrolpi
1
0
Fork 0
mirror of https://github.com/lrnselfreliance/wrolpi.git synced 2026-10-26 19:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clearing deleted directories from file browser params.

Browse source
This commit is contained in:
Roland 2025-12-25 09:44:11 -07:00
parent 0d155c9311
commit 4693686f4f
No known key found for this signature in database
GPG key ID: 1BA620CE6C9A4680
2 changed files with 102 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/components/FileBrowser.js
View file

@ -214,6 +214,14 @@ export function FileBrowser() {
const onDelete = async () => {
await deleteFile(selectedPaths);
// Remove deleted directories from openFolders to prevent fetching non-existent directories
const deletedDirs = selectedPaths.filter(p => p.endsWith('/'));
if (deletedDirs.length > 0 && openFolders && openFolders.length > 0) {
const newOpenFolders = openFolders.filter(folder =>
!deletedDirs.some(deleted => folder === deleted || folder.startsWith(deleted))
);
setOpenFolders(newOpenFolders.length > 0 ? newOpenFolders : null);
}
await reset();
};

94
app/src/components/FileBrowser.test.js
View file

@ -175,4 +175,98 @@ describe('FileBrowser', () => {
expect(uploadButton).toBeDisabled();
});
});
describe('Delete functionality', () => {
it('removes deleted directory from openFolders', async () => {
const mockSetOpenFolders = jest.fn();
const mockFetchFiles = jest.fn();
const mockDeleteFile = require('../api').deleteFile;
mockDeleteFile.mockResolvedValue();
useBrowseFiles.mockReturnValue({
browseFiles: [
{path: 'testdir/', children: [{path: 'testdir/file.txt', size: 100}], is_empty: false},
],
openFolders: ['testdir/'],
setOpenFolders: mockSetOpenFolders,
fetchFiles: mockFetchFiles,
});
renderFileBrowser(<FileBrowser/>);
// Select the directory (first checkbox - testdir/)
const checkboxes = screen.getAllByRole('checkbox');
await act(async () => {
fireEvent.click(checkboxes[0]);
});
// Click delete button (red trash button) - uses APIButton which has confirm modal
const deleteButton = screen.getAllByRole('button').find(btn => btn.classList.contains('red'));
await act(async () => {
fireEvent.click(deleteButton);
});
// Confirm deletion in modal
await waitFor(() => {
expect(screen.getByText('Delete')).toBeInTheDocument();
});
const confirmButton = screen.getByText('Delete');
await act(async () => {
fireEvent.click(confirmButton);
});
// Verify setOpenFolders was called to remove the deleted directory
await waitFor(() => {
expect(mockSetOpenFolders).toHaveBeenCalledWith(null);
});
});
it('does not modify openFolders when deleting files only', async () => {
const mockSetOpenFolders = jest.fn();
const mockFetchFiles = jest.fn();
const mockDeleteFile = require('../api').deleteFile;
mockDeleteFile.mockResolvedValue();
useBrowseFiles.mockReturnValue({
browseFiles: [
{path: 'file.txt', size: 1024},
{path: 'testdir/', children: null, is_empty: true},
],
openFolders: ['testdir/'],
setOpenFolders: mockSetOpenFolders,
fetchFiles: mockFetchFiles,
});
renderFileBrowser(<FileBrowser/>);
// Select the file (first checkbox - file.txt)
const checkboxes = screen.getAllByRole('checkbox');
await act(async () => {
fireEvent.click(checkboxes[0]);
});
// Click delete button
const deleteButton = screen.getAllByRole('button').find(btn => btn.classList.contains('red'));
await act(async () => {
fireEvent.click(deleteButton);
});
// Confirm deletion in modal
await waitFor(() => {
expect(screen.getByText('Delete')).toBeInTheDocument();
});
const confirmButton = screen.getByText('Delete');
await act(async () => {
fireEvent.click(confirmButton);
});
// Wait for delete to complete
await waitFor(() => {
expect(mockDeleteFile).toHaveBeenCalled();
});
// setOpenFolders should NOT have been called since we only deleted a file
expect(mockSetOpenFolders).not.toHaveBeenCalled();
});
});
});