thm-p3-configurator 0.0.110 → 0.0.112

package/dist/src/shared/__containers__/internal/InternalAppointmentForm.js

@@ -127,8 +127,16 @@ const internalAppointmentFormSchema = (0, _yup.object)({
   ownershipType: (0, _yup.string)().required(_constants__.FORM_ERROR_MESSAGES.required),
   leaseNumber: (0, _yup.string)().nullable(),
   firstName: (0, _yup.string)().nullable(),
-  channelType: (0, _yup.string)().required(_constants__.FORM_ERROR_MESSAGES.required),
-  channelId: (0, _yup.string)().required(_constants__.FORM_ERROR_MESSAGES.required),
+  channelType: (0, _yup.string)().when('$existingDossierId', {
+    is: existingDossierId => !!existingDossierId,
+    then: schema => schema.nullable(),
+    otherwise: schema => schema.required(_constants__.FORM_ERROR_MESSAGES.required)
+  }),
+  channelId: (0, _yup.string)().when('$existingDossierId', {
+    is: existingDossierId => !!existingDossierId,
+    then: schema => schema.nullable(),
+    otherwise: schema => schema.required(_constants__.FORM_ERROR_MESSAGES.required)
+  }),
   infix: (0, _yup.string)().nullable(),
   lastName: (0, _yup.string)().required(_constants__.FORM_ERROR_MESSAGES.required),
   email: (0, _yup.string)().email(_constants__.FORM_ERROR_MESSAGES.email).required(_constants__.FORM_ERROR_MESSAGES.required),
@@ -220,18 +228,20 @@ const InternalAppointmentForm = _ref => {
 
     // Otherwise, default to Nederland
     const defaultCountry = countryOptions.find(option => option.label === 'NEDERLAND');
-
-    // If found, automatically set this as the customer's country
-    if (defaultCountry) {
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
-        payload: {
-          countryId: defaultCountry.value
-        }
-      });
-      return defaultCountry;
+    return defaultCountry || null;
+  }, [customer === null || customer === void 0 ? void 0 : customer.countryId, countryOptions]);
+  (0, _react.useEffect)(() => {
+    if (!(customer !== null && customer !== void 0 && customer.countryId) && countryOptions !== null && countryOptions !== void 0 && countryOptions.length) {
+      const defaultCountry = countryOptions.find(option => option.label === 'NEDERLAND');
+      if (defaultCountry) {
+        dispatch({
+          type: _OrderSessionContext.orderSessionActions.SET_CUSTOMER_COUNTRY_ID,
+          payload: {
+            countryId: defaultCountry.value
+          }
+        });
+      }
     }
-    return null;
   }, [customer === null || customer === void 0 ? void 0 : customer.countryId, countryOptions, dispatch]);
   const {
     branchById
@@ -307,7 +317,10 @@ const InternalAppointmentForm = _ref => {
         customerAgreed: productSpecifications !== null && productSpecifications !== void 0 && productSpecifications.length ? customerAgreed : true // Note: this skips validation if no productSpecifications are found
       }), {
         strict: false,
-        abortEarly: false
+        abortEarly: false,
+        context: {
+          existingDossierId: existingDossierId
+        }
       });
       await onSubmit((0, _helpers__.removeNullishProps)({
         vehicle,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thm-p3-configurator",
-  "version": "0.0.110",
+  "version": "0.0.112",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "author": "EnoRm.",