Merge pull request #1346 from rudderlabs/main

chore(release): pull main into develop post release v1.72.0
rudderlabs · May 8, 2024 · 945ceee · 945ceee
2 parents 346c3e5 + c181d48
commit 945ceee
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.72.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.71.2...v1.72.0) (2024-04-29)
+
+
+### Features
+
+* add autoConfig support in FBPixel via toggle ([#1337](https://github.com/rudderlabs/rudder-config-schema/issues/1337)) ([8acbb91](https://github.com/rudderlabs/rudder-config-schema/commit/8acbb91df784cb6f81264b7fb86cf001533da474))
+* add gcm support for active campaign,adj,adobe,adroll,af ([#1314](https://github.com/rudderlabs/rudder-config-schema/issues/1314)) ([a529b03](https://github.com/rudderlabs/rudder-config-schema/commit/a529b03c759861c6dfd5010619828b08973cc7c6))
+* added custom domain input field during ga4 setup ([e4ec3b5](https://github.com/rudderlabs/rudder-config-schema/commit/e4ec3b5c98beb5b8b2f121565f401e8796b8df1f))
+* supporting add to cart for criteo ([#1324](https://github.com/rudderlabs/rudder-config-schema/issues/1324)) ([1c74915](https://github.com/rudderlabs/rudder-config-schema/commit/1c749153fc4105a1a0da0f17ff7d07e26678c3d6))
+* transaction level custom property support AWIN ([#1342](https://github.com/rudderlabs/rudder-config-schema/issues/1342)) ([2ff1586](https://github.com/rudderlabs/rudder-config-schema/commit/2ff158638e7996983d1a72c85751e12f98322350))
+
+
+### Bug Fixes
+
+* replace schema ref with actual schema ([#1336](https://github.com/rudderlabs/rudder-config-schema/issues/1336)) ([4059fd5](https://github.com/rudderlabs/rudder-config-schema/commit/4059fd5a7ee83c2e09ff63d5deaac4a057c1d9d7))
+
 ### [1.71.2](https://github.com/rudderlabs/rudder-config-schema/compare/v1.71.1...v1.71.2) (2024-04-24)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rudder-config-schema",
-  "version": "1.71.2",
+  "version": "1.72.0",
   "description": "",
   "main": "src/index.ts",
   "private": true,

diff --git a/src/configurations/destinations/adj/schema.json b/src/configurations/destinations/adj/schema.json
@@ -2,6 +2,7 @@
   "configSchema": {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "object",
+    "required": [],
     "properties": {
       "consentManagement": {
         "type": "object",

diff --git a/src/configurations/destinations/awin/db-config.json b/src/configurations/destinations/awin/db-config.json
@@ -4,7 +4,7 @@
   "config": {
     "transformAtV1": "processor",
     "saveDestinationResponse": true,
-    "includeKeys": ["advertiserId", "eventsToTrack", "oneTrustCookieCategories"],
+    "includeKeys": ["advertiserId", "eventsToTrack", "customFieldMap", "oneTrustCookieCategories"],
     "excludeKeys": [],
     "supportedSourceTypes": [
       "android",
@@ -34,7 +34,12 @@
       "warehouse": ["cloud"]
     },
     "destConfig": {
-      "defaultConfig": ["advertiserId", "eventsToTrack", "oneTrustCookieCategories"],
+      "defaultConfig": [
+        "advertiserId",
+        "eventsToTrack",
+        "customFieldMap",
+        "oneTrustCookieCategories"
+      ],
       "android": ["connectionMode"],
       "ios": ["connectionMode"],
       "web": ["connectionMode"],

diff --git a/src/configurations/destinations/awin/schema.json b/src/configurations/destinations/awin/schema.json
@@ -20,6 +20,22 @@
           }
         }
       },
+      "customFieldMap": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "from": {
+              "type": "string",
+              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+            },
+            "to": {
+              "type": "string",
+              "pattern": "^\\s*p\\d+\\s*$"
+            }
+          }
+        }
+      },
       "oneTrustCookieCategories": {
         "type": "array",
         "items": {

diff --git a/src/configurations/destinations/awin/ui-config.json b/src/configurations/destinations/awin/ui-config.json
@@ -35,6 +35,23 @@
         }
       ]
     },
+    {
+      "title": "Transaction Level Custom Field Mapping",
+      "fields": [
+        {
+          "type": "dynamicForm",
+          "label": "Map Rudder payload property to Custom Awin Field",
+          "labelLeft": "Rudder Payload Field",
+          "labelRight": "AWIN Custom Field",
+          "keyLeft": "from",
+          "keyRight": "to",
+          "placeholderLeft": "e.g: customProperty1",
+          "placeholderRight": "p1",
+          "value": "customFieldMap",
+          "footerNote": "Map Rudder Properties to AWIN Custom Fields. Here, properties will be fetched from properties object(message.properties). Remember AWIN properties need to be of pattern p1, p2 etc."
+        }
+      ]
+    },
     {
       "title": "Consent Settings",
       "fields": [

diff --git a/test/data/validation/destinations/awin.json b/test/data/validation/destinations/awin.json
@@ -12,6 +12,12 @@
         {
           "eventName": "prop3"
         }
+      ],
+      "customFieldMap": [
+        {
+          "from": "Industry",
+          "to": "p1"
+        }
       ]
     },
     "result": true
@@ -49,5 +55,29 @@
       ]
     },
     "result": true
+  },
+  {
+    "config": {
+      "advertiserId": "12345",
+      "eventsToTrack": [
+        {
+          "eventName": "abc"
+        },
+        {
+          "eventName": "prop2"
+        },
+        {
+          "eventName": "prop3"
+        }
+      ],
+      "customFieldMap": [
+        {
+          "from": "Industry",
+          "to": "ABC"
+        }
+      ]
+    },
+    "result": false,
+    "err": ["customFieldMap.0.to must match pattern \"^\\s*p\\d+\\s*$\""]
   }
 ]