Merge pull request #3342 from LiteFarmOrg/LF-4339/product-create-form…

…-fix LF-4339: Create product form validation
LiteFarmOrg · Aug 12, 2024 · 95a315c · 95a315c
2 parents f7de2ab + 9301b15
commit 95a315c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/packages/webapp/src/components/Form/ReactSelect/CreatableSelect.tsx b/packages/webapp/src/components/Form/ReactSelect/CreatableSelect.tsx
@@ -58,6 +58,10 @@ const CreatableSelect = React.forwardRef((props, ref) => {
     ...restProps
   } = props;
 
+  const isValidNewOption = (inputValue: string) => {
+    return inputValue.trim().length > 0;
+  };
+
   return (
     <div data-cy="react-select" className={scss.container} style={style}>
       {(label || toolTipContent || icon) && (
@@ -75,6 +79,7 @@ const CreatableSelect = React.forwardRef((props, ref) => {
         isClearable
         placeholder={placeholder}
         formatCreateLabel={(userInput) => `${createPromptText} "${userInput}"`}
+        isValidNewOption={isValidNewOption}
         styles={{
           ...(baseStyles as any),
           ...styles,

diff --git a/packages/webapp/src/components/Task/AddSoilAmendmentProducts/ProductCard/ProductDetails.tsx b/packages/webapp/src/components/Task/AddSoilAmendmentProducts/ProductCard/ProductDetails.tsx
@@ -366,6 +366,12 @@ const ProductDetails = ({
             hookFormRegister={register(SUPPLIER, {
               required: interested,
               maxLength: hookFormMaxCharsValidation(255),
+              validate: (value) => {
+                if (interested && value?.trim().length === 0) {
+                  return t('COMMON_ERRORS.UNIT.REQUIRED');
+                }
+                return true;
+              },
             })}
             disabled={isDetailDisabled}
             hasLeaf={true}