Merge pull request #470 from rudderlabs/hotfix-release/1.17.0

chore(release): pull hotfix-release/1.17.0 into main
rudderlabs · Mar 23, 2023 · 7b04ed3 · 7b04ed3
2 parents 901cc3a + 0892209
commit 7b04ed3
Show file tree

Hide file tree

Showing 411 changed files with 5,354 additions and 7,909 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 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.17.0](https://github.com/rudderlabs/rudder-config-schema/compare/1.16.0...1.17.0) (2023-03-23)
+
+
+### Features
+
+* moved oneTrustCookieCategories field to defaultConfig ([#456](https://github.com/rudderlabs/rudder-config-schema/issues/456)) ([eccf357](https://github.com/rudderlabs/rudder-config-schema/commit/eccf35751916879255dd25848a34912b13298135))
+
 ## [1.16.0](https://github.com/rudderlabs/rudder-config-schema/compare/1.15.1...1.16.0) (2023-03-21)
 
 

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.16.0",
+  "version": "1.17.0",
   "description": "",
   "main": "src/index.ts",
   "private": true,

diff --git a/src/configurations/destinations/active_campaign/db-config.json b/src/configurations/destinations/active_campaign/db-config.json
@@ -6,7 +6,7 @@
     "transformAtV1": "router",
     "saveDestinationResponse": true,
     "isAudienceSupported": true,
-    "includeKeys": [],
+    "includeKeys": ["oneTrustCookieCategories"],
     "excludeKeys": [],
     "supportedSourceTypes": [
       "android",
@@ -22,7 +22,7 @@
     ],
     "supportedMessageTypes": ["identify", "page", "screen", "track"],
     "destConfig": {
-      "defaultConfig": ["apiUrl", "apiKey", "eventKey", "actid"]
+      "defaultConfig": ["apiUrl", "apiKey", "eventKey", "actid", "oneTrustCookieCategories"]
     },
     "secretKeys": ["apiKey", "eventKey", "actid"]
   }

diff --git a/src/configurations/destinations/active_campaign/schema.json b/src/configurations/destinations/active_campaign/schema.json
@@ -8,17 +8,26 @@
         "type": "string",
         "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$"
       },
-      "apiKey": {
-        "type": "string",
-        "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*"
-      },
+      "apiKey": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" },
       "actid": {
         "type": "string",
         "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
       },
       "eventKey": {
         "type": "string",
         "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+      },
+      "oneTrustCookieCategories": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "oneTrustCookieCategory": {
+              "type": "string",
+              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+            }
+          }
+        }
       }
     }
   }

diff --git a/src/configurations/destinations/active_campaign/ui-config.json b/src/configurations/destinations/active_campaign/ui-config.json
@@ -46,6 +46,25 @@
           "footerNote": "Your ActId"
         }
       ]
+    },
+    {
+      "title": "Consent Settings",
+      "fields": [
+        {
+          "type": "dynamicCustomForm",
+          "value": "oneTrustCookieCategories",
+          "label": "OneTrust Cookie Categories",
+          "customFields": [
+            {
+              "type": "textInput",
+              "placeholder": "Marketing",
+              "value": "oneTrustCookieCategory",
+              "label": "Category Name/ID",
+              "required": false
+            }
+          ]
+        }
+      ]
     }
   ]
 }
diff --git a/src/configurations/destinations/adj/db-config.json b/src/configurations/destinations/adj/db-config.json
@@ -35,10 +35,11 @@
         "blacklistedEvents",
         "whitelistedEvents",
         "eventFilteringOption",
-        "partnerParamsKeys"
+        "partnerParamsKeys",
+        "oneTrustCookieCategories"
       ],
-      "android": ["useNativeSDK", "oneTrustCookieCategories"],
-      "ios": ["useNativeSDK", "oneTrustCookieCategories"],
+      "android": ["useNativeSDK"],
+      "ios": ["useNativeSDK"],
       "flutter": ["useNativeSDK"],
       "unity": ["useNativeSDK"]
     },

diff --git a/src/configurations/destinations/adobe_analytics/db-config.json b/src/configurations/destinations/adobe_analytics/db-config.json
@@ -59,8 +59,6 @@
         "reportSuiteIds",
         "sslHeartbeat",
         "heartbeatTrackingServerUrl",
-        "useUtf8Charset",
-        "useSecureServerSide",
         "eventsToTypes",
         "marketingCloudOrgId",
         "dropVisitorId",
