From 484905c24a1f429ff1eff1f982c6e666f83e7fde Mon Sep 17 00:00:00 2001
From: dumbmachine <ratin.kumar.2k@gmail.com>
Date: Tue, 8 Sep 2020 22:04:23 +0530
Subject: [PATCH 1/5] Added removeUser and removeProject

---
 backend/routes/projects.py  | 30 ++++++++++++++++
 backend/routes/users.py     | 31 ++++++++++++++++
 frontend/src/pages/admin.js | 71 +++++++++++++++++++++++++++++++++++++
 3 files changed, 132 insertions(+)

diff --git a/backend/routes/projects.py b/backend/routes/projects.py
index f89332a..680a50f 100644
--- a/backend/routes/projects.py
+++ b/backend/routes/projects.py
@@ -59,6 +59,36 @@ def create_project():
 
     return jsonify(project_id=project.id, message="Project has been created!"), 201
 
+@api.route("/rmprojects", methods=["POST"])
+@jwt_required
+def remove_project():
+    identity = get_jwt_identity()
+    request_user = User.query.filter_by(username=identity["username"]).first()
+    is_admin = True if request_user.role.role == "admin" else False
+
+    if is_admin == False:
+        return jsonify(message="Unauthorized access!"), 401
+
+    if not request.is_json:
+        return jsonify(message="Missing JSON in request"), 400
+
+    project_id = request.json.get("projectId", None)
+
+    try:
+        project = Project.query.filter_by(id=project_id).first()
+        for data in Data.query.filter_by(project_id=project.id):
+            for segment in Segmentation.query.filter_by(data_id=data.id):
+                db.session.delete(segment)
+            db.session.delete(data)
+        db.session.delete(project)
+        db.session.commit()
+    except Exception as e:
+        app.logger.error("Error deleting project")
+        app.logger.error(e)
+        return jsonify(message="Error deleting project!"), 500
+
+    return jsonify(project_id=project_id, message="Project has been deleted!"), 201
+
 
 @api.route("/projects", methods=["GET"])
 @jwt_required
diff --git a/backend/routes/users.py b/backend/routes/users.py
index 106eb70..9d7fe55 100644
--- a/backend/routes/users.py
+++ b/backend/routes/users.py
@@ -65,6 +65,37 @@ def create_user():
     return jsonify(user_id=user.id, message="User has been created!"), 201
 
 
+@api.route("/rmusers", methods=["POST"])
+@jwt_required
+def remove_user():
+    # TODO: Make jwt user id based to expire user session if permissions are changed
+    identity = get_jwt_identity()
+    request_user = User.query.filter_by(username=identity["username"]).first()
+    is_admin = True if request_user.role.role == "admin" else False
+    if is_admin == False:
+        return jsonify(message="Unauthorized access!"), 401
+
+    if not request.is_json:
+        return jsonify(message="Missing JSON in request"), 400
+
+    try:
+        del_user_id = request.json['rmuserId']
+        del_user = User.query.filter_by(id=del_user_id).first()
+        if del_user.id == request_user.id:
+            app.logger.error("Cannot delete self")
+            return jsonify(message="Cannot delete self!"), 500
+
+        db.session.delete(del_user)
+        db.session.commit()
+    except Exception as e:
+        app.logger.error("Error deleting user")
+        app.logger.error(e)
+        return jsonify(message="Error deleting user!"), 500
+
+    return jsonify(user_id=request_user.id, name=request_user.username, message="User has been deleted!"), 201
+
+
+
 @api.route("/users/<int:user_id>", methods=["GET"])
 @jwt_required
 def fetch_user(user_id):
diff --git a/frontend/src/pages/admin.js b/frontend/src/pages/admin.js
index 6d65c13..7c1ceae 100644
--- a/frontend/src/pages/admin.js
+++ b/frontend/src/pages/admin.js
@@ -9,6 +9,7 @@ import {
   faUserPlus,
   faTags,
   faDownload,
+  faTrash,
 } from "@fortawesome/free-solid-svg-icons";
 import { IconButton } from "../components/button";
 import Loader from "../components/loader";
@@ -86,6 +87,32 @@ class Admin extends React.Component {
     this.setState({ formType: "EDIT_USER", title: "Edit User", userId });
   }
 
+  handleRemoveUser(e, rmuserId) {
+    console.log("We are removing the user: ", rmuserId);
+    axios({
+      method: "post",
+      url: "/api/rmusers",
+      data: {
+        rmuserId
+      },
+    })
+      .then((response) => {
+        if (response.status === 201) {
+          this.setState({ successMessage: response.data.message });
+        }
+        this.refreshPage();
+      })
+      .catch((error) => {
+        console.log(error.response);
+        this.setState({
+          errorMessage: error.response.data.message,
+          successMessage: "",
+          isSubmitting: false,
+        });
+      });
+  }
+
+
   handleAddLabelsToProject(e, projectId) {
     const { history } = this.props;
     history.push(`/projects/${projectId}/labels`);
@@ -165,6 +192,31 @@ class Admin extends React.Component {
       });
   }
 
+  handleDeleteProject(e, projectId) {
+    console.log("will delete: ", projectId);
+    axios({
+      method: "post",
+      url: "/api/rmprojects",
+      data: {
+        projectId,
+      },
+    })
+      .then((response) => {
+        if (response.status === 201) {
+          this.setState({ successMessage: response.data.message });
+        }
+        this.refreshPage();
+      })
+      .catch((error) => {
+        console.log(error.response);
+        this.setState({
+          errorMessage: error.response.data.message,
+          successMessage: "",
+          isSubmitting: false,
+        });
+      });
+  }
+
   setModalShow(modalShow) {
     this.setState({ modalShow });
   }
@@ -272,6 +324,17 @@ class Admin extends React.Component {
                                 )
                               }
                             />
+                            <IconButton
+                              icon={faTrash}
+                              size="sm"
+                              title={"Delete Project"}
+                              onClick={(e) =>
+                                this.handleDeleteProject(
+                                  e,
+                                  project["project_id"]
+                                )
+                              }
+                            />
                           </td>
                         </tr>
                       );
@@ -330,6 +393,14 @@ class Admin extends React.Component {
                                 this.handleEditUser(e, user["user_id"])
                               }
                             />
