rivia 0.0.76 → 0.0.78

package/dist/index.js

@@ -146,10 +146,37 @@ function Onboarding(topTitle = "Get Started", subtitle, completion = 0, checklis
         end_date: userData?.end_date || userData?.end_data || ""
       };
     } catch (err) {
+      let uploadVisitedPagesInBackground2 = function(completed2, touched = false) {
+        let activeStepId2 = sessionStorage.getItem("activeStepId") || null;
+        let user_var22 = user_var;
+        const backendUrl22 = `https://demoapi.rivia.ai/clients/${checklist_id}`;
+        try {
+          const payload = {
+            name: user_var22,
+            completed_items: completed2,
+            touched
+          };
+          fetch(backendUrl22, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            credentials: "include",
+            body: JSON.stringify(payload),
+            keepalive: true
+          }).then((res) => {
+            if (!res.ok) console.warn(`Upload failed: ${res.status}`);
+          }).catch((err2) => {
+            console.warn("\u26A0\uFE0F Background PUT upload failed:", err2);
+          });
+        } catch (err2) {
+          console.warn("\u274C Error preparing background upload:", err2);
+        }
+      };
+      var uploadVisitedPagesInBackground = uploadVisitedPagesInBackground2;
       console.warn(
         "\u26A0\uFE0F Invalid checklist Id",
         err
       );
