Merge pull request #122 from medyo/develop

change jspath to jsonpath

Author: medyo

package.json

@@ -16,7 +16,7 @@
     "country-emoji": "^1.5.4",
     "dompurify": "^2.2.7",
     "eslint-plugin-react": "^7.28.0",
-    "jspath": "^0.4.0",
+    "jsonpath": "^1.1.1",
     "localforage": "^1.9.0",
     "normalize.css": "^8.0.1",
     "prop-types": "^15.0.0-0",
@@ -74,6 +74,7 @@
   "devDependencies": {
     "@types/chrome": "^0.0.198",
     "@types/jest": "^29.1.2",
+    "@types/jsonpath": "^0.2.0",
     "@types/node": "^18.11.0",
     "@types/react": "^18.0.21",
     "@types/react-dom": "^18.0.6",

src/features/MarketingBanner/components/MarketingBanner.tsx

@@ -1,6 +1,5 @@
 import DOMPurify from 'dompurify'
 import { useMarketingConfigStore } from '../stores/marketingBanner'
-import JSPath from 'jspath'
 import { useUserPreferences } from 'src/stores/preferences'
 import { getAppVersion } from 'src/utils/Os'
 import { isWebOrExtensionVersion, isProduction, getBrowserName } from 'src/utils/Environment'
@@ -14,6 +13,7 @@ import {
 } from 'src/lib/analytics'
 import { diffBetweenTwoDatesInDays } from 'src/utils/DateUtils'
 import { isMobile } from 'react-device-detect'
+import jsonPath from "jsonpath";
 
 export const MarketingBanner = () => {
   const { setCampaignClosed, closedCampaigns } = useMarketingConfigStore()
@@ -41,7 +41,7 @@ export const MarketingBanner = () => {
   }, [userSelectedTags, firstSeenDate, cards])
 
   useEffect(() => {
-    if (marketingConfig) {
+    if (marketingConfig && marketingConfig.version == 1) {
       const availableCampaigns: Campaign[] = getAvailableCampaigns(marketingConfig)
       setAvailableCampaigns(availableCampaigns)
     }
@@ -60,23 +60,30 @@ export const MarketingBanner = () => {
   }
 
   const getAvailableCampaigns = (config: MarketingConfig) => {
+
     const campaignsWithUserAttr = config.campaigns.map((camp) => {
-      return { ...camp, userAtttributes: userAtttributes }
+      return { ...camp, attrs: userAtttributes }
     })
 
     const lastVisibleAdDate = Math.max(...closedCampaigns.map((camp) => camp.date))
     if (lastVisibleAdDate > Date.now() - config.campaigns_interval) {
       return []
     }
 
-    const closedCampaignsSet = new Set(closedCampaigns.map((closedCamp) => closedCamp.id))
-    const availableCampaigns = campaignsWithUserAttr
-      .filter((camp) => camp.enabled && !closedCampaignsSet.has(camp.id))
-      .flatMap((camp) => JSPath.apply(camp.condition, camp))
-      .sort((a, b) => (a.priority || 0) - (b.priority || 0))
-      .reverse()
-
-    return availableCampaigns
+    try {
+      const closedCampaignsSet = new Set(closedCampaigns.map((closedCamp) => closedCamp.id))
+      const availableCampaigns = campaignsWithUserAttr
+        .filter((camp) => camp.enabled && !closedCampaignsSet.has(camp.id))
+        .flatMap((camp) => jsonPath.query([camp], camp.condition) as Campaign[])
+        .sort((a, b) => (a.priority || 0) - (b.priority || 0))
+        .reverse()
+  
+      return availableCampaigns
+    } catch(e) {
+      console.log("getAvailableCampaigns", e)
+      return []
+    }
+    
   }
 
   if (!marketingConfig.enabled) {

src/features/MarketingBanner/types/index.ts

@@ -1,6 +1,7 @@
 export type MarketingConfig = {
   enabled: boolean;
   campaigns_interval: number;
+  version: number;
   campaigns: Campaign[]
 }
 
@@ -15,5 +16,5 @@ export type Campaign = {
 }
 
 type UserAttribute = {
-  [key: string]: string | string[];
+  [key: string]: string | number | string[];
 }

yarn.lock

@@ -2199,6 +2199,11 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
+"@types/jsonpath@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@types/jsonpath/-/jsonpath-0.2.0.tgz#13c62db22a34d9c411364fac79fd374d63445aa1"
+  integrity sha512-v7qlPA0VpKUlEdhghbDqRoKMxFB3h3Ch688TApBJ6v+XLDdvWCGLJIYiPKGZnS6MAOie+IorCfNYVHOPIHSWwQ==
+
 "@types/jspath@^0.4.0":
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@types/jspath/-/jspath-0.4.0.tgz#de372bc15e59e1f6a1639fd918fa1f059b6783fe"
@@ -5348,6 +5353,18 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
+escodegen@^1.8.1:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 escodegen@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
@@ -5671,6 +5688,11 @@ espree@^7.3.0, espree@^7.3.1:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
+esprima@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.2.2.tgz#76a0fd66fcfe154fd292667dc264019750b1657b"
+  integrity sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==
+
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -5690,7 +5712,7 @@ esrecurse@^4.1.0, esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1:
+estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -7965,10 +7987,14 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jspath@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/jspath/-/jspath-0.4.0.tgz#2f5fd1808ff2249a88a3c45e642288a226f85e1d"
-  integrity sha512-2/R8wkot8NCXrppBT/onp+4mcAUAZqtPxsW6aSJU3hrFAVqKqtFYcat2XJZ7inN4RtATUxfv0UQSYOmvJKiIGA==
+jsonpath@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/jsonpath/-/jsonpath-1.1.1.tgz#0ca1ed8fb65bb3309248cc9d5466d12d5b0b9901"
+  integrity sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==
+  dependencies:
+    esprima "1.2.2"
+    static-eval "2.0.2"
+    underscore "1.12.1"
 
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.2:
   version "3.3.3"
@@ -11723,6 +11749,13 @@ stackframe@^1.3.4:
   resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
   integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
 
+static-eval@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
+  integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==
+  dependencies:
+    escodegen "^1.8.1"
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -12449,6 +12482,11 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+underscore@1.12.1:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e"
+  integrity sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"