@infosoftas/s4-orders-js-sdk 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@infosoftas/s4-orders-js-sdk",
-    "version": "0.1.4",
+    "version": "0.1.6",
     "scripts": {
         "build": "rimraf lib && webpack --mode production",
         "release": "release-it"

package/src/components/FormFields/AddressField.tsx

@@ -2,6 +2,7 @@ import { FC } from 'react';
 import { useFormContext } from 'react-hook-form';
 
 import { uuidv4 } from '../../utils/helper';
+import { REQUIRED_VALIDATION_REGEXP } from '../../constants/index';
 
 type Props = {
     name: string;
@@ -37,6 +38,7 @@ const AddressField: FC<Props> = ({
                 {...register(name, {
                     required: required ? errorReqMsg : false,
                 })}
+                {...(required ? { pattern: REQUIRED_VALIDATION_REGEXP } : '')}
             />
             <label className="label-control" htmlFor={id}>
                 {label} {required && <span className="text-error">*</span>}

package/src/components/FormFields/InputField.tsx

@@ -2,6 +2,7 @@ import { FC } from 'react';
 import { useFormContext } from 'react-hook-form';
 
 import { uuidv4 } from '../../utils/helper';
+import { REQUIRED_VALIDATION_REGEXP } from '../../constants/index';
 
 type Props = {
     name: string;
@@ -37,6 +38,7 @@ const NameField: FC<Props> = ({
                 {...register(name, {
                     required: required ? errorReqMsg : false,
                 })}
+                {...(required ? { pattern: REQUIRED_VALIDATION_REGEXP } : '')}
             />
             <label className="label-control" htmlFor={id}>
                 {label} {required && <span className="text-error">*</span>}

package/src/components/FormFields/NameField.tsx

@@ -2,6 +2,7 @@ import { FC } from 'react';
 import { useFormContext } from 'react-hook-form';
 
 import { uuidv4 } from '../../utils/helper';
+import { REQUIRED_VALIDATION_REGEXP } from '../../constants/index';
 
 type Props = {
     name: string;
@@ -37,6 +38,7 @@ const NameField: FC<Props> = ({
                 {...register(name, {
                     required: required ? errorReqMsg : false,
                 })}
+                {...(required ? { pattern: REQUIRED_VALIDATION_REGEXP } : '')}
             />
             <label className="label-control" htmlFor={id}>
                 {label} {required && <span className="text-error">*</span>}

package/src/constants/index.ts

@@ -4,6 +4,8 @@ export const BASE_API = '/';
 
 export const WRONG_MSG = 'Something went wrong!';
 
+export const REQUIRED_VALIDATION_REGEXP = '.*\\S.*';
+
 export const PAYMENT_METHOD_DEFAULT: PaymentMethodEnum =
     PaymentMethodEnum.Vipps;
 

package/src/hooks/useOrderForm.tsx

@@ -99,12 +99,14 @@ const useOrderForm = ({
             // TODO: "recievesInvoice" should be deleted in the future
             const receivesInvoice = invoiceResponse?.receivesInvoice || invoiceResponse?.recievesInvoice;
 
-            userActionCallback?.(UserActionEnum.SEARCH_ORGANIZATION_NUMBER, {
-                organizationNumber: data.organizationNumber,
-                cvr: data.cvr,
-                gln: data.gln,
-                found: !!receivesInvoice
-            });
+            if (invoiceResponse) {
+                userActionCallback?.(UserActionEnum.SEARCH_ORGANIZATION_NUMBER, {
+                    organizationNumber: data.organizationNumber,
+                    cvr: data.cvr,
+                    gln: data.gln,
+                    found: !!receivesInvoice
+                });
+            }
 
             if (invoiceResponse && !receivesInvoice) {
                 setLoading(false);