264 call be to delete directory

server/app/routes/directory.py

@@ -16,6 +16,10 @@ def create_directory():
     directory_path = data.get('directoryPath', None)
     return Directory.create_directory(directory_path=directory_path)
 
+@directory_blueprint.route('/directory/<path:directory_path>', methods=['DELETE'])
+def delete_directory(directory_path):
+    return Directory.delete_directory_by_path(directory_path=directory_path)
+
 @directory_blueprint.route('/directory/<path:directory_path>', methods=['PATCH'])
 def rename_directory(directory_path):
     data = request.get_json()

server/app/services/directory.py

@@ -80,6 +80,39 @@ def create_directory(directory_path: str = None) -> None:
       status=response.status_code,
       mimetype='application/json'
     )
+
+  @staticmethod
+  def delete_directory_by_path(directory_path: str = None):
+    jupyter_api_path = app.config['JUPYTER_API_PATH']
+
+    path = f"{jupyter_api_path}/{directory_path}"
+    response = requests.delete(path)
+
+    if response.status_code != 204:
+      return Response(
+        response=({'message': 'Failed to delete in jupyter server'}), 
+        status=404)
+
+    directory = DirectoryModel.query.filter_by(path=directory_path).first()
+
+    if directory is None:
+      # If no directory was found with the given path, return a 404 error
+      return Response(
+        response=json.dumps({'message': 'Directory not found in DB'}), 
+        status=404)
+
+    # Delete the directory
+    try:
+      db.session.delete(directory)
+      db.session.commit()
+    except Exception as e:
+      return Response(
+        response=json.dumps({'message': 'Error deleting directory in DB: ' + str(e)}), 
+        status=404)
+
+    return Response(
+      response=json.dumps({'message': 'Directory deleted'}), 
+      status=200)
 
   @staticmethod
   def rename_directory_by_path(directory_path: str = None, new_directory_path: str = None):

server/tests/services/test_directory_service.py

@@ -40,6 +40,24 @@ def test_create_directory(self):
       self.assertEqual(len(json.loads(response_2.data)['content']), 1)
       self.assertEqual(json.loads(response_2.data)['content'][0]['name'], 'test_directory')
 
+  def test_delete_directory_by_path(self):
+    with self.app.app_context():
+
+      # Create directory
+      response_0 = Directory.create_directory('work/test_directory')
+      directoryFromDB = DirectoryModel.query.filter_by(path='work/test_directory').first()
+      self.assertIsNotNone(directoryFromDB)
+      self.assertEqual(directoryFromDB.name, 'test_directory')
+
+      # Delete directory
+      response_1 = Directory.delete_directory_by_path('work/test_directory')
+      self.assertEqual(response_1.status_code, 200)
+
+      # Check if deleted directory could not be detected
+      response_2 = Directory.get_content_by_path('work')
+      self.assertEqual(response_2.status_code, 200)
+      self.assertEqual(json.loads(response_2.data)['content'], [])
+
   def test_rename_directory_by_path(self):
     with self.app.app_context():
 

webapp/src/components/sidebar/workspace/item/MoreButton.js

@@ -30,7 +30,7 @@ const MoreButton = ({
   const handleDelete = async (baseUrl, file) => {
     console.log('Delete:', file);
     try {
-      await DirectoryModel.deleteItem(baseUrl, file);
+      await DirectoryModel.deleteDirectory(file);
     } catch (error) {
       console.error('Failed to delete item:', error);
     }

webapp/src/models/DirectoryModel.js

@@ -80,30 +80,30 @@ class DirectoryModel {
       });
   }
 
-  static async deleteItem(basePath = '', item = '') {
-    const itemPath = basePath + item.path;
-    if (item.type === 'notebook') {
-        NotebookModel.deleteNotebook(item.path);
+  static async deleteDirectory(item = '') {
+    const itemPath = item.path;
+
+    let folderItems = [];
+    await DirectoryModel.getChildren(itemPath)
+        .then((data) => {
+            folderItems = data;
+        })
+    if (folderItems.length > 0) {
+        alert('Directory is not empty');
     } else {
-        let folderItems = [];
-        await DirectoryModel.getChildren(itemPath)
-            .then((data) => {
-                folderItems = data;
-            })
-        if (folderItems.length > 0) {
-            alert('Directory is not empty');
-        } else {
-            console.log("Deleting item at path:", itemPath);
-            try {
-                const response = await fetch(itemPath, {
-                    method: 'DELETE'
-                });
-            } catch (error) {
-                alert(`Failed to delete directory: ${error.message}`);
+        console.log("Deleting item at path:", itemPath);
+        try {
+            const response = await fetch("http://localhost:5002/directory/" + itemPath, {
+                method: 'DELETE',
+            });
+            if (!response.ok) {
+                throw new Error('Failed to delete directory');
             }
+        } catch (error) {
+            alert(`Failed to delete directory: ${error.message}`);
         }
     }
-}
+  }
 
 }