@mychoice/mychoice-sdk-modules 2.2.28 → 2.2.30

package/dist/cjs/index.js

@@ -135,7 +135,7 @@ const SwitchButtonBox = (props) => {
         }
         return '';
     };
-    const isAnswered = activeId === true || activeId === false;
+    const isAnswered = activeId !== '' && activeId !== undefined && activeId !== null;
     const handleClick = React.useCallback((selectedItem) => () => {
         setActiveId(selectedItem.value);
         if (onChange) {
@@ -218,8 +218,8 @@ const BlockVehLinks = () => {
     const { vehicleState: { items: vehicles } } = mychoiceSdkStore.useStoreFormCarVehicle();
     const { driverState: { items: drivers } } = mychoiceSdkStore.useStoreFormCarDriverBase();
     const { discountState: { vehlinks, occVehlinks, inValidation }, dispatchDiscountState } = mychoiceSdkStore.useStoreFormCarDiscount();
-    // Spec: 2 drivers / 2 vehicles — ask only for Vehicle1; system assigns the other driver as PO on Vehicle2.
-    const isTwoByTwo = drivers.length === 2 && vehicles.length === 2;
+    const equalCounts = drivers.length === vehicles.length;
+    const askedVehicleCount = equalCounts ? vehicles.length - 1 : vehicles.length;
     const assignPrimary = (driverIndex, vehicleIndex) => {
         dispatchDiscountState({
             type: mychoiceSdkStore.StoreFormCarDiscountActionTypes.FormCarDiscountVehlinkSelect,
@@ -227,31 +227,31 @@ const BlockVehLinks = () => {
         });
     };
     React.useEffect(() => {
-        if (!isTwoByTwo)
+        if (!equalCounts || drivers.length <= 1)
             return;
-        const v1 = vehlinks.find((l) => l.vehicleIndex === 0 && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn);
-        if (!v1 || v1.driverIndex < 0)
+        const primaryOf = (vehicleIndex) => vehlinks.find((l) => l.vehicleIndex === vehicleIndex && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn)?.driverIndex ?? -1;
+        const askedDrivers = new Set();
+        for (let vehicleIndex = 0; vehicleIndex < askedVehicleCount; vehicleIndex += 1) {
+            const po = primaryOf(vehicleIndex);
+            if (po < 0)
+                return;
+            askedDrivers.add(po);
+        }
+        if (askedDrivers.size !== askedVehicleCount)
             return;
-        const otherDriverIndex = drivers.findIndex((_, index) => index !== v1.driverIndex);
-        if (otherDriverIndex < 0)
+        const remainingDriver = drivers.findIndex((_, driverIndex) => !askedDrivers.has(driverIndex));
+        if (remainingDriver < 0)
             return;
-        const v2 = vehlinks.find((l) => l.vehicleIndex === 1 && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn);
-        if (v2?.driverIndex === otherDriverIndex)
+        const lastVehicleIndex = vehicles.length - 1;
+        if (primaryOf(lastVehicleIndex) === remainingDriver)
             return;
-        assignPrimary(otherDriverIndex, 1);
-    }, [isTwoByTwo, vehlinks, drivers]);
+        assignPrimary(remainingDriver, lastVehicleIndex);
+    }, [equalCounts, askedVehicleCount, vehlinks, drivers, vehicles]);
     if (drivers.length <= 1) {
         return null;
     }
     const handlePrimaryDriverChange = (vehicleIndex) => ({ value }) => {
-        const driverIndex = Number(value);
-        assignPrimary(driverIndex, vehicleIndex);
-        if (isTwoByTwo && vehicleIndex === 0) {
-            const otherDriverIndex = drivers.findIndex((_, index) => index !== driverIndex);
-            if (otherDriverIndex >= 0) {
-                assignPrimary(otherDriverIndex, 1);
-            }
-        }
+        assignPrimary(value === '' ? -1 : Number(value), vehicleIndex);
     };
     const handleOccDriverChange = (driverIndex) => ({ value }) => {
         dispatchDiscountState({
@@ -269,24 +269,32 @@ const BlockVehLinks = () => {
     const unassignedDrivers = drivers
         .map((driver, index) => ({ driver, index }))
         .filter(({ index }) => !primaryDriverIndices.includes(index));
-    const vehiclesToAsk = isTwoByTwo ? vehicles.slice(0, 1) : vehicles;
+    const vehiclesToAsk = vehicles.slice(0, askedVehicleCount);
+    const primaryQuestionsAnswered = vehiclesToAsk.every((_vehicle, vehicleIndex) => vehlinks.some((l) => l.vehicleIndex === vehicleIndex
+        && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn
+        && l.driverIndex >= 0));
+    const primaryQuestionsAreUnique = new Set(primaryDriverIndices).size >= vehicles.length;
+    const shouldAskOccasional = drivers.length > vehicles.length
+        && vehicles.length > 1
+        && primaryQuestionsAnswered
+        && primaryQuestionsAreUnique;
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(LabelFormBox, { title: "Since there are multiple drivers in this quote, please tell us who drives which vehicle the most. Please provide an answer that most accurately describes your situation." }), vehiclesToAsk.map((vehicle, vehicleIndex) => {
                 const { year, make, model } = vehicle;
                 const selectedPrimary = vehlinks.find((l) => l.vehicleIndex === vehicleIndex && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn);
                 const isPrimaryAnswered = selectedPrimary !== undefined && selectedPrimary.driverIndex >= 0;
-                // Show all drivers so the user can freely reselect / re-order primaries.
+                const previousPrimaryDriverIndices = new Set(vehlinks
+                    .filter((l) => l.vehicleIndex < vehicleIndex
+                    && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn
+                    && l.driverIndex >= 0)
+                    .map((l) => l.driverIndex));
+                const allDriversHavePrimary = drivers.every((_, driverIndex) => vehlinks.some((l) => l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn && l.driverIndex === driverIndex));
+                const canRepeatPrimary = vehicles.length > drivers.length && allDriversHavePrimary;
                 const primaryOptions = drivers
-                    .map((driver, driverIndex) => ({ name: driver.firstName, value: driverIndex }));
-                const isDuplicatePrimary = !isTwoByTwo
-                    && isPrimaryAnswered
-                    && drivers.length >= vehicles.length
-                    && vehlinks.some((l) => l.vehicleIndex !== vehicleIndex
-                        && l.priority === mychoiceSdkComponents.DriverPriorityTypes.Prn
-                        && l.driverIndex === selectedPrimary?.driverIndex);
-                return (jsxRuntime.jsx(SelectFormBox, { title: `Who is the principal driver of the ${year} ${make} ${model}?`, onChange: handlePrimaryDriverChange(vehicleIndex), options: primaryOptions, defaultValue: isPrimaryAnswered ? selectedPrimary.driverIndex : '', name: `vehlink-${vehicleIndex}`, placeholder: "Select from the list", autoSelectIfValueIsOutOfOptions: false, error: (!isPrimaryAnswered && inValidation) || isDuplicatePrimary, errorMessage: isDuplicatePrimary
-                        ? 'This driver is already the primary driver of another vehicle. Each vehicle should have a different primary driver.'
-                        : '' }, `vehlink-${vehicleIndex}`));
-            }), drivers.length > vehicles.length && vehicles.length > 1
+                    .map((driver, driverIndex) => ({ name: driver.firstName, value: driverIndex }))
+                    .filter(({ value }) => canRepeatPrimary
+                    || !previousPrimaryDriverIndices.has(value));
+                return (jsxRuntime.jsx(SelectFormBox, { title: `Who is the principal driver of the ${year} ${make} ${model}?`, onChange: handlePrimaryDriverChange(vehicleIndex), options: primaryOptions, defaultValue: isPrimaryAnswered ? selectedPrimary.driverIndex : '', name: `vehlink-${vehicleIndex}`, placeholder: "Select from the list", autoSelectIfValueIsOutOfOptions: false, error: !isPrimaryAnswered && inValidation }, `vehlink-${vehicleIndex}`));
+            }), shouldAskOccasional
                 && unassignedDrivers.map(({ driver, index: driverIndex }) => {
                     const selectedVehicle = occVehlinks.find((l) => l.driverIndex === driverIndex);
                     const vehicleOptions = vehicles.map((vehicle, vehicleIndex) => ({
@@ -1770,7 +1778,7 @@ you had insurance. If this is correct, please continue with the form.`);
     const firstInsuredMinDate = listedYear && listedMonth
         ? mychoiceSdkComponents.addDaysToDate(`${listedYear}-${listedMonth}-01`, birthDay ? +birthDay + 1 : 1)
         : mychoiceSdkComponents.getMinDate(birthDate, firstLicenceAge);
-    const twentyYearsAgo = mychoiceSdkComponents.getMinDateByYears(mychoiceSdkComponents.getFormattedDate('', 'yyyy-MM-dd'), 20);
+    const twentyYearsAgo = mychoiceSdkComponents.subYearsFromDate('', 20);
     let lastPolicyEndMinDate = twentyYearsAgo;
     if (firstInsuredMinDate && mychoiceSdkComponents.compareDates(firstInsuredMinDate, twentyYearsAgo) > 0) {
         lastPolicyEndMinDate = firstInsuredMinDate;