From 984a4a4cf619ae4999acd4b80a68af5d0964707f Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Thu, 16 Mar 2023 16:44:12 -0700
Subject: [PATCH 1/2] IO-2193 Delete Owner & Vehicle

---
 .../owner-detail-form.container.jsx           | 47 +++++++++++++++++--
 .../vehicle-detail-form.container.jsx         | 47 +++++++++++++++++--
 client/src/graphql/owners.queries.js          |  8 ++++
 client/src/graphql/vehicles.queries.js        |  8 ++++
 client/src/translations/en_us/common.json     |  6 +++
 client/src/translations/es/common.json        |  6 +++
 client/src/translations/fr/common.json        |  6 +++
 7 files changed, 118 insertions(+), 10 deletions(-)

diff --git a/client/src/components/owner-detail-form/owner-detail-form.container.jsx b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
index 95f14ec00..381436d34 100644
--- a/client/src/components/owner-detail-form/owner-detail-form.container.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
@@ -1,15 +1,38 @@
-import { Button, Form, notification, PageHeader } from "antd";
+import { Button, Form, notification, PageHeader, Popconfirm } from "antd";
 import React, { useState } from "react";
+import { useHistory } from "react-router-dom";
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
-import { UPDATE_OWNER } from "../../graphql/owners.queries";
+import { DELETE_OWNER, UPDATE_OWNER } from "../../graphql/owners.queries";
 import OwnerDetailFormComponent from "./owner-detail-form.component";
 
 function OwnerDetailFormContainer({ owner, refetch }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
+  const history = useHistory();
   const [loading, setLoading] = useState(false);
   const [updateOwner] = useMutation(UPDATE_OWNER);
+  const [deleteOwner] = useMutation(DELETE_OWNER);
+
+  const handleDelete = async () => {
+    setLoading(true);
+    const result = await deleteOwner({
+      variables: { id: owner.id },
+    });
+    console.log(result);
+    if (result.errors) {
+      notification["error"]({
+        message: t("owners.errors.deleting"),
+      });
+      setLoading(false);
+    } else {
+      notification["success"]({
+        message: t("owners.successes.delete"),
+      });
+      setLoading(false);
+      history.push(`/manage/owners`);
+    }
+  };
 
   const handleFinish = async (values) => {
     setLoading(true);
@@ -41,15 +64,29 @@ function OwnerDetailFormContainer({ owner, refetch }) {
     <>
       <PageHeader
         title={t("menus.header.owners")}
-        extra={
+        extra={[
+          <Popconfirm
+            trigger="click"
+            onConfirm={handleDelete}
+            disabled={owner.jobs.length !== 0}
+            title={t("owners.labels.deleteconfirm")}
+          >
+            <Button
+              type="danger"
+              loading={loading}
+              disabled={owner.jobs.length !== 0}
+            >
+              {t("general.actions.delete")}
+            </Button>
+          </Popconfirm>,
           <Button
             type="primary"
             loading={loading}
             onClick={() => form.submit()}
           >
             {t("general.actions.save")}
-          </Button>
-        }
+          </Button>,
+        ]}
       />
       <Form
         form={form}
diff --git a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
index 3438d2f28..592d65c13 100644
--- a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
+++ b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
@@ -1,16 +1,39 @@
 import React, { useState } from "react";
-import { Button, Form, notification, PageHeader } from "antd";
+import { Button, Form, notification, PageHeader, Popconfirm } from "antd";
 import { useMutation } from "@apollo/client";
 import VehicleDetailFormComponent from "./vehicle-detail-form.component";
 import { useTranslation } from "react-i18next";
 import moment from "moment";
-import { UPDATE_VEHICLE } from "../../graphql/vehicles.queries";
+import { DELETE_VEHICLE, UPDATE_VEHICLE } from "../../graphql/vehicles.queries";
+import { useHistory } from "react-router-dom";
 
 function VehicleDetailFormContainer({ vehicle, refetch }) {
   const { t } = useTranslation();
   const [updateVehicle] = useMutation(UPDATE_VEHICLE);
+  const [deleteVehicle] = useMutation(DELETE_VEHICLE);
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
+  const history = useHistory();
+
+  const handleDelete = async () => {
+    setLoading(true);
+    const result = await deleteVehicle({
+      variables: { id: vehicle.id },
+    });
+    console.log(result);
+    if (result.errors) {
+      notification["error"]({
+        message: t("vehicles.errors.deleting"),
+      });
+      setLoading(false);
+    } else {
+      notification["success"]({
+        message: t("vehicles.successes.delete"),
+      });
+      setLoading(false);
+      history.push(`/manage/vehicles`);
+    }
+  };
 
   const handleFinish = async (values) => {
     setLoading(true);
@@ -40,15 +63,29 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {
     <>
       <PageHeader
         title={t("menus.header.vehicles")}
-        extra={
+        extra={[
+          <Popconfirm
+            trigger="click"
+            onConfirm={handleDelete}
+            disabled={vehicle.jobs.length !== 0}
+            title={t("vehicles.labels.deleteconfirm")}
+          >
+            <Button
+              type="danger"
+              loading={loading}
+              disabled={vehicle.jobs.length !== 0}
+            >
+              {t("general.actions.delete")}
+            </Button>
+          </Popconfirm>,
           <Button
             type="primary"
             loading={loading}
             onClick={() => form.submit()}
           >
             {t("general.actions.save")}
-          </Button>
-        }
+          </Button>,
+        ]}
       />
       <Form
         onFinish={handleFinish}
diff --git a/client/src/graphql/owners.queries.js b/client/src/graphql/owners.queries.js
index 87d5a54d5..440dc3011 100644
--- a/client/src/graphql/owners.queries.js
+++ b/client/src/graphql/owners.queries.js
@@ -94,6 +94,14 @@ export const UPDATE_OWNER = gql`
   }
 `;
 
+export const DELETE_OWNER = gql`
+  mutation DELETE_OWNER($id: uuid!) {
+    delete_owners_by_pk(id: $id) {
+      id
+    }
+  }
+`;
+
 export const QUERY_ALL_OWNERS = gql`
   query QUERY_ALL_OWNERS {
     owners {
diff --git a/client/src/graphql/vehicles.queries.js b/client/src/graphql/vehicles.queries.js
index a2a31a57d..9fa2dd837 100644
--- a/client/src/graphql/vehicles.queries.js
+++ b/client/src/graphql/vehicles.queries.js
@@ -55,6 +55,14 @@ export const UPDATE_VEHICLE = gql`
   }
 `;
 
+export const DELETE_VEHICLE = gql`
+  mutation DELETE_VEHICLE($id: uuid!) {
+    delete_vehicles_by_pk(id: $id) {
+      id
+    }
+  }
+`;
+
 export const QUERY_ALL_VEHICLES = gql`
   query QUERY_ALL_VEHICLES {
     vehicles {
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 960730798..499fa4299 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1993,6 +1993,7 @@
 				"update": "Update Selected Records"
 			},
 			"errors": {
+				"deleting": "Error deleting owner. {{error}}.",
 				"noaccess": "The record does not exist or you do not have access to it.  ",
 				"saving": "Error saving owner. {{error}}.",
 				"selectexistingornew": "Select an existing owner record or create a new one. "
@@ -2025,6 +2026,7 @@
 			},
 			"labels": {
 				"create_new": "Create a new owner record.",
+				"deleteconfirm": "Are you sure you want to delete this owner? This cannot be undone.",
 				"existing_owners": "Existing Owners",
 				"fromclaim": "Current Claim",
 				"fromowner": "Historical Owner Record",
@@ -2032,6 +2034,7 @@
 				"updateowner": "Update Owner"
 			},
 			"successes": {
+				"delete": "Owner deleted successfully.",
 				"save": "Owner saved successfully."
 			}
 		},
@@ -2792,6 +2795,7 @@
 		},
 		"vehicles": {
 			"errors": {
+				"deleting": "Error deleting vehicle. {{error}}.",
 				"noaccess": "The vehicle does not exist or you do not have access to it.",
 				"selectexistingornew": "Select an existing vehicle record or create a new one. ",
 				"validation": "Please ensure all fields are entered correctly.",
@@ -2827,12 +2831,14 @@
 				"registration": "Registration"
 			},
 			"labels": {
+				"deleteconfirm": "Are you sure you want to delete this vehicle? This cannot be undone.",
 				"fromvehicle": "Historical Vehicle Record",
 				"novehinfo": "No Vehicle Information",
 				"relatedjobs": "Related Jobs",
 				"updatevehicle": "Update Vehicle Information"
 			},
 			"successes": {
+				"delete": "Vehicle deleted successfully.",
 				"save": "Vehicle saved successfully."
 			}
 		},
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index f926c0817..7f0385f80 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1993,6 +1993,7 @@
 				"update": ""
 			},
 			"errors": {
+				"deleting": "",
 				"noaccess": "El registro no existe o no tiene acceso a él.",
 				"saving": "",
 				"selectexistingornew": ""
@@ -2025,6 +2026,7 @@
 			},
 			"labels": {
 				"create_new": "Crea un nuevo registro de propietario.",
+				"deleteconfirm": "",
 				"existing_owners": "Propietarios existentes",
 				"fromclaim": "",
 				"fromowner": "",
@@ -2032,6 +2034,7 @@
 				"updateowner": ""
 			},
 			"successes": {
+				"delete": "",
 				"save": "Propietario guardado con éxito."
 			}
 		},
@@ -2792,6 +2795,7 @@
 		},
 		"vehicles": {
 			"errors": {
+				"deleting": "",
 				"noaccess": "El vehículo no existe o usted no tiene acceso a él.",
 				"selectexistingornew": "",
 				"validation": "Asegúrese de que todos los campos se ingresen correctamente.",
@@ -2827,12 +2831,14 @@
 				"registration": ""
 			},
 			"labels": {
+				"deleteconfirm": "",
 				"fromvehicle": "",
 				"novehinfo": "",
 				"relatedjobs": "",
 				"updatevehicle": ""
 			},
 			"successes": {
+				"delete": "",
 				"save": "Vehículo guardado con éxito."
 			}
 		},
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 3f54c740a..172a44d34 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1993,6 +1993,7 @@
 				"update": ""
 			},
 			"errors": {
+				"deleting": "",
 				"noaccess": "L'enregistrement n'existe pas ou vous n'y avez pas accès.",
 				"saving": "",
 				"selectexistingornew": ""
@@ -2025,6 +2026,7 @@
 			},
 			"labels": {
 				"create_new": "Créez un nouvel enregistrement de propriétaire.",
+				"deleteconfirm": "",
 				"existing_owners": "Propriétaires existants",
 				"fromclaim": "",
 				"fromowner": "",
@@ -2032,6 +2034,7 @@
 				"updateowner": ""
 			},
 			"successes": {
+				"delete": "",
 				"save": "Le propriétaire a bien enregistré."
 			}
 		},
