Comp 766 3 All changes except linking fix (#721)

Author: Ckoelewyn

compliance-web/src/components/App/Inspections/Profile/Enforcements/Orders/OrderCreateModal.tsx

@@ -101,6 +101,11 @@ const OrderCreateModal: FC<OrderCreateModalProps> = ({
       const formData = methods.getValues();
       const requirementIds = (data.requirements as InspectionRequirement[]).map((requirement) => requirement.id);
 
+      // Not historical - default to 'create_new'
+      if (!inspectionData.is_history) {
+        formData.orderCreationMethod = "create_new";
+      }
+
       if (!formData.orderCreationMethod) {
         methods.setError("orderCreationMethod", {
           type: "required",
@@ -166,7 +171,7 @@ const OrderCreateModal: FC<OrderCreateModalProps> = ({
         title="Create Order"
         onSubmit={handleBaseSubmit}
         isLoading={isPendingOrder || isPendingLink}
-        additionalFormFields={
+        additionalFormFields={ inspectionData.is_history &&
            <FormProvider {...methods}>
             <OrderCreationOptions
               inspectionData={inspectionData}

compliance-web/src/components/App/Inspections/Profile/Enforcements/Orders/OrderCreationOptions.tsx

@@ -1,4 +1,4 @@
-import { FC, useState, useEffect } from "react";
+import { FC, useState } from "react";
 import {
   Box,
   FormControl,
@@ -29,26 +29,16 @@ const OrderCreationOptions: FC<OrderCreationOptionsProps> = ({
   isHistorical,
 }) => {
   const { setValue, clearErrors, formState: { errors } } = useFormContext();
-  const [creationMethod, setCreationMethod] = useState<OrderCreationMethod>("create_new");
+  const [creationMethod, setCreationMethod] = useState<OrderCreationMethod | ""> ("");
   const { data: openOrders } = useOrdersByCaseFileData(inspectionData.case_file_id, {
     isStaleInfinate: false,
   });
 
-
-
-  useEffect(() => {
-    const defaultMethod = isHistorical ? "manual_entry" : "create_new";
-    setCreationMethod(defaultMethod);
-    setValue("orderCreationMethod", defaultMethod);
-  }, [isHistorical, setValue]);
-
   const handleCreationMethodChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     const method = event.target.value as OrderCreationMethod;
     setCreationMethod(method);
     setValue("orderCreationMethod", method);
     clearErrors("orderCreationMethod");
-    clearErrors("manualOrderNumber");
-    clearErrors("existingOrderId");
 
     if (method !== "manual_entry") {
       setValue("manualOrderNumber", "");
@@ -110,7 +100,7 @@ const OrderCreationOptions: FC<OrderCreationOptionsProps> = ({
           )}
           {/* Manual Order Number Entry */}
           {creationMethod === "manual_entry" && (
-            <Box sx={{ mt: 1.5, ml: 2 }}>
+            <Box sx={{ mt: 0, ml: 2 }}>
               <ControlledTextField
                 name="manualOrderNumber"
                 fullWidth