From 95c06ea25a1293d4e27f8075960cb59b212d6fa5 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 2 Feb 2021 08:40:34 -0800
Subject: [PATCH] Clean up CC save function.

---
 .../courtesy-car-create.page.container.jsx    | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx b/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
index fb7db2f81..a83f9348b 100644
--- a/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
+++ b/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
@@ -3,17 +3,16 @@ import { Form, notification } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { INSERT_NEW_COURTESY_CAR } from "../../graphql/courtesy-car.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import CourtesyCarFormComponent from "../../components/courtesy-car-form/courtesy-car-form.component";
-
 import { useHistory } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import CourtesyCarFormComponent from "../../components/courtesy-car-form/courtesy-car-form.component";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
+import { INSERT_NEW_COURTESY_CAR } from "../../graphql/courtesy-car.queries";
 import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
-import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -37,12 +36,20 @@ export function CourtesyCarCreateContainer({
       variables: { courtesycar: { ...values, bodyshopid: bodyshop.id } },
     });
 
-    notification["success"]({ message: t("courtesycars.successes.saved") });
-    history.push(
-      `/manage/courtesycars/${result.data.insert_courtesycars.returning[0].id}`
-    );
-
-    console.log("error");
+    if (!!result.errors) {
+      notification["error"]({
+        message: t("courtesycars.errors.saving", {
+          message: JSON.stringify(result.errors),
+        }),
+      });
+    } else {
+      form.resetFields();
+      form.resetFields();
+      notification["success"]({ message: t("courtesycars.successes.saved") });
+      history.push(
+        `/manage/courtesycars/${result.data.insert_courtesycars.returning[0].id}`
+      );
+    }
   };
 
   useEffect(() => {