Task Owner can Delete Datasets (#764)

* dataset api handle delete * add api call to frontend * add delete button and icon * allow DELETE method * call api on delete button click * remove unused svg attrs * use fontawesome trash icon * delete dataset files on s3 * typos and misc * remove delete button text
facebookresearch · Oct 13, 2021 · e534f68 · e534f68
1 parent 21086e5
commit e534f68
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 2 deletions.
diff --git a/api/common/cors.py b/api/common/cors.py
@@ -34,7 +34,9 @@ def add_cors_headers():
 
     bottle.default_app()
     bottle.response.headers["Access-Control-Allow-Origin"] = origin
-    bottle.response.headers["Access-Control-Allow-Methods"] = "GET, POST, PUT, OPTIONS"
+    bottle.response.headers[
+        "Access-Control-Allow-Methods"
+    ] = "GET, POST, PUT, DELETE, OPTIONS"
     bottle.response.headers[
         "Access-Control-Allow-Headers"
     ] = "Origin, Accept, Content-Type, X-Requested-With, X-CSRF-Token, Authorization"

diff --git a/api/controllers/datasets.py b/api/controllers/datasets.py
@@ -48,6 +48,41 @@ def update(credentials, did):
     return util.json_encode({"success": "ok"})
 
 
+@bottle.delete("/datasets/delete/<did:int>")
+@_auth.requires_auth
+def delete(credentials, did):
+    dm = DatasetModel()
+    dataset = dm.get(did)
+    ensure_owner_or_admin(dataset.tid, credentials["id"])
+
+    tm = TaskModel()
+    task = tm.get(dataset.tid)
+
+    delta_metric_types = [
+        config["type"]
+        for config in ujson.loads(task.annotation_config_json)["delta_metrics"]
+    ]
+    delta_metric_types.append(None)
+
+    s3_client = boto3.client(
+        "s3",
+        aws_access_key_id=config["eval_aws_access_key_id"],
+        aws_secret_access_key=config["eval_aws_secret_access_key"],
+        region_name=config["eval_aws_region"],
+    )
+
+    for perturb_prefix in delta_metric_types:
+        s3_client.delete_object(
+            Bucket=task.s3_bucket,
+            Key=get_data_s3_path(
+                task.task_code, dataset.name + ".jsonl", perturb_prefix
+            ),
+        )
+
+    dm.delete(dataset)
+    return util.json_encode({"success": "ok"})
+
+
 @bottle.post("/datasets/create/<tid:int>/<name>")
 @_auth.requires_auth
 def create(credentials, tid, name):

diff --git a/frontends/web/src/common/ApiService.js b/frontends/web/src/common/ApiService.js
@@ -645,6 +645,12 @@ export default class ApiService {
     });
   }
 
+  deleteDataset(did) {
+    return this.fetch(`${this.domain}/datasets/delete/${did}`, {
+      method: "DELETE",
+    });
+  }
+
   uploadPredictions(tid, modelName, files) {
     const token = this.getToken();
     const formData = new FormData();

diff --git a/frontends/web/src/components/TaskOwnerPageComponents/Datasets.js b/frontends/web/src/components/TaskOwnerPageComponents/Datasets.js
@@ -224,13 +224,24 @@ const Datasets = (props) => {
                             className="py-3 my-0 border-bottom"
                           >
                             <Form.Label column>Name</Form.Label>
-                            <Col sm="8">
+                            <Col sm="6">
                               <Form.Control
                                 disabled
                                 plaintext
                                 defaultValue={dataset.name}
                               />
                             </Col>
+                            <Col sm="2">
+                              <Button
+                                variant="danger"
+                                className="btn-block"
+                                onClick={() => {
+                                  props.handleDatasetDelete(values.id);
+                                }}
+                              >
+                                <i class="fas fa-trash-alt"></i>
+                              </Button>
+                            </Col>
                           </Form.Group>
                           <Form.Group
                             as={Row}

diff --git a/frontends/web/src/containers/TaskOwnerPage.js b/frontends/web/src/containers/TaskOwnerPage.js
@@ -346,6 +346,12 @@ class TaskOwnerPage extends React.Component {
     );
   };
 
+  handleDatasetDelete = (did) => {
+    this.context.api.deleteDataset(did).then((result) => {
+      this.fetchDatasets();
+    });
+  };
+
   handleRoundUpdate = (
     values,
     { setFieldError, setSubmitting, setFieldValue, resetForm }
@@ -544,6 +550,7 @@ class TaskOwnerPage extends React.Component {
                     handleUploadAndCreateDataset={
                       this.handleUploadAndCreateDataset
                     }
+                    handleDatasetDelete={this.handleDatasetDelete}
                   />
                 ) : null}
               </>