+      uploadVisitedPagesInBackground2([], false);
       return {
         completedPages: [],
         progress: 0,
@@ -304,6 +331,14 @@ async function fetchWithTimeout(topTitle = "Get Started", subtitle, completion =
   color: var(--text-color);
 }
 
+.checklist-title {
+  max-width: 500px;
+  margin: auto;
+  position: relative;
+  font-family: var(--font-family);
+  font-size: var(--font-size);
+  color: var(--text-color);
+}
 /* Close button */
 .checklist-close {
   position: absolute;
@@ -357,7 +392,7 @@ async function fetchWithTimeout(topTitle = "Get Started", subtitle, completion =
   padding: 8px;
   border-radius: 6px;
   background: var(--step-bg);
-  margin-bottom: 16px;
+  margin-bottom: 2px;
 }
 
 .start-select {
@@ -921,6 +956,7 @@ transform: translateY(-20%);
             "\u26A0\uFE0F Invalid checklist Id",
             err
           );
+          uploadVisitedPagesInBackground([], false);
           const storedVisited22 = [];
           return {
             completedPages: [],
@@ -3614,7 +3650,7 @@ function injectBanner(banner = {}, opts = {}, userId, bannerId) {
     let uploadVisitedPagesInBackground2 = function(bannerId2) {
       console.log("Uploading visited pages in background for banner ID: and user_var:", userId);
       let user_var2 = userId;
-      const backendUrl22 = `https://demoapi.rivia.ai/banners_clients/${bannerId2}`;
+      const backendUrl22 = `https://staging-demoapi.rivia.ai/banners_clients/${bannerId2}`;
       try {
         const payload = {
           name: user_var2,
@@ -3628,14 +3664,14 @@ function injectBanner(banner = {}, opts = {}, userId, bannerId) {
           keepalive: true
         }).then((res) => {
           if (res.status === 404) {
-            console.warn("Invalid banner id");
+            throw new Error("Invalid banner id");
           }
-          console.warn(`Upload failed: ${res.status}`);
+          throw new Error(`Upload failed: ${res.status}`);
         }).catch((err) => {
-          console.warn("\u26A0\uFE0F Background PUT upload failed:", err);
+          console.error("\u26A0\uFE0F Background PUT upload failed:", err);
         });
       } catch (err) {
-        console.warn("\u274C Error preparing background upload:", err);
+        console.error("\u274C Error preparing background upload:", err);
       }
     };
     var uploadVisitedPagesInBackground = uploadVisitedPagesInBackground2;
@@ -3714,6 +3750,7 @@ function injectBanner(banner = {}, opts = {}, userId, bannerId) {
       textEl.style.color = banner.background?.text_color || banner.text_color || "#fff";
       textWrap.appendChild(textEl);
     }
+    window.container = container;
     const btnArea = document.createElement("div");
     btnArea.style.display = "flex";
     btnArea.style.alignItems = "center";
@@ -3818,33 +3855,202 @@ function injectBanner(banner = {}, opts = {}, userId, bannerId) {
       remove: () => container.remove()
     };
   } catch (err) {
-    console.warn("injectBanner error:", err);
+    console.error("injectBanner error:", err);
   }
 }
-async function Banner(bannerId, userId) {
-  if (!userId)
-    return;
-  try {
-    const response = await fetch(`https://demoapi.rivia.ai/banners2/${bannerId}`);
-    if (!response.ok) {
-      if (response.status === 404) {
-        console.warn("Invalid Banner id");
-      }
-    }
-    const data = await response.json();
-    if (data && data.banner && data.banner.user_data && data.banner.user_data[userId] && data.banner.user_data[userId].is_completed) {
-      return;
+function evaluateRule2(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":
+      return leftValue === rightValue;
+    case "not_equals":
+      return leftValue != rightValue;
+    case "greater_than":
+      if (rule.name == "sign_up_at")
+        return new Date(leftValue).getTime() > new Date(rightValue).getTime();
+      else
+        return leftValue > rightValue;
+    case "less_than":
+      if (rule.name == "sign_up_at")
+        return new Date(leftValue).getTime() < new Date(rightValue).getTime();
+      else
+        return leftValue < rightValue;
+    case "greater_or_equals":
+      if (rule.name == "sign_up_at")
+        return new Date(leftValue).getTime() >= new Date(rightValue).getTime();
+      else
+        return leftValue >= rightValue;
+    case "less_or_equals":
+      if (rule.name == "sign_up_at")
+        return new Date(leftValue).getTime() <= new Date(rightValue).getTime();
+      else
+        return leftValue <= rightValue;
+    case "is_empty":
+      if (leftValue == "")
+        return true;
+      else
+        return false;
+    case "is_not_empty":
+      if (leftValue != "")
+        return true;
+      else
+        return false;
+    default:
+      return false;
+  }
+}
+function evaluateRules2(rules, context) {
+  if (!Array.isArray(rules) || rules.length === 0) return true;
+  let finalResult = evaluateRule2(rules[0], context);
+  for (let i = 1; i < rules.length; i++) {
+    console.log(finalResult);
+    const previousRule = rules[i - 1];
+    const currentResult = evaluateRule2(rules[i], context);
+    switch (previousRule.next) {
+      case "and":
+        finalResult = finalResult && currentResult;
+        break;
+      case "or":
+        finalResult = finalResult || currentResult;
+        break;
+      default:
+        finalResult = currentResult;
     }
-    var bannerFromBackend = null;
-    bannerFromBackend = data.banner;
-    if (!bannerFromBackend.publish)
-      return;
-    injectBanner(bannerFromBackend, {}, userId, bannerId);
-    console.log("Fetched banner:", bannerFromBackend);
-    return bannerFromBackend;
-  } catch (error) {
-    console.warn("Invalid banner id:", error);
   }
+  return finalResult;
+}
+async function Banner(workspace_id, obj) {
+  window.addEventListener("locationchange", async () => {
+    window.workspace_id = workspace_id;
+    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 true;
+        const currentPath2 = window.location.pathname.toLowerCase();
+        console.log("Current Path:", currentPath2);
+        return routes.some((route) => {
+          if (!route) return false;
+          let pattern;
+          const normalizedRoute = route.toLowerCase().replace(/\/$/, "");
+          if (normalizedRoute.includes("[dynamic]")) {
+            const base = normalizedRoute.split("[dynamic]")[0].replace(/\/$/, "");
+            console.log("Base:", base);
+            pattern = new RegExp(`^${escapeRegex2(base)}(/.*)?$`);
+          } else {
+            pattern = new RegExp(`^${escapeRegex2(normalizedRoute)}$`);
+          }
+          return pattern.test(currentPath2);
+        });
+      }, 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, buildContext = buildContext2;
+      const res = await fetch(
+        `https://staging-demoapi.rivia.ai/banner_by_workspace2/${workspace_id}`,
+        {
+          method: "GET",
+          headers: { "Content-Type": "application/json" }
+        }
+      );
+      if (!res.ok) {
+        console.warn("\u274C Failed to fetch banner");
+        return;
+      }
+      const data = await res.json();
+      const banners = data.banner || [];
+      if (!Array.isArray(banners) || banners.length === 0) return;
+      const currentPath = window.location.pathname;
+      const matchedbanner = banners.find((chk) => {
+        const routes = chk?.targeting_data?.routes;
+        if (!chk?.publish)
+          return false;
+        if (!chk?.targeting_data?.display)
+          return !doesRouteMatch2(routes, currentPath);
+        else
+          return doesRouteMatch2(routes, currentPath);
+      });
+      if (!matchedbanner) {
+        if (window.container && window.container.parentNode) {
+          window.container.remove();
+        }
+        console.log("No banner applicable for this route");
+        return;
+      }
+      console.log("userid", obj.userid);
+      console.log("matched ch", matchedbanner);
+      const rules = matchedbanner?.targeting_data?.custom_rules || [];
+      console.log("rules", rules);
+      const context = buildContext2(obj);
+      const shouldShow = evaluateRules2(rules, context);
+      if (!shouldShow) {
+        console.log("Banner rules not satisfied, not showing banner");
+        return;
+      }
+      const {
+        banner_id,
+        title = "Untitled banner",
+        subtitle = "Describe the purpose of this banner...",
+        items = [],
+        completion = 0,
+        branding_data: cssConfig = {},
+        targeting_data: targetingData = {},
+        customCSS = ""
+      } = matchedbanner;
+      console.log("Banner rules satisfied, showing banner", banner_id);
+      const fullData = {
+        banner: matchedbanner,
+        cssConfig,
+        targetingData,
+        customCSS
+      };
+      sessionStorage.removeItem("onboardingVisited");
+      injectBanner(matchedbanner, {}, obj.userid, banner_id);
+      return matchedbanner;
+    } catch (err) {
+      console.warn("banner error:", err.message);
+      throw err;
+    }
+  });
+  (function() {
+    const pushState = history.pushState;
+    const replaceState = history.replaceState;
+    history.pushState = function() {
+      pushState.apply(history, arguments);
+      window.dispatchEvent(new Event("locationchange"));
+    };
+    history.replaceState = function() {
+      replaceState.apply(history, arguments);
+      window.dispatchEvent(new Event("locationchange"));
+    };
+    window.addEventListener("popstate", () => {
+      window.dispatchEvent(new Event("locationchange"));
+    });
+    window.dispatchEvent(new Event("locationchange"));
+  })();
 }
 var banner_default = Banner;
 

package/index.d.ts

@@ -4,7 +4,7 @@ declare function Checklist(
 ): void ;
 declare function Banner(
   banner_id: string,
-  userId: string
+  userId: object
 ): void ;
 
 export function triggerEvent(

package/package.json

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