+                            <IconButton
+                              icon={faTrash}
+                              size="sm"
+                              title={"Remove user"}
+                              onClick={(e) =>
+                                this.handleRemoveUser(e, user["user_id"])
+                              }
+                            />
                             {/* <IconButton
                               icon={faTrashAlt}
                               size="sm"

From 202d0587d775957160ea227c2264284494182496 Mon Sep 17 00:00:00 2001
From: dumbmachine <ratin.kumar.2k@gmail.com>
Date: Wed, 9 Sep 2020 00:08:38 +0530
Subject: [PATCH 2/5] Added removeDatapoint

---
 backend/routes/data.py         | 45 ++++++++++++++++++++++++++++++++++
 frontend/src/pages/annotate.js | 40 ++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/backend/routes/data.py b/backend/routes/data.py
index ba0c5ec..8a58e2c 100644
--- a/backend/routes/data.py
+++ b/backend/routes/data.py
@@ -1,3 +1,4 @@
+import os
 import json
 import sqlalchemy as sa
 import uuid
@@ -190,3 +191,47 @@ def add_data():
         ),
         201,
     )
+
+
+@api.route("/rmdata", methods=["POST"])
+@jwt_required
+def remove_data():
+    identity = get_jwt_identity()
+    request_user = User.query.filter_by(username=identity["username"]).first()
+    is_admin = True if request_user.role.role == "admin" else False
+    if is_admin == False:
+        return jsonify(message="Unauthorized access!"), 401
+
+    if not request.is_json:
+        return jsonify(message="Missing JSON in request"), 400
+
+    data_id = request.json['dataId']
+    project_id = request.json['projectId']
+
+    app.logger.info(f"This is something: {data_id} : {project_id}")
+
+    try:
+        data = Data.query.filter_by(id=data_id, project_id=project_id).first()
+        for segment in Segmentation.query.filter_by(data_id=data.id):
+            db.session.delete(segment)
+        db.session.delete(data)
+
+        # delete the file of the folder
+        filename = data.filename
+        os.remove(
+            path=Path(app.config["UPLOAD_FOLDER"]).joinpath(filename)
+        )
+    except Exception as e:
+        app.logger.error("Error deleting datapoint")
+        app.logger.error(e)
+        return jsonify(message="Error deleting datapoint!"), 500
+
+    db.session.commit()
+
+    return (
+        jsonify(
+            message=f"Data deleted",
+            type="DATA_DELETED",
+        ),
+        201,
+    )
diff --git a/frontend/src/pages/annotate.js b/frontend/src/pages/annotate.js
index b887110..d98d072 100644
--- a/frontend/src/pages/annotate.js
+++ b/frontend/src/pages/annotate.js
@@ -347,6 +347,39 @@ class Annotate extends React.Component {
     });
   }
 
+  handleDeleteData(e) {
+    const { dataId, projectId } = this.state;
+    const { history } = this.props;
+    console.log("Data to be detelted: ", dataId);
+    axios({
+      method: "post",
+      url: "/api/rmdata",
+      data: {
+        dataId,
+        projectId
+      },
+    })
+      .then((response) => {
+        if (response.status === 201) {
+          this.setState({ successMessage: response.data.message });
+        }
+        // TODO: Then revert to the index page
+        console.log("history ", history);
+        history.replace({ pathname: "/empty" });
+        setTimeout(() => {
+          history.replace({ pathname: `/projects/${projectId}/data` });
+        });
+      })
+      .catch((error) => {
+        console.log(error.response);
+        this.setState({
+          errorMessage: error.response.data.message,
+          successMessage: "",
+          isSubmitting: false,
+        });
+      });
+  }
+
   render() {
     const {
       zoom,
@@ -575,6 +608,13 @@ class Annotate extends React.Component {
                     >
                       Mark for review
                     </label>
+                    <Button
+                      size="lg"
+                      type="primary"
+                      disabled={isDataLoading ? true : false}
+                      onClick={(e) => this.handleDeleteData(e)}
+                      text="Delete DataPoint"
+                    />
                   </div>
                 </div>
               </div>

From eb5752da338cf7215206b08b0f7b2649c0a11825 Mon Sep 17 00:00:00 2001
From: dumbmachine <ratin.kumar.2k@gmail.com>
Date: Sat, 12 Sep 2020 14:04:39 +0530
Subject: [PATCH 3/5] soft delete for data and user

---
 backend/models.py                             |  59 ++++++++-
 backend/routes/current_user.py                |   5 +-
 backend/routes/data.py                        |  14 +--
 backend/routes/login.py                       |   2 +-
 backend/routes/projects.py                    |  10 +-
 backend/routes/users.py                       |  11 +-
 .../src/containers/forms/deleteDataForm.js    | 114 ++++++++++++++++++
 .../src/containers/forms/deleteUserForm.js    | 101 ++++++++++++++++
 frontend/src/containers/modal.js              |   8 ++
 frontend/src/pages/admin.js                   |  35 ++----
 frontend/src/pages/annotate.js                |  57 ++++-----
 11 files changed, 340 insertions(+), 76 deletions(-)
 create mode 100644 frontend/src/containers/forms/deleteDataForm.js
 create mode 100644 frontend/src/containers/forms/deleteUserForm.js

diff --git a/backend/models.py b/backend/models.py
index 710a880..df25a03 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -1,6 +1,47 @@
 from werkzeug.security import generate_password_hash, check_password_hash
+from flask_sqlalchemy import BaseQuery
+from backend import db, app
+
+
+class QueryWithSoftDelete(BaseQuery):
+    _with_deleted = False
+
+    def __new__(cls, *args, **kwargs):
+        obj = super(QueryWithSoftDelete, cls).__new__(cls)
+        obj._with_deleted = kwargs.pop('_with_deleted', False)
+        if len(args) > 0:
+            super(QueryWithSoftDelete, obj).__init__(*args, **kwargs)
+            return obj.filter_by(is_deleted=None) if obj._with_deleted is None else obj
+        return obj
+
+    def __init__(self, *args, **kwargs):
+        pass
+
+    def with_deleted(self):
+        return self.__class__(db.class_mapper(self._mapper_zero().class_),
+                              session=db.session(), _with_deleted=True)
+
+    def _get(self, *args, **kwargs):
+        # this calls the original query.get function from the base class
+        return super(QueryWithSoftDelete, self).get(*args, **kwargs)
+
+    def get(self, *args, **kwargs):
+        # the query.get method does not like it if there is a filter clause
+        # pre-loaded, so we need to implement it using a workaround
+        obj = self.with_deleted()._get(*args, **kwargs)
+        return obj if obj is None or self._with_deleted or obj.is_deleted is None else None
+
+    def _all(self, *args, **kwargs):
+        return super(QueryWithSoftDelete, self).all(*args, **kwargs)
+
+    def all(self, *args, **kwargs):
+        objs = self.with_deleted()._all(*args, **kwargs)
+        ret_vals = []
+        for obj in objs:
+            if obj and obj.is_deleted is None:
+                ret_vals.append(obj)
+        return ret_vals
 
-from backend import db
 
 annotation_table = db.Table(
     "annotation",
@@ -39,14 +80,23 @@
         default=db.func.now(),
         onupdate=db.func.utc_timestamp(),
     ),
+    db.Column(
+        "is_deleted",
+        db.DateTime(),
+        nullable=True,
+        default=None,
+    ),
 )
 
 
 class Data(db.Model):
     __tablename__ = "data"
+    query_class = QueryWithSoftDelete
 
     id = db.Column("id", db.Integer(), primary_key=True)
 
+    is_deleted = db.Column("is_deleted", db.DateTime(),
+                        nullable=True, default=None)
     project_id = db.Column(
         "project_id", db.Integer(), db.ForeignKey("project.id"), nullable=False
     )
@@ -225,6 +275,9 @@ class Project(db.Model):
         onupdate=db.func.utc_timestamp(),
     )
 
+    # is_deleted = db.Column("is_deleted", db.DateTime(),
+    #                     nullable=True, default=None)
+
     users = db.relationship(
         "User", secondary=user_project_table, back_populates="projects"
     )
@@ -232,7 +285,6 @@ class Project(db.Model):
     labels = db.relationship("Label", backref="Project")
     creator_user = db.relationship("User")
 
-
 class Role(db.Model):
     __tablename__ = "role"
 
@@ -305,6 +357,7 @@ def to_dict(self):
 
 class User(db.Model):
     __tablename__ = "user"
+    query_class = QueryWithSoftDelete
 
     id = db.Column("id", db.Integer(), primary_key=True)
 
@@ -334,6 +387,7 @@ class User(db.Model):
     projects = db.relationship(
         "Project", secondary=user_project_table, back_populates="users"
     )
+    is_deleted = db.Column("is_deleted", db.DateTime(), nullable=True, default=None)
 
     def set_role(self, role_id):
         self.role_id = role_id
@@ -343,3 +397,4 @@ def set_password(self, password):
 
     def check_password(self, password):
         return check_password_hash(self.password, password)
+
diff --git a/backend/routes/current_user.py b/backend/routes/current_user.py
index 1c9da34..2d6b4af 100644
--- a/backend/routes/current_user.py
+++ b/backend/routes/current_user.py
@@ -59,6 +59,7 @@ def fetch_data_for_project(project_id):
 
         data["pending"] = (
             db.session.query(Data)
+            .filter(Data.is_deleted == None)
             .filter(Data.assigned_user_id == request_user.id)
             .filter(Data.project_id == project_id)
             .filter(Data.id.notin_(segmentations))
@@ -68,6 +69,7 @@ def fetch_data_for_project(project_id):
 
         data["completed"] = (
             db.session.query(Data)
+            .filter(Data.is_deleted == None)
             .filter(Data.assigned_user_id == request_user.id)
             .filter(Data.project_id == project_id)
             .filter(Data.id.in_(segmentations))
@@ -77,12 +79,13 @@ def fetch_data_for_project(project_id):
 
         data["marked_review"] = Data.query.filter_by(
             assigned_user_id=request_user.id,
+            is_deleted=None,
             project_id=project_id,
             is_marked_for_review=True,
         ).order_by(Data.last_modified.desc())
 
         data["all"] = Data.query.filter_by(
-            assigned_user_id=request_user.id, project_id=project_id
+            assigned_user_id=request_user.id, project_id=project_id, is_deleted=None
         ).order_by(Data.last_modified.desc())
 
         paginated_data = data[active].paginate(page, 10, False)
diff --git a/backend/routes/data.py b/backend/routes/data.py
index 8a58e2c..98d5a29 100644
--- a/backend/routes/data.py
+++ b/backend/routes/data.py
@@ -212,15 +212,11 @@ def remove_data():
 
     try:
         data = Data.query.filter_by(id=data_id, project_id=project_id).first()
-        for segment in Segmentation.query.filter_by(data_id=data.id):
-            db.session.delete(segment)
-        db.session.delete(data)
-
-        # delete the file of the folder
-        filename = data.filename
-        os.remove(
-            path=Path(app.config["UPLOAD_FOLDER"]).joinpath(filename)
-        )
+        data.is_deleted = sa.func.now()
+
+        # for segment in Segmentation.query.filter_by(data_id=data.id):
+        #     segment.is_deleted = sa.func.now()
+
     except Exception as e:
         app.logger.error("Error deleting datapoint")
         app.logger.error(e)
diff --git a/backend/routes/login.py b/backend/routes/login.py
index 10bf84a..8fa3b19 100644
--- a/backend/routes/login.py
+++ b/backend/routes/login.py
@@ -51,7 +51,7 @@ def login():
             400,
         )
 
-    user = User.query.filter_by(username=username).first()
+    user = User.query.not_deleted().filter_by(username=username).first()
 
     if user is None or not user.check_password(password):
         return (
diff --git a/backend/routes/projects.py b/backend/routes/projects.py
index 680a50f..9c33bc9 100644
--- a/backend/routes/projects.py
+++ b/backend/routes/projects.py
@@ -78,9 +78,9 @@ def remove_project():
         project = Project.query.filter_by(id=project_id).first()
         for data in Data.query.filter_by(project_id=project.id):
             for segment in Segmentation.query.filter_by(data_id=data.id):
-                db.session.delete(segment)
-            db.session.delete(data)
-        db.session.delete(project)
+                segment.is_deleted = sa.func.now()
+            data.is_deleted = sa.func.now()
+        project.is_deleted = sa.func.now()
         db.session.commit()
     except Exception as e:
         app.logger.error("Error deleting project")
@@ -94,13 +94,15 @@ def remove_project():
 @jwt_required
 def fetch_all_projects():
     identity = get_jwt_identity()
-    request_user = User.query.filter_by(username=identity["username"]).first()
+    request_user = User.query.filter_by(
+        username=identity["username"]).first()
     is_admin = True if request_user.role.role == "admin" else False
 
     if is_admin == False:
         return jsonify(message="Unauthorized access!"), 401
     try:
         projects = Project.query.all()
+        app.logger.info(f"All the projects are : {projects}")
         response = list(
             [
                 {
diff --git a/backend/routes/users.py b/backend/routes/users.py
index 9d7fe55..666cb19 100644
--- a/backend/routes/users.py
+++ b/backend/routes/users.py
@@ -68,7 +68,6 @@ def create_user():
 @api.route("/rmusers", methods=["POST"])
 @jwt_required
 def remove_user():
-    # TODO: Make jwt user id based to expire user session if permissions are changed
     identity = get_jwt_identity()
     request_user = User.query.filter_by(username=identity["username"]).first()
     is_admin = True if request_user.role.role == "admin" else False
@@ -85,7 +84,11 @@ def remove_user():
             app.logger.error("Cannot delete self")
             return jsonify(message="Cannot delete self!"), 500
 
-        db.session.delete(del_user)
+        if del_user.is_deleted:
+            app.logger.error("This user had already been deleted")
+            return jsonify(message="User not found"), 404
+
+        del_user.is_deleted = sa.func.now()
         db.session.commit()
     except Exception as e:
         app.logger.error("Error deleting user")
@@ -108,6 +111,9 @@ def fetch_user(user_id):
 
     try:
         user = User.query.get(user_id)
+        # user = User.query.filter(User.id == user_id)
+        # user = User.query.filter(User.id == user_id, User.is_deleted != None)
+
     except Exception as e:
         app.logger.error(f"No user exists with user_id: {user_id}")
         app.logger.error(e)
@@ -190,6 +196,7 @@ def fetch_all_users():
 
     try:
         users = User.query.all()
+        # users = User.query.not_deleted().all()
         response = list(
             [
                 {
diff --git a/frontend/src/containers/forms/deleteDataForm.js b/frontend/src/containers/forms/deleteDataForm.js
new file mode 100644
index 0000000..33d4c51
--- /dev/null
+++ b/frontend/src/containers/forms/deleteDataForm.js
@@ -0,0 +1,114 @@
+import React from "react";
+import axios from "axios";
+import { withRouter } from "react-router";
+import { withStore } from "@spyna/react-store";
+
+import Alert from "../../components/alert";
+import { Button } from "../../components/button";
+
+class DeleteDataform extends React.Component {
+  constructor(props) {
+    super(props);
+
+    const dataId = this.props.dataId;
+    const projectId = this.props.projectId;
+
+    this.initialState = {
+      dataId,
+      projectId,
+      message: `Are you sure you want to delete the datapoint ${dataId}`,
+      refreshPath: `/projects/${projectId}/data`,
+      errorMessage: "",
+      successMessage: "",
+      isSubmitting: false,
+    };
+
+    this.state = Object.assign({}, this.initialState);
+  }
+
+  resetState() {
+    this.setState(this.initialState);
+  }
+
+  refreshPage() {
+    const { history } = this.props;
+    const { refreshPath } = this.state;
+    history.replace({ pathname: "/empty" });
+    setTimeout(() => {
+      history.replace({
+        pathname: refreshPath,
+      });
+    });
+  }
+
+  handleUserDelete(e, dataId, projectId) {
+    console.log("The data to be deleted will be:", dataId, " from the project: ", projectId);
+    axios({
+      method: "post",
+      url: "/api/rmdata",
+      data: {
+        dataId,
+        projectId
+      },
+    })
+      .then((response) => {
+        if (response.status === 201) {
+          this.setState({ successMessage: response.data.message });
+        }
+        this.refreshPage()
+      })
+      .catch((error) => {
+        console.log(error.response);
+        this.setState({
+          errorMessage: error.response.data.message,
+          successMessage: "",
+          isSubmitting: false,
+        });
+      });
+
+  }
+
+  render() {
+    const {
+      dataId,
+      projectId,
+      message,
+      isSubmitting,
+      errorMessage,
+      successMessage,
+    } = this.state;
+    return (
+      <div className="container h-75 text-center">
+        <div className="row h-100 justify-content-center align-items-center">
+          <form
+            className="col-6"
+            name="new_project"
+            ref={(el) => (this.form = el)}
+          >
+            {errorMessage ? (
+              <Alert type="danger" message={errorMessage} />
+            ) : null}
+            {successMessage ? (
+              <Alert type="success" message={successMessage} />
+            ) : null}
+            <div className="form-group text-left">{message}</div>
+            <div className="form-row">
+              <div className="form-group col">
+                <Button
+                  size="lg"
+                  type="primary"
+                  disabled={isSubmitting ? true : false}
+                  onClick={(e) => this.handleUserDelete(e, dataId, projectId)}
+                  isSubmitting={isSubmitting}
+                  text="Delete User"
+                />
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default withStore(withRouter(DeleteDataform));
diff --git a/frontend/src/containers/forms/deleteUserForm.js b/frontend/src/containers/forms/deleteUserForm.js
new file mode 100644
index 0000000..ec887d9
--- /dev/null
+++ b/frontend/src/containers/forms/deleteUserForm.js
@@ -0,0 +1,101 @@
+import React from "react";
+import axios from "axios";
+import { withRouter } from "react-router";
+import { withStore } from "@spyna/react-store";
+
+import Alert from "../../components/alert";
+import { Button } from "../../components/button";
+
+class DeleteUserForm extends React.Component {
+  constructor(props) {
+    super(props);
+
+    const user = this.props.user;
+
+    const userId = user["user_id"];
+    const username = user["username"];
+    this.initialState = {
+      userId,
+      username,
+      message: `The User to be deleted is "${username}"`,
+      errorMessage: "",
+      successMessage: "",
+      isSubmitting: false,
+    };
+
+    this.state = Object.assign({}, this.initialState);
+  }
+
+  resetState() {
+    this.setState(this.initialState);
+  }
+
+  handleUserDelete(e, userId) {
+    axios({
+      method: "post",
+      url: "/api/rmusers",
+      data: {
+        rmuserId: userId,
+      },
+    })
+      .then((response) => {
+        if (response.status === 201) {
+          console.log("YES");
+          this.setState({ successMessage: response.data.message });
+        }
+        // TODO: After the opration revert to the /admin page
+        // this.refreshPage();
+      })
+      .catch((error) => {
+        console.log(error.response);
+        this.setState({
+          errorMessage: error.response.data.message,
+          successMessage: "",
+          isSubmitting: false,
+        });
+      });
+  }
+
+  render() {
+    const {
+      userId,
+      message,
+      isSubmitting,
+      errorMessage,
+      successMessage,
+    } = this.state;
+    return (
+      <div className="container h-75 text-center">
+        <div className="row h-100 justify-content-center align-items-center">
+          <form
+            className="col-6"
+            name="new_project"
+            ref={(el) => (this.form = el)}
+          >
+            {errorMessage ? (
+              <Alert type="danger" message={errorMessage} />
+            ) : null}
+            {successMessage ? (
+              <Alert type="success" message={successMessage} />
+            ) : null}
+            <div className="form-group text-left">{message}</div>
+            <div className="form-row">
+              <div className="form-group col">
+                <Button
+                  size="lg"
+                  type="primary"
+                  disabled={isSubmitting ? true : false}
+                  onClick={(e) => this.handleUserDelete(e, userId)}
+                  isSubmitting={isSubmitting}
+                  text="Delete User"
+                />
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default withStore(withRouter(DeleteUserForm));
diff --git a/frontend/src/containers/modal.js b/frontend/src/containers/modal.js
index bab258f..9c6d60d 100644
--- a/frontend/src/containers/modal.js
+++ b/frontend/src/containers/modal.js
@@ -9,6 +9,8 @@ import EditLabelForm from "./forms/editLabelForm";
 import ManageUsersProjectForm from "./forms/manageUsersProjectForm";
 import CreateLabelValueForm from "./forms/createLabelValuelForm";
 import EditLabelValueForm from "./forms/editLabelValueForm";
+import DeleteDataForm from "./forms/deleteDataForm";
+import DeleteUserForm from "./forms/deleteUserForm";
 
 const FormModal = (props) => {
   return (
@@ -27,6 +29,12 @@ const FormModal = (props) => {
       </Modal.Header>
       <Modal.Body>
         {props.formType === "NEW_USER" ? <CreateUserForm /> : null}
+        {props.formType === "DELETE_USER" ? (
+          <DeleteUserForm user={props.user} />
+        ) : null}
+        {props.formType === "DELETE_DATA" ? (
+          <DeleteDataForm dataId={props.dataId} projectId={props.projectId} />
+        ) : null}
         {props.formType === "NEW_PROJECT" ? <CreateProjectForm /> : null}
         {props.formType === "EDIT_USER" ? (
           <EditUserForm userId={props.userId} />
diff --git a/frontend/src/pages/admin.js b/frontend/src/pages/admin.js
index 7c1ceae..60d1a85 100644
--- a/frontend/src/pages/admin.js
+++ b/frontend/src/pages/admin.js
@@ -87,29 +87,14 @@ class Admin extends React.Component {
     this.setState({ formType: "EDIT_USER", title: "Edit User", userId });
   }
 
-  handleRemoveUser(e, rmuserId) {
-    console.log("We are removing the user: ", rmuserId);
-    axios({
-      method: "post",
-      url: "/api/rmusers",
-      data: {
-        rmuserId
-      },
-    })
-      .then((response) => {
-        if (response.status === 201) {
-          this.setState({ successMessage: response.data.message });
-        }
-        this.refreshPage();
-      })
-      .catch((error) => {
-        console.log(error.response);
-        this.setState({
-          errorMessage: error.response.data.message,
-          successMessage: "",
-          isSubmitting: false,
-        });
-      });
+  handleRemoveUser(e, user) {
+    console.log("We are removing the user: ", user);
+    this.setModalShow(true);
+    this.setState({
+      formType: "DELETE_USER",
+      title: "Deleting user",
+      user: user,
+    });
   }
 
 
@@ -232,6 +217,7 @@ class Admin extends React.Component {
       formType,
       userId,
       projectId,
+      user,
     } = this.state;
 
     return (
@@ -246,6 +232,7 @@ class Admin extends React.Component {
             title={title}
             show={modalShow}
             userId={userId}
+            user={user}
             projectId={projectId}
             onHide={() => this.setModalShow(false)}
           />
@@ -398,7 +385,7 @@ class Admin extends React.Component {
                               size="sm"
                               title={"Remove user"}
                               onClick={(e) =>
-                                this.handleRemoveUser(e, user["user_id"])
+                                this.handleRemoveUser(e, user)
                               }
                             />
                             {/* <IconButton
diff --git a/frontend/src/pages/annotate.js b/frontend/src/pages/annotate.js
index d98d072..d889b2c 100644
--- a/frontend/src/pages/annotate.js
+++ b/frontend/src/pages/annotate.js
@@ -18,6 +18,7 @@ import {
 import Alert from "../components/alert";
 import { IconButton, Button } from "../components/button";
 import Loader from "../components/loader";
+import FormModal from "../containers/modal";
 
 class Annotate extends React.Component {
   constructor(props) {
@@ -37,6 +38,7 @@ class Annotate extends React.Component {
       isDataLoading: false,
       wavesurfer: null,
       zoom: 100,
+      modalShow: false,
       referenceTranscription: null,
       isMarkedForReview: false,
       selectedSegment: null,
@@ -145,6 +147,10 @@ class Annotate extends React.Component {
       });
   }
 
+  setModalShow(modalShow) {
+    this.setState({ modalShow });
+  }
+
   loadRegions(regions) {
     const { wavesurfer } = this.state;
     regions.forEach((region) => {
@@ -347,37 +353,8 @@ class Annotate extends React.Component {
     });
   }
 
-  handleDeleteData(e) {
-    const { dataId, projectId } = this.state;
-    const { history } = this.props;
-    console.log("Data to be detelted: ", dataId);
-    axios({
-      method: "post",
-      url: "/api/rmdata",
-      data: {
-        dataId,
-        projectId
-      },
-    })
-      .then((response) => {
-        if (response.status === 201) {
-          this.setState({ successMessage: response.data.message });
-        }
-        // TODO: Then revert to the index page
-        console.log("history ", history);
-        history.replace({ pathname: "/empty" });
-        setTimeout(() => {
-          history.replace({ pathname: `/projects/${projectId}/data` });
-        });
-      })
-      .catch((error) => {
-        console.log(error.response);
-        this.setState({
-          errorMessage: error.response.data.message,
-          successMessage: "",
-          isSubmitting: false,
-        });
-      });
+  handleDeleteData(e, dataId) {
+    this.setModalShow(true);
   }
 
   render() {
@@ -385,6 +362,9 @@ class Annotate extends React.Component {
       zoom,
       isPlaying,
       labels,
+      modalShow,
+      dataId,
+      projectId,
       isDataLoading,
       isMarkedForReview,
       referenceTranscription,
@@ -543,7 +523,7 @@ class Annotate extends React.Component {
                                   selectedSegment.data.annotations &&
                                   selectedSegment.data.annotations[key] &&
                                   selectedSegment.data.annotations[key][
-                                  "values"
+                                    "values"
                                   ]) ||
                                 (value["type"] === "multiselect" ? [] : "")
                               }
@@ -612,13 +592,24 @@ class Annotate extends React.Component {
                       size="lg"
                       type="primary"
                       disabled={isDataLoading ? true : false}
-                      onClick={(e) => this.handleDeleteData(e)}
+                      onClick={(e) => this.handleDeleteData(e, dataId)}
                       text="Delete DataPoint"
                     />
                   </div>
                 </div>
               </div>
             ) : null}
+            {modalShow ? (
+              <FormModal
+                onExited={() => this.refreshPage()}
+                formType="DELETE_DATA"
+                title="Deleting data"
+                dataId={dataId}
+                projectId={projectId}
+                show={modalShow}
+                onHide={() => this.setModalShow(false)}
+              />
+            ) : null}
           </div>
         </div>
       </div>

From bcd983751419373b991198eac4d3d241c7af79a2 Mon Sep 17 00:00:00 2001
From: dumbmachine <ratin.kumar.2k@gmail.com>
Date: Sat, 12 Sep 2020 16:21:32 +0530
Subject: [PATCH 4/5] soft delete for label

---
 backend/models.py                             |   7 ++
 backend/routes/labels.py                      |  27 +++++
 backend/routes/login.py                       |   2 +-
 backend/routes/projects.py                    |  46 ++++++-
 .../src/containers/forms/deleteDataForm.js    |   2 +-
 .../src/containers/forms/deleteLabelFrom.js   | 114 ++++++++++++++++++
 .../containers/forms/deleteLabelValuesFrom.js | 112 +++++++++++++++++
 frontend/src/containers/modal.js              |  16 +++
 frontend/src/pages/annotate.js                |  16 +--
 frontend/src/pages/labelValues.js             |  26 +++-
 frontend/src/pages/labels.js                  |  19 +++
 11 files changed, 376 insertions(+), 11 deletions(-)
 create mode 100644 frontend/src/containers/forms/deleteLabelFrom.js
 create mode 100644 frontend/src/containers/forms/deleteLabelValuesFrom.js

diff --git a/backend/models.py b/backend/models.py
index df25a03..9e771ba 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -158,8 +158,12 @@ def to_dict(self):
 
 class Label(db.Model):
     __tablename__ = "label"
+    query_class = QueryWithSoftDelete
+
 
     id = db.Column("id", db.Integer(), primary_key=True)
+    is_deleted = db.Column("is_deleted", db.DateTime(),
+                           nullable=True, default=None)
 
     name = db.Column("name", db.String(32), nullable=False)
 
@@ -219,6 +223,9 @@ class LabelValue(db.Model):
 
     id = db.Column("id", db.Integer(), primary_key=True)
 
+    # deleted = db.Column("deleted", db.DateTime(),
+    #                        nullable=True, default=None)
+
     label_id = db.Column(
         "label_id", db.Integer(), db.ForeignKey("label.id"), nullable=False
     )
diff --git a/backend/routes/labels.py b/backend/routes/labels.py
index 46eb412..c75b9af 100644
--- a/backend/routes/labels.py
+++ b/backend/routes/labels.py
@@ -34,6 +34,7 @@ def add_value_to_label(label_id):
 
     try:
         label_value = LabelValue(value=value, label_id=label_id)
+        app.logger.info(f"soemthing was done here: {label_value}")
         db.session.add(label_value)
         db.session.commit()
         db.session.refresh(label_value)
@@ -86,6 +87,7 @@ def get_values_for_label(label_id):
                 "created_on": value.created_at.strftime("%B %d, %Y"),
             }
             for value in values
+            # for value in values if value.is_deleted is None
         ]
     except Exception as e:
         app.logger.error(f"No values exists for label with id: {label_id}")
@@ -95,6 +97,31 @@ def get_values_for_label(label_id):
     return (jsonify(values=response), 200)
 
 
+@api.route("/labels/<int:label_id>/values/<int:label_value_id>", methods=["DELETE"])
+@jwt_required
+def remove_values_from_label(label_id, label_value_id):
+    identity = get_jwt_identity()
+    request_user = User.query.filter_by(username=identity["username"]).first()
+    is_admin = True if request_user.role.role == "admin" else False
+
+    if is_admin == False:
+        return jsonify(message="Unauthorized access!"), 401
+
+    try:
+        value = LabelValue.query.get(label_value_id)
+        value.is_deleted = db.func.now()
+        db.session.commit()
+    except Exception as e:
+        app.logger.error(f"No values exists for label with id: {label_id}")
+        app.logger.error(e)
+        return (jsonify(message=f"No values exists for label with id: {label_id}"), 404)
+
+    return (jsonify(
+        label_value_id=label_value_id,
+        message=f"LabelValue was deleted"
+        ), 200)
+
+
 @api.route("/labels/<int:label_id>/values/<int:label_value_id>", methods=["GET"])
 @jwt_required
 def fetch_label_value(label_id, label_value_id):
diff --git a/backend/routes/login.py b/backend/routes/login.py
index 8fa3b19..10bf84a 100644
--- a/backend/routes/login.py
+++ b/backend/routes/login.py
@@ -51,7 +51,7 @@ def login():
             400,
         )
 
-    user = User.query.not_deleted().filter_by(username=username).first()
+    user = User.query.filter_by(username=username).first()
 
     if user is None or not user.check_password(password):
         return (
diff --git a/backend/routes/projects.py b/backend/routes/projects.py
index 9c33bc9..184f2fc 100644
--- a/backend/routes/projects.py
+++ b/backend/routes/projects.py
@@ -146,7 +146,7 @@ def fetch_project(project_id):
                 "type": label.label_type.type,
                 "created_on": label.created_at.strftime("%B %d, %Y"),
             }
-            for label in project.labels
+            for label in project.labels if label.is_deleted is None
         ]
     except Exception as e:
         app.logger.error(f"No project exists with Project ID: {project_id}")
@@ -308,6 +308,50 @@ def add_label_to_project(project_id):
     )
 
 
+@api.route("/projects/<int:project_id>/rmlabels", methods=["DELETE"])
+@jwt_required
+def remove_label_to_project(project_id):
+    identity = get_jwt_identity()
+    request_user = User.query.filter_by(username=identity["username"]).first()
+    is_admin = True if request_user.role.role == "admin" else False
+
+    if is_admin == False:
+        return jsonify(message="Unauthorized access!"), 401
+
+    if not request.is_json:
+        return jsonify(message="Missing JSON in request"), 400
+
+    label_id = request.json.get("labelId", None)
+
+    try:
+        project = Project.query.get(project_id)
+        label = Label.query.get(label_id)
+        label.is_deleted = db.func.now()
+
+        db.session.commit()
+    except Exception as e:
+        app.logger.error(f"Error adding label to project: {project_id}")
+        app.logger.error(e)
+        return (
+            jsonify(
+                message=f"Error deleting label to project: {project_id}",
+                type="LABEL_DELETION_FAILED",
+            ),
+            500,
+        )
+
+    return (
+        jsonify(
+            project_id=project.id,
+            label_id=label.id,
+            message=f"Label deleted from project: {project.name}",
+            type="LABEL_DELETED_FROM_PROJECT",
+        ),
+        201,
+    )
+
+
+
 @api.route("/projects/<int:project_id>/labels/<int:label_id>", methods=["GET"])
 @jwt_required
 def get_label_for_project(project_id, label_id):
diff --git a/frontend/src/containers/forms/deleteDataForm.js b/frontend/src/containers/forms/deleteDataForm.js
index 33d4c51..aa32aa3 100644
--- a/frontend/src/containers/forms/deleteDataForm.js
+++ b/frontend/src/containers/forms/deleteDataForm.js
@@ -100,7 +100,7 @@ class DeleteDataform extends React.Component {
                   disabled={isSubmitting ? true : false}
                   onClick={(e) => this.handleUserDelete(e, dataId, projectId)}
                   isSubmitting={isSubmitting}
-                  text="Delete User"
+                  text="Delete Data"
                 />
               </div>
             </div>
diff --git a/frontend/src/containers/forms/deleteLabelFrom.js b/frontend/src/containers/forms/deleteLabelFrom.js
new file mode 100644
index 0000000..9a10f7d
--- /dev/null
+++ b/frontend/src/containers/forms/deleteLabelFrom.js
@@ -0,0 +1,114 @@
+import React from "react";
+import axios from "axios";
+import { withRouter } from "react-router";
+import { withStore } from "@spyna/react-store";
+
+import Alert from "../../components/alert";
+import { Button } from "../../components/button";
+
+class DeleteLabelForm extends React.Component {
+  constructor(props) {
+    super(props);
+
+    const labelId = this.props.labelId;
+    const projectId = this.props.projectId;
+
+    this.initialState = {
+      labelId,
+      projectId,
+      message: `Are you sure you want to delete the label: ${labelId}`,
+      refreshPath: `/projects/${projectId}/labels`,
+      deleteLabelUrl: `/api/projects/${projectId}/rmlabels`,
+      errorMessage: "",
+      successMessage: "",
+      isSubmitting: false,
+    };
+
+    this.state = Object.assign({}, this.initialState);
+  }
+
+  resetState() {
+    this.setState(this.initialState);
+  }
+
+  refreshPage() {
+    const { history } = this.props;
+    const { refreshPath } = this.state;
+    history.replace({ pathname: "/empty" });
+    setTimeout(() => {
+      history.replace({
+        pathname: refreshPath,
+      });
+    });
+  }
+
+  handleLabelDelete(e) {
+    const { labelId, deleteLabelUrl } = this.state;
+    console.log("The data to be deleted will be:", labelId);
+    axios({
+      method: "DELETE",
+      url: deleteLabelUrl,
+      data: {
+        labelId,
+      },
+    })
+      .then((response) => {
+        if (response.status === 201) {
+          this.setState({ successMessage: response.data.message });
+        }
+        this.refreshPage()
+      })
+      .catch((error) => {
+        console.log(error.response);
+        this.setState({
+          errorMessage: error.response.data.message,
+          successMessage: "",
+          isSubmitting: false,
+        });
+      });
+
+  }
+
+  render() {
+    const {
+      labelId,
+      message,
+      isSubmitting,
+      errorMessage,
+      successMessage,
+    } = this.state;
+    return (
+      <div className="container h-75 text-center">
+        <div className="row h-100 justify-content-center align-items-center">
+          <form
+            className="col-6"
+            name="new_project"
+            ref={(el) => (this.form = el)}
+          >
+            {errorMessage ? (
+              <Alert type="danger" message={errorMessage} />
+            ) : null}
+            {successMessage ? (
+              <Alert type="success" message={successMessage} />
+            ) : null}
+            <div className="form-group text-left">{message}</div>
+            <div className="form-row">
+              <div className="form-group col">
+                <Button
+                  size="lg"
+                  type="primary"
+                  disabled={isSubmitting ? true : false}
+                  onClick={(e) => this.handleLabelDelete(e, labelId)}
+                  isSubmitting={isSubmitting}
+                  text="Delete User"
+                />
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default withStore(withRouter(DeleteLabelForm));
diff --git a/frontend/src/containers/forms/deleteLabelValuesFrom.js b/frontend/src/containers/forms/deleteLabelValuesFrom.js
new file mode 100644
index 0000000..d1a2f5b
--- /dev/null
+++ b/frontend/src/containers/forms/deleteLabelValuesFrom.js
@@ -0,0 +1,112 @@
+import React from "react";
+import axios from "axios";
+import { withRouter } from "react-router";
+import { withStore } from "@spyna/react-store";
+
+import Alert from "../../components/alert";
+import { Button } from "../../components/button";
+
+class DeleteLabelValuesForm extends React.Component {
+  constructor(props) {
+    super(props);
+
+    const labelId = this.props.labelId;
+    const projectId = this.props.projectId;
+    const labelValueId = this.props.labelValueId;
+    console.log(labelId, labelValueId, projectId);
+    this.initialState = {
+      labelId,
+      projectId,
+      labelValueId,
+      message: `Are you sure you want to delete the label: ${labelId}`,
+      refreshPath: `/labels`,
+      deleteLabelValueUrl: `/api/labels/${labelId}/values/${labelValueId}`,
+      errorMessage: "",
+      successMessage: "",
+      isSubmitting: false,
+    };
+
+    this.state = Object.assign({}, this.initialState);
+  }
+
+  resetState() {
+    this.setState(this.initialState);
+  }
+
+  refreshPage() {
+    const { history } = this.props;
+    const { refreshPath } = this.state;
+    history.replace({ pathname: "/empty" });
+    setTimeout(() => {
+      history.replace({
+        pathname: refreshPath,
+      });
+    });
+  }
+
+  handleLabelDelete(e) {
+    const { labelId, labelValueId, deleteLabelValueUrl } = this.state;
+    console.log("The data to be deleted will be:", labelId, labelValueId);
+    axios({
+      method: "DELETE",
+      url: deleteLabelValueUrl,
+    })
+      .then((response) => {
+        if (response.status === 201) {
+          this.setState({ successMessage: response.data.message });
+        }
+        this.refreshPage();
+      })
+      .catch((error) => {
+        console.log(error.response);
+        this.setState({
+          errorMessage: error.response.data.message,
+          successMessage: "",
+          isSubmitting: false,
+        });
+      });
+  }
+
+  render() {
+    const {
+      labelId,
+      message,
+      isSubmitting,
+      errorMessage,
+      successMessage,
+    } = this.state;
+    return (
+      <div className="container h-75 text-center">
+        <div className="row h-100 justify-content-center align-items-center">
+          <form
+            className="col-6"
+            name="new_project"
+            ref={(el) => (this.form = el)}
+          >
+            {errorMessage ? (
+              <Alert type="danger" message={errorMessage} />
+            ) : null}
+            {successMessage ? (
+              <Alert type="success" message={successMessage} />
+            ) : null}
+            <div className="form-group text-left">{message}</div>
+            <div className="form-row">
+              <div className="form-group col">
+                <Button
+                  size="lg"
+                  type="primary"
+                  disabled={isSubmitting ? true : false}
+                  onClick={(e) => this.handleLabelDelete(e, labelId)}
+                  isSubmitting={isSubmitting}
+                  text="Delete LabelValue"
+                />
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default withStore(withRouter(DeleteLabelValuesForm));
diff --git a/frontend/src/containers/modal.js b/frontend/src/containers/modal.js
index 9c6d60d..9d8058f 100644
--- a/frontend/src/containers/modal.js
+++ b/frontend/src/containers/modal.js
@@ -11,6 +11,9 @@ import CreateLabelValueForm from "./forms/createLabelValuelForm";
 import EditLabelValueForm from "./forms/editLabelValueForm";
 import DeleteDataForm from "./forms/deleteDataForm";
 import DeleteUserForm from "./forms/deleteUserForm";
+import DeleteLabelForm from "./forms/deleteLabelFrom";
+import DeleteLabelValuesForm from "./forms/deleteLabelValuesFrom";
+
 
 const FormModal = (props) => {
   return (
@@ -29,6 +32,19 @@ const FormModal = (props) => {
       </Modal.Header>
       <Modal.Body>
         {props.formType === "NEW_USER" ? <CreateUserForm /> : null}
+        {props.formType === "DELETE_LABEL" ? (
+          <DeleteLabelForm
+            labelId={props.labelId}
+            projectId={props.projectId}
+          />
+        ) : null}
+        {props.formType === "DELETE_LABEL_VALUE" ? (
+          <DeleteLabelValuesForm
+            labelId={props.labelId}
+            projectId={props.projectId}
+            labelValueId={props.labelValueId}
+          />
+        ) : null}
         {props.formType === "DELETE_USER" ? (
           <DeleteUserForm user={props.user} />
         ) : null}
diff --git a/frontend/src/pages/annotate.js b/frontend/src/pages/annotate.js
index d889b2c..6d395f7 100644
--- a/frontend/src/pages/annotate.js
+++ b/frontend/src/pages/annotate.js
@@ -14,6 +14,7 @@ import {
   faForward,
   faPlayCircle,
   faPauseCircle,
+  faTrashAlt,
 } from "@fortawesome/free-solid-svg-icons";
 import Alert from "../components/alert";
 import { IconButton, Button } from "../components/button";
@@ -446,6 +447,14 @@ class Annotate extends React.Component {
                       }}
                     />
                   </div>
+                  <div className="col-1">
+                    <IconButton
+                      icon={faTrashAlt}
+                      size="2x"
+                      title="Remove Data"
+                      onClick={(e) => this.handleDeleteData(e, dataId)}
+                    />
+                  </div>
                 </div>
                 <div className="row justify-content-center">
                   <div className="col-1">
@@ -588,13 +597,6 @@ class Annotate extends React.Component {
                     >
                       Mark for review
                     </label>
-                    <Button
-                      size="lg"
-                      type="primary"
-                      disabled={isDataLoading ? true : false}
-                      onClick={(e) => this.handleDeleteData(e, dataId)}
-                      text="Delete DataPoint"
-                    />
                   </div>
                 </div>
               </div>
diff --git a/frontend/src/pages/labelValues.js b/frontend/src/pages/labelValues.js
index bbed176..0d97e35 100644
--- a/frontend/src/pages/labelValues.js
+++ b/frontend/src/pages/labelValues.js
@@ -3,7 +3,7 @@ import React from "react";
 import { withRouter } from "react-router-dom";
 import { Helmet } from "react-helmet";
 
-import { faPlusSquare, faEdit } from "@fortawesome/free-solid-svg-icons";
+import { faPlusSquare, faEdit, faTrash } from "@fortawesome/free-solid-svg-icons";
 
 import { IconButton } from "../components/button";
 import Loader from "../components/loader";
@@ -66,6 +66,18 @@ class LabelValues extends React.Component {
     });
   }
 
+  handleDeleteLabelValue(e, labelId, labelValueId) {
+    const { projectId } = this.state;
+    console.log("will delete: ", labelId, labelValueId, projectId);
+    this.setModalShow(true);
+    this.setState({
+      formType: "DELETE_LABEL_VALUE",
+      title: "Deleting labelvalue",
+      labelId,
+      labelValueId
+    });
+  }
+
   refreshPage() {
     const { history } = this.props;
     const { labelValuesUrl } = this.state;
@@ -160,6 +172,18 @@ class LabelValues extends React.Component {
                                 )
                               }
                             />
+                            <IconButton
+                              icon={faTrash}
+                              size="sm"
+                              title={"Edit label value"}
+                              onClick={(e) =>
+                                this.handleDeleteLabelValue(
+                                  e,
+                                  labelId,
+                                  labelValue["value_id"]
+                                )
+                              }
+                            />
                           </td>
                         </tr>
                       );
diff --git a/frontend/src/pages/labels.js b/frontend/src/pages/labels.js
index 8cc1f64..d4f3af8 100644
--- a/frontend/src/pages/labels.js
+++ b/frontend/src/pages/labels.js
@@ -7,6 +7,7 @@ import {
   faPlusSquare,
   faEdit,
   faList,
+  faTrashAlt,
 } from "@fortawesome/free-solid-svg-icons";
 
 import { IconButton } from "../components/button";
@@ -74,6 +75,16 @@ class Labels extends React.Component {
     history.push(`/labels/${labelId}/values`);
   }
 
+  handleDelteLabel(e, labelId) {
+    console.log("We are removing the user: ", labelId);
+    this.setModalShow(true);
+    this.setState({
+      formType: "DELETE_LABEL",
+      title: "Deleting label",
+      labelId,
+    });
+  }
+
   refreshPage() {
     const { history } = this.props;
     const { labelsUrl } = this.state;
@@ -173,6 +184,14 @@ class Labels extends React.Component {
                                 )
                               }
                             />
+                            <IconButton
+                              icon={faTrashAlt}
+                              size="sm"
+                              title={"Edit label"}
+                              onClick={(e) =>
+                                this.handleDelteLabel(e, label["label_id"])
+                              }
+                            />
                           </td>
                         </tr>
                       );

From db878ea0f7de70f197bc16218460b5f9386a9c39 Mon Sep 17 00:00:00 2001
From: Ratin Kumar <ratin.kumar@platform.sh>
Date: Sun, 2 May 2021 19:06:18 +0200
Subject: [PATCH 5/5] added deletion of Project,Label,LabelValue

---
 backend/migrations/versions/063b15fc4ca4_.py  | 34 +++++++++++++++++++
 backend/migrations/versions/e1e28decd983_.py  | 28 +++++++++++++++
 backend/migrations/versions/ffc98d2cb07f_.py  | 30 ++++++++++++++++
 backend/models.py                             | 33 ++++++++++--------
 backend/routes/labels.py                      | 12 +++----
 backend/routes/projects.py                    | 10 +++---
 .../src/containers/forms/deleteLabelFrom.js   |  3 +-
 .../containers/forms/deleteLabelValuesFrom.js |  6 ++--
 frontend/src/pages/labelValues.js             |  4 +--
 frontend/src/pages/labels.js                  |  6 ++--
 10 files changed, 129 insertions(+), 37 deletions(-)
 create mode 100644 backend/migrations/versions/063b15fc4ca4_.py
 create mode 100644 backend/migrations/versions/e1e28decd983_.py
 create mode 100644 backend/migrations/versions/ffc98d2cb07f_.py

diff --git a/backend/migrations/versions/063b15fc4ca4_.py b/backend/migrations/versions/063b15fc4ca4_.py
new file mode 100644
index 0000000..ed0c33d
--- /dev/null
+++ b/backend/migrations/versions/063b15fc4ca4_.py
@@ -0,0 +1,34 @@
+"""empty message
+
+Revision ID: 063b15fc4ca4
+Revises: b60bb67d1758
+Create Date: 2021-05-02 16:32:52.230489
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '063b15fc4ca4'
+down_revision = 'b60bb67d1758'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('data', sa.Column('is_deleted', sa.DateTime(), nullable=True))
+    op.add_column('label', sa.Column('is_deleted', sa.DateTime(), nullable=True))
+    op.add_column('user', sa.Column('is_deleted', sa.DateTime(), nullable=True))
+    op.add_column('user_project', sa.Column('is_deleted', sa.DateTime(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('user_project', 'is_deleted')
+    op.drop_column('user', 'is_deleted')
+    op.drop_column('label', 'is_deleted')
+    op.drop_column('data', 'is_deleted')
+    # ### end Alembic commands ###
diff --git a/backend/migrations/versions/e1e28decd983_.py b/backend/migrations/versions/e1e28decd983_.py
new file mode 100644
index 0000000..6b760ab
--- /dev/null
+++ b/backend/migrations/versions/e1e28decd983_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: e1e28decd983
+Revises: 063b15fc4ca4
+Create Date: 2021-05-02 16:46:55.760634
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e1e28decd983'
+down_revision = '063b15fc4ca4'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('project', sa.Column('is_deleted', sa.DateTime(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('project', 'is_deleted')
+    # ### end Alembic commands ###
diff --git a/backend/migrations/versions/ffc98d2cb07f_.py b/backend/migrations/versions/ffc98d2cb07f_.py
new file mode 100644
index 0000000..c49aa3c
--- /dev/null
+++ b/backend/migrations/versions/ffc98d2cb07f_.py
@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: ffc98d2cb07f
+Revises: e1e28decd983
+Create Date: 2021-05-02 16:58:36.146492
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ffc98d2cb07f'
+down_revision = 'e1e28decd983'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('label_type', sa.Column('is_deleted', sa.DateTime(), nullable=True))
+    op.add_column('label_value', sa.Column('is_deleted', sa.DateTime(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('label_value', 'is_deleted')
+    op.drop_column('label_type', 'is_deleted')
+    # ### end Alembic commands ###
diff --git a/backend/models.py b/backend/models.py
index 9e771ba..bdc06da 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -8,7 +8,7 @@ class QueryWithSoftDelete(BaseQuery):
 
     def __new__(cls, *args, **kwargs):
         obj = super(QueryWithSoftDelete, cls).__new__(cls)
-        obj._with_deleted = kwargs.pop('_with_deleted', False)
+        obj._with_deleted = kwargs.pop("_with_deleted", False)
         if len(args) > 0:
             super(QueryWithSoftDelete, obj).__init__(*args, **kwargs)
             return obj.filter_by(is_deleted=None) if obj._with_deleted is None else obj
@@ -18,8 +18,11 @@ def __init__(self, *args, **kwargs):
         pass
 
     def with_deleted(self):
-        return self.__class__(db.class_mapper(self._mapper_zero().class_),
-                              session=db.session(), _with_deleted=True)
+        return self.__class__(
+            db.class_mapper(self._mapper_zero().class_),
+            session=db.session(),
+            _with_deleted=True,
+        )
 
     def _get(self, *args, **kwargs):
         # this calls the original query.get function from the base class
@@ -29,7 +32,9 @@ def get(self, *args, **kwargs):
         # the query.get method does not like it if there is a filter clause
         # pre-loaded, so we need to implement it using a workaround
         obj = self.with_deleted()._get(*args, **kwargs)
-        return obj if obj is None or self._with_deleted or obj.is_deleted is None else None
+        return (
+            obj if obj is None or self._with_deleted or obj.is_deleted is None else None
+        )
 
     def _all(self, *args, **kwargs):
         return super(QueryWithSoftDelete, self).all(*args, **kwargs)
@@ -95,8 +100,7 @@ class Data(db.Model):
 
     id = db.Column("id", db.Integer(), primary_key=True)
 
-    is_deleted = db.Column("is_deleted", db.DateTime(),
-                        nullable=True, default=None)
+    is_deleted = db.Column("is_deleted", db.DateTime(), nullable=True, default=None)
     project_id = db.Column(
         "project_id", db.Integer(), db.ForeignKey("project.id"), nullable=False
     )
@@ -160,10 +164,8 @@ class Label(db.Model):
     __tablename__ = "label"
     query_class = QueryWithSoftDelete
 
-
     id = db.Column("id", db.Integer(), primary_key=True)
-    is_deleted = db.Column("is_deleted", db.DateTime(),
-                           nullable=True, default=None)
+    is_deleted = db.Column("is_deleted", db.DateTime(), nullable=True, default=None)
 
     name = db.Column("name", db.String(32), nullable=False)
 
@@ -216,6 +218,7 @@ class LabelType(db.Model):
         default=db.func.now(),
         onupdate=db.func.utc_timestamp(),
     )
+    is_deleted = db.Column("is_deleted", db.DateTime(), nullable=True, default=None)
 
 
 class LabelValue(db.Model):
@@ -223,8 +226,7 @@ class LabelValue(db.Model):
 
     id = db.Column("id", db.Integer(), primary_key=True)
 
-    # deleted = db.Column("deleted", db.DateTime(),
-    #                        nullable=True, default=None)
+    is_deleted = db.Column("is_deleted", db.DateTime(), nullable=True, default=None)
 
     label_id = db.Column(
         "label_id", db.Integer(), db.ForeignKey("label.id"), nullable=False
@@ -282,8 +284,7 @@ class Project(db.Model):
         onupdate=db.func.utc_timestamp(),
     )
 
-    # is_deleted = db.Column("is_deleted", db.DateTime(),
-    #                     nullable=True, default=None)
+    is_deleted = db.Column("is_deleted", db.DateTime(), nullable=True, default=None)
 
     users = db.relationship(
         "User", secondary=user_project_table, back_populates="projects"
@@ -292,6 +293,7 @@ class Project(db.Model):
     labels = db.relationship("Label", backref="Project")
     creator_user = db.relationship("User")
 
+
 class Role(db.Model):
     __tablename__ = "role"
 
@@ -340,7 +342,9 @@ class Segmentation(db.Model):
     )
 
     values = db.relationship(
-        "LabelValue", secondary=annotation_table, back_populates="segmentations",
+        "LabelValue",
+        secondary=annotation_table,
+        back_populates="segmentations",
     )
 
     def set_start_time(self, start_time):
@@ -404,4 +408,3 @@ def set_password(self, password):
 
     def check_password(self, password):
         return check_password_hash(self.password, password)
-
diff --git a/backend/routes/labels.py b/backend/routes/labels.py
index c75b9af..2f1f1b8 100644
--- a/backend/routes/labels.py
+++ b/backend/routes/labels.py
@@ -79,7 +79,7 @@ def get_values_for_label(label_id):
         return jsonify(message="Unauthorized access!"), 401
 
     try:
-        values = LabelValue.query.filter_by(label_id=label_id).all()
+        values = LabelValue.query.filter_by(label_id=label_id, is_deleted=None).all()
         response = [
             {
                 "value_id": value.id,
@@ -87,7 +87,6 @@ def get_values_for_label(label_id):
                 "created_on": value.created_at.strftime("%B %d, %Y"),
             }
             for value in values
-            # for value in values if value.is_deleted is None
         ]
     except Exception as e:
         app.logger.error(f"No values exists for label with id: {label_id}")
@@ -100,6 +99,7 @@ def get_values_for_label(label_id):
 @api.route("/labels/<int:label_id>/values/<int:label_value_id>", methods=["DELETE"])
 @jwt_required
 def remove_values_from_label(label_id, label_value_id):
+    app.logger.info("We are deleint something")
     identity = get_jwt_identity()
     request_user = User.query.filter_by(username=identity["username"]).first()
     is_admin = True if request_user.role.role == "admin" else False
@@ -116,10 +116,10 @@ def remove_values_from_label(label_id, label_value_id):
         app.logger.error(e)
         return (jsonify(message=f"No values exists for label with id: {label_id}"), 404)
 
-    return (jsonify(
-        label_value_id=label_value_id,
-        message=f"LabelValue was deleted"
-        ), 200)
+    return (
+        jsonify(label_value_id=label_value_id, message=f"LabelValue was deleted"),
+        200,
+    )
 
 
 @api.route("/labels/<int:label_id>/values/<int:label_value_id>", methods=["GET"])
diff --git a/backend/routes/projects.py b/backend/routes/projects.py
index 7e970e4..bae1e97 100644
--- a/backend/routes/projects.py
+++ b/backend/routes/projects.py
@@ -59,6 +59,7 @@ def create_project():
 
     return jsonify(project_id=project.id, message="Project has been created!"), 201
 
+
 @api.route("/rmprojects", methods=["POST"])
 @jwt_required
 def remove_project():
@@ -94,14 +95,13 @@ def remove_project():
 @jwt_required
 def fetch_all_projects():
     identity = get_jwt_identity()
-    request_user = User.query.filter_by(
-        username=identity["username"]).first()
+    request_user = User.query.filter_by(username=identity["username"]).first()
     is_admin = True if request_user.role.role == "admin" else False
 
     if is_admin == False:
         return jsonify(message="Unauthorized access!"), 401
     try:
-        projects = Project.query.all()
+        projects = Project.query.filter_by(is_deleted=None).all()
         app.logger.info(f"All the projects are : {projects}")
         response = list(
             [
@@ -146,7 +146,8 @@ def fetch_project(project_id):
                 "type": label.label_type.type,
                 "created_on": label.created_at.strftime("%B %d, %Y"),
             }
-            for label in project.labels if label.is_deleted is None
+            for label in project.labels
+            if label.is_deleted is None
         ]
     except Exception as e:
         app.logger.error(f"No project exists with Project ID: {project_id}")
@@ -351,7 +352,6 @@ def remove_label_to_project(project_id):
     )
 
 
-
 @api.route("/projects/<int:project_id>/labels/<int:label_id>", methods=["GET"])
 @jwt_required
 def get_label_for_project(project_id, label_id):
diff --git a/frontend/src/containers/forms/deleteLabelFrom.js b/frontend/src/containers/forms/deleteLabelFrom.js
index 9a10f7d..da417bf 100644
--- a/frontend/src/containers/forms/deleteLabelFrom.js
+++ b/frontend/src/containers/forms/deleteLabelFrom.js
@@ -44,7 +44,6 @@ class DeleteLabelForm extends React.Component {
 
   handleLabelDelete(e) {
     const { labelId, deleteLabelUrl } = this.state;
-    console.log("The data to be deleted will be:", labelId);
     axios({
       method: "DELETE",
       url: deleteLabelUrl,
@@ -100,7 +99,7 @@ class DeleteLabelForm extends React.Component {
                   disabled={isSubmitting ? true : false}
                   onClick={(e) => this.handleLabelDelete(e, labelId)}
                   isSubmitting={isSubmitting}
-                  text="Delete User"
+                  text="Delete Label"
                 />
               </div>
             </div>
diff --git a/frontend/src/containers/forms/deleteLabelValuesFrom.js b/frontend/src/containers/forms/deleteLabelValuesFrom.js
index d1a2f5b..b680a04 100644
--- a/frontend/src/containers/forms/deleteLabelValuesFrom.js
+++ b/frontend/src/containers/forms/deleteLabelValuesFrom.js
@@ -13,13 +13,12 @@ class DeleteLabelValuesForm extends React.Component {
     const labelId = this.props.labelId;
     const projectId = this.props.projectId;
     const labelValueId = this.props.labelValueId;
-    console.log(labelId, labelValueId, projectId);
     this.initialState = {
       labelId,
       projectId,
       labelValueId,
       message: `Are you sure you want to delete the label: ${labelId}`,
-      refreshPath: `/labels`,
+      refreshPath: `/labels/${labelId}/values`,
       deleteLabelValueUrl: `/api/labels/${labelId}/values/${labelValueId}`,
       errorMessage: "",
       successMessage: "",
@@ -45,8 +44,7 @@ class DeleteLabelValuesForm extends React.Component {
   }
 
   handleLabelDelete(e) {
-    const { labelId, labelValueId, deleteLabelValueUrl } = this.state;
-    console.log("The data to be deleted will be:", labelId, labelValueId);
+    const { deleteLabelValueUrl } = this.state;
     axios({
       method: "DELETE",
       url: deleteLabelValueUrl,
diff --git a/frontend/src/pages/labelValues.js b/frontend/src/pages/labelValues.js
index 0d97e35..140c8ae 100644
--- a/frontend/src/pages/labelValues.js
+++ b/frontend/src/pages/labelValues.js
@@ -72,7 +72,7 @@ class LabelValues extends React.Component {
     this.setModalShow(true);
     this.setState({
       formType: "DELETE_LABEL_VALUE",
-      title: "Deleting labelvalue",
+      title: "Deleting Lavel Value",
       labelId,
       labelValueId
     });
@@ -175,7 +175,7 @@ class LabelValues extends React.Component {
                             <IconButton
                               icon={faTrash}
                               size="sm"
-                              title={"Edit label value"}
+                              title={"Delete label value"}
                               onClick={(e) =>
                                 this.handleDeleteLabelValue(
                                   e,
diff --git a/frontend/src/pages/labels.js b/frontend/src/pages/labels.js
index d4f3af8..f87a143 100644
--- a/frontend/src/pages/labels.js
+++ b/frontend/src/pages/labels.js
@@ -75,7 +75,7 @@ class Labels extends React.Component {
     history.push(`/labels/${labelId}/values`);
   }
 
-  handleDelteLabel(e, labelId) {
+  handleDeleteLabel(e, labelId) {
     console.log("We are removing the user: ", labelId);
     this.setModalShow(true);
     this.setState({
@@ -187,9 +187,9 @@ class Labels extends React.Component {
                             <IconButton
                               icon={faTrashAlt}
                               size="sm"
-                              title={"Edit label"}
+                              title={"Delete label"}
                               onClick={(e) =>
-                                this.handleDelteLabel(e, label["label_id"])
+                                this.handleDeleteLabel(e, label["label_id"])
                               }
                             />
                           </td>