whereWillPruningsGo rendering fixed

bcgov · Aug 13, 2024 · 69f8d4e · 69f8d4e
1 parent bef9eb0
commit 69f8d4e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/frontend/src/Commons/Forms/InputModules/CalculateNutrients/CalculateNutrientsList.styles.ts b/frontend/src/Commons/Forms/InputModules/CalculateNutrients/CalculateNutrientsList.styles.ts
@@ -150,19 +150,20 @@ const StyledPBalance = styled.div`
   }
 
   @media (min-width: ${screenSizes.desktop}) {
-    gap: 24px;
+    gap: 20px;
     p {
       font: ${tokens.typographyRegularBody};
     }
   }
 `;
 
 const FontAwesomeContainer = styled.div`
-  font-size: 18px;
+  font-size: 16px;
   margin-left: -28px;
 
   @media (min-width: ${screenSizes.desktop}) {
-    margin-left: -40px;
+    font-size: 24px;
+    margin-left: -45px;
   }
 `;
 export {

diff --git a/frontend/src/Commons/Forms/InputModules/Crops/CropsInfo.tsx b/frontend/src/Commons/Forms/InputModules/Crops/CropsInfo.tsx
@@ -109,7 +109,11 @@ const CropsInfoComponent: FC<InputModuleProps> = ({
     distanceBtwnPlants: BlueberrySchemaString('cropId'),
     distanceBtwnRows: BlueberrySchemaString('cropId'),
     willPlantsBePruned: Yup.boolean().required('Required'),
-    whereWillPruningsGo: Yup.string().required('Required'),
+    whereWillPruningsGo: Yup.string().when('willPlantsBePruned', {
+      is: true,
+      then: (schema) => schema.required('Required'),
+      otherwise: (schema) => schema.notRequired(),
+    }),
     willSawdustBeApplied: Yup.boolean().required('Required'),
   });
 
@@ -297,18 +301,22 @@ const CropsInfoComponent: FC<InputModuleProps> = ({
                         mobileWidth="137px"
                         onChange={(e) => {
                           handleChange(e, setFieldValue);
+                          console.log(e.target.name, e.target.value);
                         }}
                       />
-
-                      <CustomSelect
-                        name="whereWillPruningsGo"
-                        id="whereWillPruningsGo"
-                        label="Where will prunings go?"
-                        options={WherePruningsGo}
-                        desktopWidth="226px"
-                        mobileWidth="137px"
-                        onChange={(e) => handleChange(e, setFieldValue)}
-                      />
+                      {((values.willPlantsBePruned &&
+                        values.willPlantsBePruned.toString().includes('true')) ||
+                        values.willPlantsBePruned === undefined) && (
+                        <CustomSelect
+                          name="whereWillPruningsGo"
+                          id="whereWillPruningsGo"
+                          label="Where will prunings go?"
+                          options={WherePruningsGo}
+                          desktopWidth="226px"
+                          mobileWidth="137px"
+                          onChange={(e) => handleChange(e, setFieldValue)}
+                        />
+                      )}
                     </StyledCropsLargeGroup>
                     <StyledCropsLargeGroup>
                       <CustomSelect