@@ -73,10 +71,7 @@
         "trackPageName",
         "contextDataMapping",
         "contextDataPrefix",
-        "useLegacyLinkName",
-        "pageNameFallbackTostring",
         "mobileEventMapping",
-        "sendFalseValues",
         "eVarMapping",
         "hierMapping",
         "listMapping",

diff --git a/src/configurations/destinations/adobe_analytics/schema.json b/src/configurations/destinations/adobe_analytics/schema.json
@@ -23,13 +23,6 @@
         "type": "string",
         "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$"
       },
-      "useUtf8Charset": {
-        "type": "boolean"
-      },
-
-      "useSecureServerSide": {
-        "type": "boolean"
-      },
 
       "proxyNormalUrl": {
         "type": "string",
@@ -115,12 +108,6 @@
         "type": "string",
         "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
       },
-      "useLegacyLinkName": {
-        "type": "boolean"
-      },
-      "pageNameFallbackTostring": {
-        "type": "boolean"
-      },
       "mobileEventMapping": {
         "type": "array",
         "items": {
@@ -137,9 +124,6 @@
           }
         }
       },
-      "sendFalseValues": {
-        "type": "boolean"
-      },
       "eVarMapping": {
         "type": "array",
         "items": {

diff --git a/src/configurations/destinations/adobe_analytics/ui-config.json b/src/configurations/destinations/adobe_analytics/ui-config.json
@@ -8,21 +8,23 @@
           "label": "Tracking Server URL",
           "value": "trackingServerUrl",
           "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$",
-          "regexErrorMessage": "Please put a valid url"
+          "regexErrorMessage": "Please put a valid url",
+          "footerNote": "This is the URL of your Adobe Analytics server."
         },
         {
           "type": "textInput",
           "label": "Tracking Server Secure URL",
           "value": "trackingServerSecureUrl",
           "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$",
-          "regexErrorMessage": "Please put a valid url"
+          "regexErrorMessage": "Please put a valid url",
+          "footerNote": "This is the secure HTTPS URL of your Adobe Analytics server. While sending data via cloud mode, this field is mandatory."
         },
         {
           "type": "textInput",
           "label": "Report Suite ID(s)",
           "value": "reportSuiteIds",
           "required": true,
-          "footerNote": "You can add multiple report suite ids by separated by commas."
+          "footerNote": "Report Suite ID can be found in the Adobe Analytics Settings page. You can add multiple report suite ids by separated by commas."
         },
         {
           "type": "checkbox",
@@ -35,33 +37,24 @@
           "label": "Heartbeat Tracking Server URL",
           "value": "heartbeatTrackingServerUrl",
           "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$",
-          "regexErrorMessage": "Please put a valid url"
-        },
-        {
-          "type": "checkbox",
-          "label": "Use UTF-8 charset",
-          "value": "useUtf8Charset",
-          "default": true
-        },
-        {
-          "type": "checkbox",
-          "label": "Use Secure URL for Server-side",
-          "value": "useSecureServerSide",
-          "default": true
+          "regexErrorMessage": "Please put a valid url",
+          "footerNote": "This is the URL of your Adobe Heartbeat server. Please reach out to Adobe for this URL."
         },
         {
           "type": "textInput",
-          "label": "Adobe Analytics Javascript SDK URL",
+          "label": "Adobe Analytics Javascript SDK Proxy URL",
           "value": "proxyNormalUrl",
           "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$",
-          "regexErrorMessage": "Please put a valid url"
+          "regexErrorMessage": "Please put a valid url",
+          "footerNote": "Enter your proxy url for hosting adobe analytics JS SDK. By default it is https://cdn.rudderlabs.com/adobe-analytics-js/adobe-analytics-js.js"
         },
         {
           "type": "textInput",
-          "label": "Adobe Analytics Hearbeat SDK URL",
+          "label": "Adobe Analytics Hearbeat SDK Proxy URL",
           "value": "proxyHeartbeatUrl",
           "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$",
-          "regexErrorMessage": "Please put a valid url"
+          "regexErrorMessage": "Please put a valid url",
+          "footerNote": "Enter your proxy url for hosting adobe analytics Heartbeat SDK. By default it is https://cdn.rudderlabs.com/adobe-analytics-js/adobe-analytics-js-heartbeat.js"
         }
       ]
     },
