rivia 0.0.58 → 0.0.59

package/dist/index.js

@@ -2,7 +2,7 @@
 function slugify(text) {
   return "/" + String(text || "").trim().toLowerCase().replace(/[^a-z0-9\-_\s]/g, "").replace(/\s+/g, "-");
 }
-function Onboarding(topTitle = "Get Started", subtitle, completion = 0, checklistItems = [], cssText = [], targetingData = {}, customCSS = "", user_var2, checklist_id) {
+function Onboarding(topTitle = "Get Started", subtitle, completion = 0, checklistItems = [], cssText = [], targetingData = {}, customCSS = "", user_var, checklist_id) {
   let usrn = targetingData?.targeting_data?.usernames ?? "Not Set";
   let inc = targetingData?.targeting_data?.inclusion ?? "Not Set";
   const mymap = /* @__PURE__ */ new Map();
@@ -77,14 +77,14 @@ function Onboarding(topTitle = "Get Started", subtitle, completion = 0, checklis
     sessionStorage.getItem("onboardingVisited") || "[]"
   );
   if (!Array.isArray(storedVisited2)) storedVisited2 = [];
-  let user_var1 = user_var2;
+  let user_var1 = user_var;
   if (!user_var1) {
     user_var1 = "User_" + Math.random().toString(36).substring(2, 8);
-    sessionStorage.setItem(user_var2, user_var1);
+    sessionStorage.setItem(user_var, user_var1);
   }
-  const backendUrl = `https://demoapi.rivia.ai/clients/${checklist_id}/${user_var1}`;
+  const backendUrl = `http://localhost:5000/clients/${checklist_id}/${user_var1}`;
   async function getUserProgress22() {
-    const backendUrl2 = `https://demoapi.rivia.ai/clients/${checklist_id}/${user_var1}`;
+    const backendUrl2 = `http://localhost:5000/clients/${checklist_id}/${user_var1}`;
     try {
       const res = await fetch(backendUrl2, { credentials: "include" });
       if (!res.ok) console.warn(`GET failed: ${res.status}`);
@@ -122,7 +122,7 @@ function Onboarding(topTitle = "Get Started", subtitle, completion = 0, checklis
   }
   storedVisited2 = sessionStorage.getItem("onboardingVisited");
   async function getUserProgress22() {
-    const backendUrl2 = `https://demoapi.rivia.ai/clients/${checklist_id}/${user_var1}`;
+    const backendUrl2 = `http://localhost:5000/clients/${checklist_id}/${user_var1}`;
     try {
       const res = await fetch(backendUrl2, { credentials: "include" });
       if (!res.ok) console.warn(`GET failed: ${res.status}`);
@@ -173,7 +173,7 @@ function Onboarding(topTitle = "Get Started", subtitle, completion = 0, checklis
         checklistItems,
         cssText,
         targetingData,
-        user_var2,
+        user_var,
         checklist_id,
         cssConfig,
         items,
@@ -233,7 +233,7 @@ function Onboarding(topTitle = "Get Started", subtitle, completion = 0, checklis
       checklistItems,
       cssText,
       targetingData,
-      user_var2,
+      user_var,
       checklist_id,
       cssConfig,
       items,
@@ -246,9 +246,9 @@ function Onboarding(topTitle = "Get Started", subtitle, completion = 0, checklis
     );
   }
 }
-async function fetchWithTimeout(topTitle = "Get Started", subtitle, completion = 0, checklistItems = [], cssText = [], targetingData = {}, user_var2, checklist_id, cssConfig = {}, items = [], storedVisited2 = [], backendUrl = "", progressData = {}, visitedPages = {}, cleanUrlItems = [], custom_css = "") {
-  console.log("inside fetchWithTimeout", user_var2);
-  if (!user_var2)
+async function fetchWithTimeout(topTitle = "Get Started", subtitle, completion = 0, checklistItems = [], cssText = [], targetingData = {}, user_var, checklist_id, cssConfig = {}, items = [], storedVisited2 = [], backendUrl = "", progressData = {}, visitedPages = {}, cleanUrlItems = [], custom_css = "") {
+  console.log("inside fetchWithTimeout", user_var);
+  if (!user_var)
     return;
   let i = 0;
   const stepsHTML = items.map((it) => {
@@ -858,14 +858,14 @@ transform: translateY(-20%);
       updateProgress2(visitedSet.size);
     }
   });
-  let user_var22 = user_var2;
+  let user_var2 = user_var;
   function uploadVisitedPagesInBackground(completed2, touched = false) {
     let activeStepId2 = sessionStorage.getItem("activeStepId") || null;
-    let user_var222 = user_var2;
-    const backendUrl22 = `https://demoapi.rivia.ai/clients/${checklist_id}`;
+    let user_var22 = user_var;
+    const backendUrl22 = `http://localhost:5000/clients/${checklist_id}`;
     try {
       const payload = {
-        name: user_var222,
+        name: user_var22,
         completed_items: completed2,
         touched
       };
@@ -893,12 +893,12 @@ transform: translateY(-20%);
     storedVisited2 = sessionStorage.getItem("onboardingVisited");
     if (!storedVisited2 || storedVisited2 == "[]") {
       async function getUserProgress22() {
-        const backendUrl2 = `https://demoapi.rivia.ai/clients/${checklist_id}/${user_var2}`;
+        const backendUrl2 = `http://localhost:5000/clients/${checklist_id}/${user_var}`;
         try {
           const res = await fetch(backendUrl2, { credentials: "include" });
           if (!res.ok) console.warn(`GET failed: ${res.status}`);
           const data2 = await res.json();
-          let userData = data2[user_var2];
+          let userData = data2[user_var];
           if (Array.isArray(userData)) {
             storedVisited2 = userData;
           } else if (typeof userData === "object" && userData !== null && Array.isArray(userData.completed_items)) {
@@ -1209,9 +1209,78 @@ transform: translateY(-20%);
     if (label.style.display !== "none") positionCloseBtn();
   });
 }
+function evaluateRule(rule, context) {
+  const leftValue = context[rule.name];
+  const operator = rule.operator;
+  const rightValue = rule.values;
+  console.log("leftValue", leftValue);
+  console.log("operator", operator);
+  console.log("rightValue", rightValue);
+  if (leftValue === void 0) return false;
+  switch (operator) {
+    case "in":
+      return Array.isArray(rightValue) && rightValue.includes(leftValue);
+    case "not_in":
+      return Array.isArray(rightValue) && !rightValue.includes(leftValue);
+    case "equals":
+      if (rightValue == "sign_up_at")
+        return new Date(leftValue).getTime() === new Date(rightValue).getTime();
+      else
+        return leftValue === rightValue;
+    case "not_equals":
+      return leftValue != rightValue;
+    case "greater_than":
+      if (rightValue == "sign_up_at")
+        return new Date(leftValue).getTime() > new Date(rightValue).getTime();
+      else
+        return leftValue > rightValue;
+    case "less_than":
+      if (rightValue == "sign_up_at")
+        return new Date(leftValue).getTime() < new Date(rightValue).getTime();
+      else
+        return leftValue < rightValue;
+    case "greater_or_equals":
+      if (rightValue == "sign_up_at")
+        return new Date(leftValue).getTime() >= new Date(rightValue).getTime();
+      else
+        return leftValue >= rightValue;
+    case "less_or_equals":
+      if (rightValue == "sign_up_at")
+        return new Date(leftValue).getTime() <= new Date(rightValue).getTime();
+      else
+        return leftValue <= rightValue;
+    default:
+      return false;
+  }
+}
+function evaluateRules(rules, context) {
+  if (!Array.isArray(rules) || rules.length === 0) return true;
+  let finalResult = evaluateRule(rules[0], context);
+  for (let i = 1; i < rules.length; i++) {
+    console.log(finalResult);
+    const previousRule = rules[i - 1];
+    const currentResult = evaluateRule(rules[i], context);
+    switch (previousRule.next) {
+      case "and":
+        finalResult = finalResult && currentResult;
+        break;
+      case "or":
+        finalResult = finalResult || currentResult;
+        break;
+      default:
+        finalResult = currentResult;
+    }
+  }
+  return finalResult;
+}
 async function Checklist(workspace_id, obj) {
   window.workspace_id = workspace_id;
-  window.user_var = obj.user_var;
+  window.userid = obj.userid;
+  let user_var = obj.userid;
+  window.sign_up_at = obj.sign_up_at;
+  window.role = obj.role;
+  window.email = obj.email;
+  console.log("");
   try {
     let doesRouteMatch2 = function(routes) {
       if (!Array.isArray(routes)) return false;
@@ -1230,10 +1299,19 @@ async function Checklist(workspace_id, obj) {
       });
     }, escapeRegex2 = function(str) {
       return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    }, buildContext2 = function(obj2) {
+      return {
+        userid: obj2.userid,
+        role: obj2.role,
+        sign_up_at: obj2.sign_up_at,
+        email: obj2.email,
+        first_name: obj2.first_name,
+        last_name: obj2.last_name
+      };
     };
-    var doesRouteMatch = doesRouteMatch2, escapeRegex = escapeRegex2;
+    var doesRouteMatch = doesRouteMatch2, escapeRegex = escapeRegex2, buildContext = buildContext2;
     const res = await fetch(
-      `https://demoapi.rivia.ai/checklist_by_workspace2/${workspace_id}`,
+      `http://localhost:5000/checklist_by_workspace2/${workspace_id}`,
       {
         method: "GET",
         headers: { "Content-Type": "application/json" }
@@ -1260,6 +1338,15 @@ async function Checklist(workspace_id, obj) {
       console.log("No checklist applicable for this route");
       return;
     }
+    console.log("userid", obj.userid);
+    console.log("matched ch", matchedChecklist);
+    const rules = matchedChecklist?.targeting_data?.custom_rules || [];
+    console.log("rules", rules);
+    const context = buildContext2(obj);
+    const shouldShow = evaluateRules(rules, context);
+    if (!shouldShow) {
+      return;
+    }
     const {
       checklist_id,
       title = "Untitled Checklist",
@@ -1556,13 +1643,13 @@ var RIVIA_TOUR = function() {
     tip.style.left = left + window.scrollX + "px";
     tip.style.top = top + window.scrollY + "px";
   }
-  function uploadVisitedPagesInBackground(tourId, user_var2, tourIndex) {
+  function uploadVisitedPagesInBackground(tourId, user_var, tourIndex) {
     console.log("Uploading visited pages in background for tour ID:", tourIndex, "and user_var:", user_var1);
-    let user_var22 = user_var1;
+    let user_var2 = user_var1;
     const backendUrl22 = `https://demoapi.rivia.ai/tours_clients/${tourId}`;
     try {
       const payload = {
-        name: user_var22,
+        name: user_var2,
         tourIndex
       };
       fetch(backendUrl22, {
@@ -1580,11 +1667,11 @@ var RIVIA_TOUR = function() {
     } catch (err) {
     }
   }
-  async function loadTips(tourId, user_var2) {
-    if (!user_var2) {
+  async function loadTips(tourId, user_var) {
+    if (!user_var) {
       return;
     }
-    user_var1 = user_var2;
+    user_var1 = user_var;
     STATE.tour_id = tourId;
     if (sessionStorage.getItem("rivia_tour_state"))
       return;
@@ -1608,15 +1695,15 @@ var RIVIA_TOUR = function() {
       const stripTrailing = (p) => p.replace(/\/+$/, "");
       console.log("STATE.url", STATE.url);
       console.log("window.location.pathname", window.location.href);
-      console.log("user_var", user_var2);
-      console.log("data.tour?.user_data?.[user_var],", data.tour?.user_data?.[user_var2]);
-      if (!data.tour?.user_data?.[user_var2]) {
-        uploadVisitedPagesInBackground(tourId, user_var2, 0);
+      console.log("user_var", user_var);
+      console.log("data.tour?.user_data?.[user_var],", data.tour?.user_data?.[user_var]);
+      if (!data.tour?.user_data?.[user_var]) {
+        uploadVisitedPagesInBackground(tourId, user_var, 0);
       } else {
-        STATE.tourIndex = data.tour.user_data[user_var2].tourIndex || 0;
+        STATE.tourIndex = data.tour.user_data[user_var].tourIndex || 0;
         console.log("STATE.tourIndex ", STATE.tourIndex);
       }
-      STATE.is_completed = data.tour.user_data && data.tour.user_data[user_var2] && data.tour.user_data[user_var2].is_completed ? data.tour.user_data[user_var2].is_completed : false;
+      STATE.is_completed = data.tour.user_data && data.tour.user_data[user_var] && data.tour.user_data[user_var].is_completed ? data.tour.user_data[user_var].is_completed : false;
       if (STATE.is_completed) {
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rivia",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",