Fix missing delete directory functionality

packages/openneuro-app/src/scripts/dataset/files/file-tree.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import File from './file'
 import UpdateFile from '../mutations/update-file.jsx'
-import DeleteDir from '../mutations/delete-dir.jsx'
+import DeleteFile from '../mutations/delete-file.jsx'
 import FileTreeUnloadedDirectory from './file-tree-unloaded-directory.jsx'
 import { Media } from '../../styles/media'
 import { AccordionTab } from '@openneuro/components/accordion'
@@ -91,8 +91,10 @@ const FileTree = ({
               directory>
               <i className="fa fa-plus" /> Add Directory
             </UpdateFile>
-            {bulkDeleteButton || (
-              <DeleteDir datasetId={datasetId} path={path} name={name} />
+            {path === '' ? (
+              bulkDeleteButton
+            ) : (
+              <DeleteFile datasetId={datasetId} path={path} filename={name} />
             )}
           </span>
         </Media>

packages/openneuro-app/src/scripts/dataset/files/file.tsx

@@ -117,7 +117,7 @@ const File = ({
   datasetPermissions,
   toggleFileToDelete,
   isFileToBeDeleted,
-}: FileProps) => {
+}: FileProps): JSX.Element => {
   const { icon, color } = getFileIcon(filename)
   const snapshotVersionPath = snapshotTag ? `/versions/${snapshotTag}` : ''
   // React route to display the file

packages/openneuro-app/src/scripts/dataset/mutations/__tests__/delete-file.spec.jsx

@@ -0,0 +1,195 @@
+import { fileCacheDeleteFilter } from '../delete-file.jsx'
+
+describe('DeleteFile mutation', () => {
+  describe('fileCacheDeleteFilter', () => {
+    it('removes a deleted file', () => {
+      expect(
+        fileCacheDeleteFilter(
+          {
+            id: 'DatasetFile:abcdef',
+            key: 'cdefgh',
+            filename: 'sub-01:anat:sub-01_T1w.nii.gz',
+            directory: false,
+          },
+          'sub-01:anat',
+          'sub-01_T1w.nii.gz',
+          [],
+        ),
+      ).toBe(false)
+    })
+    it('does not remove a present file', () => {
+      expect(
+        fileCacheDeleteFilter(
+          {
+            id: 'DatasetFile:abcdef',
+            key: 'cdefgh',
+            filename: 'sub-02:anat:sub-02_T1w.nii.gz',
+            directory: false,
+          },
+          'sub-01:anat',
+          'sub-01_T1w.nii.gz',
+          [],
+        ),
+      ).toBe(true)
+    })
+    it('removes a matching directory', () => {
+      expect(
+        fileCacheDeleteFilter(
+          {
+            id: 'DatasetFile:abcdef',
+            key: 'cdefgh',
+            filename: 'sub-01:anat',
+            directory: true,
+          },
+          'sub-01:anat',
+          '',
+          [],
+        ),
+      ).toBe(false)
+    })
+    it('removes empty directories with a child being deleted', () => {
+      const cachedFileObjects = [
+        {
+          __typename: 'DatasetFile',
+          id: '3d9b15b3ef4e9da06e265e6078d3b4ddf8495102',
+          key: 'c2ee90bf6c477b9e808e2b649a9492e947493297',
+          filename: 'CHANGES',
+          directory: false,
+        },
+        {
+          __typename: 'DatasetFile',
+          id: '63888a199a5ce37377b1cd708cda59577dad218f',
+          key: 'fa84e5f958ec72d42b3e196e592f6db9f7104b19',
+          filename: 'README',
+          directory: false,
+        },
+        {
+          __typename: 'DatasetFile',
+          id: 'aef1717a00106adc115f64990944d86e154d3e03',
+          key: 'e652e8add021fe2684ce2404b431dee4315c9c95',
+          filename: 'dataset_description.json',
+          directory: false,
+        },
+        {
+          __typename: 'DatasetFile',
+          id: '0a2a5d8d72a31f03608db59c4cfd650aba77c363',
+          key: 'b08aa0ec5b5e716479824859524a22140fb2af82',
+          filename: 'T1w.json',
+          directory: false,
+        },
+        {
+          __typename: 'DatasetFile',
+          id: 'f682a32c9538082fa6c8ad11e9a536dc07d1d0cf',
+          key: '37ecbdc7ab8ffaf2cddecc338092f6679089287d',
+          filename: 'participants.tsv',
+          directory: false,
+        },
+        {
+          __typename: 'DatasetFile',
+          id: 'c2ffc386e99bb26fbfc0d6bb33713b91b95a51f2',
+          key: null,
+          filename: 'sub-01',
+          directory: true,
+        },
+        {
+          __typename: 'DatasetFile',
+          id: '141c63f3373f17477c83f42c9fab01e6825052a0',
+          key: null,
+          filename: 'sub-02',
+          directory: true,
+        },
+        {
+          __typename: 'DatasetFile',
+          id: '635818b25263badb6d105aab8e33822f54ebbecf',
+          key: null,
+          filename: 'sub-02:anat',
+          directory: true,
+        },
+        {
+          __typename: 'DatasetFile',
+          id: 'b6f937773aa2130aa9d06fc3024cd1b150baa70b',
+          key: 'SHA256E-s311112--c3527d7944a9619afb57863a34e6af7ec3fe4f108e56c860d9e700699ff806fb.nii.gz',
+          filename: 'sub-02:anat:sub-02_T1w.nii.gz',
+          directory: false,
+        },
+      ]
+      expect(
+        fileCacheDeleteFilter(
+          {
+            id: '141c63f3373f17477c83f42c9fab01e6825052a0',
+            key: null,
+            filename: 'sub-02',
+            directory: true,
+          },
+          'sub-02:anat',
+          'sub-02_T1w.nii.gz',
+          cachedFileObjects,
+        ),
+      ).toBe(false)
+      expect(
+        fileCacheDeleteFilter(
+          {
+            id: '635818b25263badb6d105aab8e33822f54ebbecf',
+            key: null,
+            filename: 'sub-02:anat',
+            directory: true,
+          },
+          'sub-02:anat',
+          'sub-02_T1w.nii.gz',
+          cachedFileObjects,
+        ),
+      ).toBe(false)
+      expect(
+        fileCacheDeleteFilter(
+          {
+            id: 'b6f937773aa2130aa9d06fc3024cd1b150baa70b',
+            key: 'SHA256E-s311112--c3527d7944a9619afb57863a34e6af7ec3fe4f108e56c860d9e700699ff806fb.nii.gz',
+            filename: 'sub-02:anat:sub-02_T1w.nii.gz',
+            directory: false,
+          },
+          'sub-02:anat',
+          'sub-02_T1w.nii.gz',
+          cachedFileObjects,
+        ),
+      ).toBe(false)
+    })
+    it('does not remove non-empty directories with a child being deleted', () => {
+      expect(
+        fileCacheDeleteFilter(
+          {
+            id: 'DatasetFile:abcdef',
+            key: 'cdefgh',
+            filename: 'sub-02:anat',
+            directory: true,
+          },
+          '',
+          'sub-02:anat:sub-02_T1w.json',
+          [
+            {
+              id: 'DatasetFile:123456',
+              key: 'cdefgh',
+              filename: 'sub-02:anat:sub-02_T1w.nii.gz',
+              directory: false,
+            },
+          ],
+        ),
+      ).toBe(true)
+    })
+    it('does not remove directories that are empty but not having a child deleted', () => {
+      // This is also false because the directory has no files in cachedFileObjects
+      expect(
+        fileCacheDeleteFilter(
+          {
+            id: 'DatasetFile:abcdef',
+            key: 'cdefgh',
+            filename: 'sub-02:anat',
+            directory: true,
+          },
+          'sub-01:anat',
+          '',
+          [],
+        ),
+      ).toBe(true)
+    })
+  })
+})

packages/openneuro-app/src/scripts/dataset/mutations/__tests__/delete.spec.jsx

@@ -2,10 +2,8 @@ import React from 'react'
 import { render, fireEvent, screen } from '@testing-library/react'
 import { MockedProvider } from '@apollo/client/testing'
 import DeleteDataset, { DELETE_DATASET } from '../delete.jsx'
-import DeleteDir, { DELETE_FILES } from '../delete-dir.jsx'
 
 const datasetId = 'ds999999'
-const path = 'sub-99'
 
 const deleteDatasetMock = {
   request: {
@@ -20,19 +18,6 @@ const deleteDatasetMock = {
   })),
 }
 
-const deleteDirMock = {
-  request: {
-    query: DELETE_FILES,
-    variables: {
-      datasetId,
-      files: [{ path: 'sub-99' }],
-    },
-  },
-  newData: vi.fn(() => ({
-    data: {},
-  })),
-}
-
 describe('DeleteDataset mutation', () => {
   it('renders with common props', () => {
     const { asFragment } = render(
@@ -43,35 +28,3 @@ describe('DeleteDataset mutation', () => {
     expect(asFragment()).toMatchSnapshot()
   })
 })
-
-describe('DeleteDir mutation', () => {
-  it('renders with common props', () => {
-    const { asFragment } = render(
-      <MockedProvider mocks={[deleteDirMock]} addTypename={false}>
-        <DeleteDir
-          datasetId="ds002"
-          fileTree={{
-            files: [],
-            directories: [],
-            path: '',
-          }}
-        />
-      </MockedProvider>,
-    )
-    expect(asFragment()).toMatchSnapshot()
-  })
-  it('fires the correct mutation', async () => {
-    render(
-      <MockedProvider mocks={[deleteDirMock]} addTypename={false}>
-        <DeleteDir {...{ datasetId, path }} />
-      </MockedProvider>,
-    )
-
-    // click "Delete" button
-    await fireEvent.click(screen.getByRole('button'))
-    // confirm delete
-    await fireEvent.click(screen.getByLabelText('confirm'))
-
-    expect(deleteDirMock.newData).toHaveBeenCalled()
-  })
-})