IO-3584 Duplicate Job with Full Rates

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/eula/eula.component.jsx

@@ -25,6 +25,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
 
   const handleScroll = useCallback(
     (e) => {
+      if (!e.target) return;
       const bottom = e.target.scrollHeight - 100 <= e.target.scrollTop + e.target.clientHeight;
       if (bottom && !hasEverScrolledToBottom) {
         setHasEverScrolledToBottom(true);
@@ -36,7 +37,9 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
   );
 
   useEffect(() => {
-    handleScroll({ target: markdownCardRef.current });
+    if (markdownCardRef.current) {
+      handleScroll({ target: markdownCardRef.current });
+    }
   }, [handleScroll]);
 
   const handleChange = useCallback(() => {

client/src/graphql/jobs.queries.js

@@ -1375,6 +1375,9 @@ export const QUERY_JOB_FOR_DUPE = gql`
       agt_ph2x
       area_of_damage
       cat_no
+      cieca_pfl
+      cieca_pfo
+      cieca_pft
       cieca_stl
       cieca_ttl
       clm_addr1
@@ -1452,6 +1455,7 @@ export const QUERY_JOB_FOR_DUPE = gql`
       labor_rate_desc
       labor_rate_id
       local_tax_rate
+      materials
       other_amount_payable
       owner_owing
       ownerid

client/src/pages/jobs-create/jobs-create.component.jsx

@@ -10,12 +10,14 @@ import JobsCreateOwnerInfoContainer from "../../components/jobs-create-owner-inf
 import JobsCreateVehicleInfoContainer from "../../components/jobs-create-vehicle-info/jobs-create-vehicle-info.container";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
 
-export default function JobsCreateComponent({ form, isSubmitting }) {
+export default function JobsCreateComponent({ form }) {
   const [pageIndex, setPageIndex] = useState(0);
-  const [errorMessage, setErrorMessage] = useState(null);
-  const [state] = useContext(JobCreateContext);
-  const { t } = useTranslation();
 
+  const [errorMessage, setErrorMessage] = useState(null);
+
+  const [state] = useContext(JobCreateContext);
+
+  const { t } = useTranslation();
   const steps = [
     {
       title: t("jobs.labels.create.vehicleinfo"),
@@ -40,9 +42,11 @@ export default function JobsCreateComponent({ form, isSubmitting }) {
 
   const next = () => {
     setPageIndex(pageIndex + 1);
+    console.log("Next");
   };
   const prev = () => {
     setPageIndex(pageIndex - 1);
+    console.log("Previous");
   };
 
   const ProgressButtons = ({ top }) => {
@@ -75,19 +79,17 @@ export default function JobsCreateComponent({ form, isSubmitting }) {
             {pageIndex === steps.length - 1 && (
               <Button
                 type="primary"
-                loading={isSubmitting}
                 onClick={() => {
                   form
                     .validateFields()
                     .then(() => {
-                      form.submit();
+                      // NO OP
                     })
-                    .catch((error) => {
+                    .catch((error) => console.log("error", error));
-                      console.log("error", error);
+                  form.submit();
-                    });
                 }}
               >
-                {t("general.actions.done")}
+                Done
               </Button>
             )}
           </Space>
@@ -144,11 +146,13 @@ export default function JobsCreateComponent({ form, isSubmitting }) {
       ) : (
         <div>
           <ProgressButtons top />
+
           {errorMessage ? (
             <div>
               <AlertComponent title={errorMessage} type="error" />
             </div>
           ) : null}
+
           {steps.map((item, idx) => (
             <div
               key={idx}

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -46,7 +46,6 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
   });
   const [form] = Form.useForm();
   const [state, setState] = contextState;
-  const [isSubmitting, setIsSubmitting] = useState(false);
   const [insertJob] = useMutation(INSERT_NEW_JOB);
   const [loadOwner, remoteOwnerData] = useLazyQuery(QUERY_OWNER_FOR_JOB_CREATION);
 
@@ -84,19 +83,16 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
           newJobId: resp.data.insert_jobs.returning[0].id
         });
         logImEXEvent("manual_job_create_completed", {});
-        setIsSubmitting(false);
       })
       .catch((error) => {
         notification.error({
           title: t("jobs.errors.creating", { error: error })
         });
         setState({ ...state, error: error });
-        setIsSubmitting(false);
       });
   };
 
   const handleFinish = (values) => {
-    setIsSubmitting(true);
     let job = Object.assign(
       {},
       values,
@@ -301,7 +297,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
             })
           }}
         >
-          <JobsCreateComponent form={form} isSubmitting={isSubmitting} />
+          <JobsCreateComponent form={form} />
         </Form>
       </RbacWrapper>
     </JobCreateContext.Provider>

client/src/translations/en_us/common.json

@@ -1295,7 +1295,6 @@
         "delete": "Delete",
         "deleteall": "Delete All",
         "deselectall": "Deselect All",
-        "done": "Done",
         "download": "Download",
         "edit": "Edit",
         "gotoadmin": "Go to Admin Panel",

client/src/translations/es/common.json

@@ -1295,7 +1295,6 @@
         "delete": "Borrar",
         "deleteall": "",
         "deselectall": "",
-        "done": "",
         "download": "",
         "edit": "Editar",
         "gotoadmin": "",

client/src/translations/fr/common.json

@@ -1295,7 +1295,6 @@
         "delete": "Effacer",
         "deleteall": "",
         "deselectall": "",
-        "done": "",
         "download": "",
         "edit": "modifier",
         "gotoadmin": "",