@@ -2792,6 +2795,7 @@
 		},
 		"vehicles": {
 			"errors": {
+				"deleting": "",
 				"noaccess": "Le véhicule n'existe pas ou vous n'y avez pas accès.",
 				"selectexistingornew": "",
 				"validation": "Veuillez vous assurer que tous les champs sont correctement entrés.",
@@ -2827,12 +2831,14 @@
 				"registration": ""
 			},
 			"labels": {
+				"deleteconfirm": "",
 				"fromvehicle": "",
 				"novehinfo": "",
 				"relatedjobs": "",
 				"updatevehicle": ""
 			},
 			"successes": {
+				"delete": "",
 				"save": "Le véhicule a été enregistré avec succès."
 			}
 		},

From d053e682d74a7efa88ba2602c58a8c9e62f21ce0 Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Thu, 16 Mar 2023 17:58:12 -0700
Subject: [PATCH 2/2] IO-2193 Delete Owner & Vehicle

Pass error message on deleting to translation
---
 .../owner-detail-form/owner-detail-form.container.jsx         | 4 +++-
 .../vehicle-detail-form/vehicle-detail-form.container.jsx     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/src/components/owner-detail-form/owner-detail-form.container.jsx b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
index 381436d34..fc1ae6bd1 100644
--- a/client/src/components/owner-detail-form/owner-detail-form.container.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
@@ -22,7 +22,9 @@ function OwnerDetailFormContainer({ owner, refetch }) {
     console.log(result);
     if (result.errors) {
       notification["error"]({
-        message: t("owners.errors.deleting"),
+        message: t("owners.errors.deleting", {
+          error: JSON.stringify(result.errors),
+        }),
       });
       setLoading(false);
     } else {
diff --git a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
index 592d65c13..9fbe45ed7 100644
--- a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
+++ b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
@@ -23,7 +23,9 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {
     console.log(result);
     if (result.errors) {
       notification["error"]({
-        message: t("vehicles.errors.deleting"),
+        message: t("vehicles.errors.deleting", {
+          error: JSON.stringify(result.errors),
+        }),
       });
       setLoading(false);
     } else {