@heycater/qualification-funnel 1.17.0 → 1.19.0

package/dist/index.esm.js

@@ -4272,6 +4272,11 @@ const useIsGb = () => {
   return getIsGb(query);
 };
 const getIsGb = (query) => {
+  if (typeof window !== "undefined") {
+    if (window.location.pathname.toLowerCase().includes("london")) {
+      return true;
+    }
+  }
   if (query == null ? void 0 : query.slug) {
     return query.slug === "catering-london";
   }
@@ -4984,6 +4989,7 @@ const CITY_VALUES = [
   "duesseldorf",
   "koeln",
   "stuttgart",
+  "london",
   "other"
 ];
 const CITY_QUESTION_ITEMS = [
@@ -5029,6 +5035,22 @@ const CITY_QUESTION_ITEMS = [
     value: "stuttgart",
     imageComponent: Stuttgart
   },
+  {
+    labelEn: "London",
+    labelDe: "London",
+    value: "london",
+    imageComponent: () => /* @__PURE__ */ jsx(
+      Box,
+      {
+        height: "80px",
+        width: "80px",
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        children: /* @__PURE__ */ jsx(Other, { width: "24px" })
+      }
+    )
+  },
   {
     value: "other",
     labelEn: "Other City",
@@ -5050,13 +5072,23 @@ const cityQuestion = Object.freeze(
   createSelectorQuestion({
     id: "city",
     getValidator: ({ selectedCaterer }) => {
-      const supportedCityValues = getSupportedCityValues(selectedCaterer);
+      const isGb = getIsGb();
+      if (isGb) {
+        return yup.mixed().oneOf(["london"]).required();
+      }
+      const supportedCityValues = getSupportedCityValues(selectedCaterer).filter(
+        (city) => city !== "london"
+      );
       return yup.mixed().oneOf(supportedCityValues).required();
     },
     getItems: ({ selectedCaterer }) => {
+      const isGb = getIsGb();
+      if (isGb) {
+        return CITY_QUESTION_ITEMS.filter(({ value }) => value === "london");
+      }
       const supportedCityValues = getSupportedCityValues(selectedCaterer);
       return CITY_QUESTION_ITEMS.filter(
-        ({ value }) => supportedCityValues.includes(value)
+        ({ value }) => supportedCityValues.includes(value) && value !== "london"
       );
     }
   })
@@ -10096,7 +10128,7 @@ function trackAnswerSelected(context, answer) {
   if (context.city) {
     properties.city = context.city;
   }
-  captureEvent("qf_v13_answer_selected", properties);
+  captureEvent("qf_v14_answer_selected", properties);
 }
 function trackFormSubmitted(context, metadata) {
   if (!context.session_id) {
@@ -10114,7 +10146,7 @@ function trackFormSubmitted(context, metadata) {
   if (context.city) {
     properties.city = context.city;
   }
-  captureEvent("qf_v13_form_submitted", properties);
+  captureEvent("qf_v14_form_submitted", properties);
 }
 function trackCompleted(context) {
   if (!context.session_id) {
@@ -10131,7 +10163,7 @@ function trackCompleted(context) {
   if (context.city) {
     properties.city = context.city;
   }
-  captureEvent("qf_v13_completed", properties);
+  captureEvent("qf_v14_completed", properties);
 }
 function trackAbandoned(context, lastStep) {
   if (!context.session_id) {
@@ -10150,7 +10182,7 @@ function trackAbandoned(context, lastStep) {
   if (context.city) {
     properties.city = context.city;
   }
-  captureEvent("qf_v13_abandoned", properties);
+  captureEvent("qf_v14_abandoned", properties);
 }
 function trackStarted(context, initialStepId) {
   const properties = {
@@ -10158,7 +10190,7 @@ function trackStarted(context, initialStepId) {
     session_id: context.session_id,
     initial_step: initialStepId
   };
-  captureEvent("qf_v13_started", properties);
+  captureEvent("qf_v14_started", properties);
 }
 function serializeAnswerValue(value) {
   if (value === void 0) return null;
@@ -10197,8 +10229,8 @@ function TrackingProvider({
       return answerOf(questionId);
     };
     const serviceType = funnelContextRef.current.service_type || answerOf("service_type") || "";
-    const sessionKey = `qf_v13_started_${funnelContextRef.current.session_id}_${serviceType}`;
-    const trackedStepsKey = `qf_v13_tracked_steps_${funnelContextRef.current.session_id}_${serviceType}`;
+    const sessionKey = `qf_v14_started_${funnelContextRef.current.session_id}_${serviceType}`;
+    const trackedStepsKey = `qf_v14_tracked_steps_${funnelContextRef.current.session_id}_${serviceType}`;
     let isFirstTracking = false;
     if (typeof sessionStorage !== "undefined") {
       const hasStarted = sessionStorage.getItem(sessionKey);
@@ -10217,24 +10249,36 @@ function TrackingProvider({
         trackedSteps = [];
       }
     }
-    if (isFirstTracking && stepIndex > 0 && isValidServiceType(serviceType)) {
+    if (isFirstTracking && isValidServiceType(serviceType)) {
       const stepOrder = getStepOrderForServiceType(serviceType);
-      for (let i2 = 0; i2 < stepIndex && i2 < stepOrder.length; i2++) {
-        const skippedStepId = stepOrder[i2];
-        if (trackedSteps.includes(skippedStepId)) continue;
-        const skippedSchemaStep = SCHEMA_STEPS[skippedStepId];
-        const skippedQuestions = (skippedSchemaStep == null ? void 0 : skippedSchemaStep.questions) || [];
-        skippedQuestions.forEach((question, qIdx) => {
+      const allSteps = qual.steps || [];
+      for (let i2 = 0; i2 < stepOrder.length; i2++) {
+        const stepId = stepOrder[i2];
+        if (trackedSteps.includes(stepId)) continue;
+        const stepState = allSteps.find((s3) => s3.id === stepId);
+        const isDisabled = (stepState == null ? void 0 : stepState.disabled) === true;
+        const isBeforeCurrentStep = i2 < stepIndex;
+        const isCurrentStep = stepId === step2.id;
+        if (isCurrentStep) continue;
+        const shouldTrack = isBeforeCurrentStep || isDisabled;
+        if (!shouldTrack) continue;
+        const schemaStep2 = SCHEMA_STEPS[stepId];
+        const questions22 = (schemaStep2 == null ? void 0 : schemaStep2.questions) || [];
+        if (isDisabled) {
+          const hasAnswer = questions22.some((q2) => answerOf(q2.id) !== void 0);
+          if (!hasAnswer) continue;
+        }
+        questions22.forEach((question, qIdx) => {
           const value = answerOf(question.id);
           trackAnswerSelected(funnelContextRef.current, {
-            step_id: skippedStepId,
+            step_id: stepId,
             step_index: i2,
             question_id: question.id,
             answer_value: serializeAnswerValue(value),
-            is_last_question: qIdx === skippedQuestions.length - 1
+            is_last_question: qIdx === questions22.length - 1
           });
         });
-        trackedSteps.push(skippedStepId);
+        trackedSteps.push(stepId);
       }
     }
     if (trackedSteps.includes(step2.id)) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycater/qualification-funnel",
-  "version": "1.17.0",
+  "version": "1.19.0",
   "type": "module",
   "description": "Heycater embedded qualification funnel widget",
   "main": "dist/index.cjs.js",