Merge pull request #1893 from Inist-CNRS/feat/dataset-deletion

Add the possibility to delete the database
Inist-CNRS · Feb 13, 2024 · ec692ee · ec692ee
2 parents 72fe059 + 7a8a549
commit ec692ee
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/src/api/controller/rootAdmin.js b/src/api/controller/rootAdmin.js
@@ -122,7 +122,7 @@ const putTenant = async (ctx, id) => {
 };
 
 const deleteTenant = async ctx => {
-    const { _id, name } = ctx.request.body;
+    const { _id, name, deleteDatabase } = ctx.request.body;
     const tenantExists = await ctx.tenantCollection.findOne({
         _id: new ObjectId(_id),
         name,
@@ -131,8 +131,12 @@ const deleteTenant = async ctx => {
         ctx.status = 403;
         ctx.body = { error: `Invalid name: "${name}"` };
     } else {
-        deleteWorkerQueue(tenantExists.name);
+        deleteWorkerQueue(tenantExists.name).then();
         bullBoard.removeDashboardQueue(tenantExists.name);
+        if (deleteDatabase) {
+            const db = await mongoClient(name);
+            await db.dropDatabase();
+        }
         await ctx.tenantCollection.deleteOne(tenantExists);
         ctx.body = await getTenants(ctx);
     }

diff --git a/src/app/js/root-admin/DeleteTenantDialog.js b/src/app/js/root-admin/DeleteTenantDialog.js
@@ -7,10 +7,13 @@ import {
     DialogActions,
     DialogTitle,
     Button,
+    FormControlLabel,
+    Checkbox,
 } from '@mui/material';
 
 const DeleteTenantDialog = ({ tenant, handleClose, deleteAction }) => {
     const [name, setName] = useState('');
+    const [deleteDatabase, setDeleteDatabase] = useState(true);
 
     return (
         <Dialog
@@ -34,14 +37,29 @@ const DeleteTenantDialog = ({ tenant, handleClose, deleteAction }) => {
                     error={name !== tenant.name}
                     value={name}
                 />
+                <FormControlLabel
+                    control={
+                        <Checkbox
+                            defaultChecked
+                            value={deleteDatabase}
+                            onChange={() => {
+                                setDeleteDatabase(!deleteDatabase);
+                            }}
+                            color="error"
+                        />
+                    }
+                    label="Supprimer la base de données correspondante"
+                    labelPlacement="end"
+                />
             </DialogContent>
             <DialogActions>
                 <Button
                     variant="contained"
                     color="error"
                     onClick={() => {
-                        deleteAction(tenant._id, tenant.name);
+                        deleteAction(tenant._id, tenant.name, deleteDatabase);
                         setName('');
+                        setDeleteDatabase(true);
                     }}
                     disabled={name !== tenant.name}
                     sx={{ height: '100%' }}

diff --git a/src/app/js/root-admin/Tenants.js b/src/app/js/root-admin/Tenants.js
@@ -147,15 +147,15 @@ const Tenants = ({ handleLogout }) => {
             });
     };
 
-    const deleteTenant = (_id, name) => {
+    const deleteTenant = (_id, name, deleteDatabase) => {
         fetch('/rootAdmin/tenant', {
             credentials: 'include',
             headers: {
                 'Content-Type': 'application/json',
                 'X-Lodex-Tenant': 'admin',
             },
             method: 'DELETE',
-            body: JSON.stringify({ _id, name }),
+            body: JSON.stringify({ _id, name, deleteDatabase }),
         })
             .then(response => {
                 if (response.status === 401) {