Merge branch 'AUT_main' into feature/MOB-9145-support-isOneOf-and-isN…

…otOneOf-comparator
Iterable · Sep 5, 2024 · 2ff52dd · 2ff52dd
2 parents 8cd05ed + 16baf6c
commit 2ff52dd
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 108 deletions.
diff --git a/react-example/package.json b/react-example/package.json
@@ -20,7 +20,7 @@
   ],
   "scripts": {
     "build": "tsc && webpack",
-    "start": "concurrently \"tsc -w --pretty\" \"webpack-dev-server\" -n 'tsc,webpack' -k \"node server/server.js\"",
+    "start": "concurrently \"tsc -w --pretty\" \"webpack-dev-server\" -n 'tsc,webpack' -k",
     "test": "jest --config jest.config.js",
     "format": "prettier --write \"src/**/*.{ts,tsx}\" \"src/**/*.js\"",
     "typecheck": "tsc --noEmit true --emitDeclarationOnly false",
@@ -70,8 +70,6 @@
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.2.1",
     "styled-components": "^5.3.3",
-    "uuid": "^9.0.0",
-    "cors": "^2.8.5",
-    "express": "^4.19.2"
+    "uuid": "^9.0.0"
   }
 }
diff --git a/react-example/server/generate.py b/react-example/server/generate.py
diff --git a/react-example/server/server.js b/react-example/server/server.js
diff --git a/react-example/src/index.tsx b/react-example/src/index.tsx
@@ -52,7 +52,7 @@ const HomeLink = styled(Link)`
     generateJWT: ({ email, userID }) =>
       axios
         .post(
-          process.env.JWT_GENERATOR || 'http://localhost:3000/generate',
+          process.env.JWT_GENERATOR || 'http://localhost:5000/generate',
           {
             exp_minutes: 2,
             email,

diff --git a/react-example/yarn.lock b/react-example/yarn.lock
@@ -2102,14 +2102,6 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cors@^2.8.5:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
-  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
-  dependencies:
-    object-assign "^4"
-    vary "^1"
-
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -2838,7 +2830,7 @@ expect@^27.5.1:
     jest-matcher-utils "^27.5.1"
     jest-message-util "^27.5.1"
 
-express@^4.17.3, express@^4.19.2:
+express@^4.17.3:
   version "4.19.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
   integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
@@ -4597,7 +4589,7 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.10.tgz#0b77a68e21a0b483db70b11fad055906e867cda8"
   integrity sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==
 
-object-assign@^4, object-assign@^4.1.1:
+object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
@@ -6076,7 +6068,7 @@ v8-to-istanbul@^8.1.0:
     convert-source-map "^1.6.0"
     source-map "^0.7.3"
 
-vary@^1, vary@~1.1.2:
+vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==

diff --git a/src/anonymousUserTracking/criteriaCompletionChecker.ts b/src/anonymousUserTracking/criteriaCompletionChecker.ts
@@ -478,13 +478,13 @@ class CriteriaCompletionChecker {
         this.compareValueEquality(source, stringValue)
       );
     }
-
+      
     if (Array.isArray(stringValue)) {
       return stringValue.some((value) =>
         this.compareValueEquality(sourceTo, value)
       );
     }
-
+      
     if (
       (typeof sourceTo === 'number' || typeof sourceTo === 'boolean') &&
       stringValue !== ''

diff --git a/src/anonymousUserTracking/tests/compareArrayDataTypes.test.ts b/src/anonymousUserTracking/tests/compareArrayDataTypes.test.ts
@@ -66,6 +66,7 @@ describe('compareArrayDataTypes', () => {
     expect(result).toEqual('285');
   });
 
+
   it('should return criteriaId null (compare array Equal - No match)', () => {
     (localStorage.getItem as jest.Mock).mockImplementation((key) => {
       if (key === SHARED_PREFS_EVENT_LIST_KEY) {