@@ -165,13 +158,15 @@
         {
           "type": "textInput",
           "label": "Marketing Cloud Organization Id",
-          "value": "marketingCloudOrgId"
+          "value": "marketingCloudOrgId",
+          "footerNote": "Enter the Marketing Cloud Organization ID to use visitorAPI.js. It can be located on the Marketing Cloud administration page."
         },
         {
           "type": "checkbox",
           "label": "Drop Visitor Id",
           "value": "dropVisitorId",
-          "default": true
+          "default": true,
+          "footerNote": "When enabled, this will not assign userId to Visitor ID."
         }
       ]
     },
@@ -183,6 +178,7 @@
           "label": "Timestamp Option",
           "value": "timestampOption",
           "required": false,
+          "footerNote": "RudderStack sets visitorID depending on this value if the Drop Visitor ID setting is disabled.",
           "options": [
             {
               "name": "Timestamp Hybrid",
@@ -210,18 +206,21 @@
           "type": "checkbox",
           "label": "Send Both Timestamp and VisitorID for Timestamp Optional Reporting Suites",
           "value": "timestampOptionalReporting",
+          "footerNote": "Enable this to allow both timestamp and visitorId to be sent in the payload.",
           "default": false
         },
         {
           "type": "checkbox",
           "label": "No Fallbacks for Visitor ID",
           "value": "noFallbackVisitorId",
+          "footerNote": "Applicable for Cloud mode only, if this option is disabled, fallback visitor ID is set from the external Id.",
           "default": false
         },
         {
           "type": "checkbox",
           "label": "Prefer Visitor Id",
           "value": "preferVisitorId",
+          "footerNote": "If enabled, RudderStack sets the visitorID field. If disabled, RudderStack sets the timestamp value. This is applicable when timestamp option is set as hybrid.",
           "default": false
         }
       ]
@@ -246,6 +245,7 @@
           "type": "checkbox",
           "label": "Enable pageName for Track Events",
           "value": "trackPageName",
+          "footerNote": "Enable this toggle to send a pageName everytime with the track call.",
           "default": true
         },
         {
@@ -268,18 +268,6 @@
           "label": "Prefix to add before all contextData property.",
           "required": false
         },
-        {
-          "type": "checkbox",
-          "label": "Use Legacy LinkName",
-          "value": "useLegacyLinkName",
-          "default": true
-        },
-        {
-          "type": "checkbox",
-          "label": "Page Name Fallback to Screen",
-          "value": "pageNameFallbackTostring",
-          "default": true
-        },
         {
           "type": "dynamicForm",
           "label": "Map Rudder Mobile events",
@@ -293,12 +281,6 @@
           "labelRight": "Adobe Context Data property name",
           "footerNote": "Add properties under context key in rudder payload"
         },
-        {
-          "type": "checkbox",
-          "label": "Send false value from properties ",
-          "value": "sendFalseValues",
-          "default": true
-        },
         {
           "type": "dynamicForm",
           "label": "Map Rudder Properties to Adobe eVars",
@@ -450,7 +432,7 @@
               "type": "textInput",
               "placeholder": "e.g. currency",
               "value": "eventMerchProperties",
-              "label": "Currency/Incremental properties to add to merchandise events at event level",
+              "label": "Incremental properties to add to merchandise events in events string",
               "required": false
             }
           ]
@@ -480,7 +462,7 @@
               "type": "textInput",
               "placeholder": "e.g. currency",
               "value": "productMerchProperties",
-              "label": "Currency/Incremental properties to add to merchandise events at product level",
+              "label": "Incremental properties to add to merchandise events in products string",
               "required": false
             }
           ]
@@ -489,6 +471,7 @@
           "type": "dynamicForm",
           "label": "Map Rudder Properties to eVars at product level",
           "value": "productMerchEvarsMap",
+          "footerNote": "Use this to populate the products string with the mapped eVars.",
           "required": false,
           "keyLeft": "from",
           "keyRight": "to",

diff --git a/src/configurations/destinations/adroll/db-config.json b/src/configurations/destinations/adroll/db-config.json
@@ -24,13 +24,12 @@
         "eventsMap",
         "blacklistedEvents",
         "whitelistedEvents",
-        "eventFilteringOption"
+        "eventFilteringOption",
+        "oneTrustCookieCategories"
       ],
-      "web": ["useNativeSDK", "oneTrustCookieCategories"]
+      "web": ["useNativeSDK"]
     },
     "secretKeys": []
   },
-  "options": {
-    "isBeta": true
-  }
+  "options": { "isBeta": true }
 }