Skip to content

Commit

Permalink
Merge pull request #1309 from rudderlabs/hotfix-release/v1.70.0
Browse files Browse the repository at this point in the history
chore(release): pull hotfix-release/v1.70.0 into main
  • Loading branch information
saikumarrs authored Apr 8, 2024
2 parents de0e710 + f682ea1 commit 16078cf
Show file tree
Hide file tree
Showing 15 changed files with 1,755 additions and 15 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.70.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.69.0...v1.70.0) (2024-04-05)


### Features

* extend gcm support for additional destinations ([#1307](https://github.com/rudderlabs/rudder-config-schema/issues/1307)) ([d819a43](https://github.com/rudderlabs/rudder-config-schema/commit/d819a43b2287c33cb30fd26a90da9abb2e6c5ac0))

## [1.69.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.68.1...v1.69.0) (2024-04-02)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-config-schema",
"version": "1.69.0",
"version": "1.70.0",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"whitelistedEvents",
"oneTrustCookieCategories",
"eventFilteringOption",
"eventToConversionIdMap"
"eventToConversionIdMap",
"consentManagement"
],
"excludeKeys": [],
"supportedSourceTypes": ["web"],
Expand All @@ -31,7 +32,7 @@
"eventToConversionIdMap",
"oneTrustCookieCategories"
],
"web": ["useNativeSDK"]
"web": ["useNativeSDK", "consentManagement"]
}
}
}
58 changes: 57 additions & 1 deletion src/configurations/destinations/linkedin_insight_tag/schema.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,59 @@
{
"configSchema": null
"configSchema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"properties": {
"consentManagement": {
"type": "object",
"properties": {
"web": {
"type": "array",
"items": {
"type": "object",
"properties": {
"provider": {
"type": "string",
"enum": ["custom", "ketch", "oneTrust"],
"default": "oneTrust"
},
"consents": {
"type": "array",
"items": {
"type": "object",
"properties": {
"consent": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
}
}
}
},
"allOf": [
{
"if": {
"properties": {
"provider": {
"const": "custom"
}
},
"required": ["provider"]
},
"then": {
"properties": {
"resolutionStrategy": {
"type": "string",
"enum": ["and", "or"]
}
},
"required": ["resolutionStrategy"]
}
}
]
}
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,98 @@
"label": "Category ID",
"required": false
}
]
],
"preRequisites": {
"featureFlags": [
{
"configKey": "AMP_enable-gcm",
"value": false
},
{
"configKey": "AMP_enable-gcm"
}
],
"featureFlagsCondition": "or"
}
},
{
"type": "dynamicCustomForm",
"value": "consentManagement",
"label": "Consent management settings",
"footerNote": "The support for category names is deprecated. We recommend using the category IDs instead of the names as IDs are unique and less likely to change over time, making them a more reliable choice.",
"customFields": [
{
"type": "singleSelect",
"label": "Consent management provider",
"value": "provider",
"options": [
{
"name": "Custom",
"value": "custom"
},
{
"name": "Ketch",
"value": "ketch"
},
{
"name": "OneTrust",
"value": "oneTrust"
}
],
"defaultOption": {
"name": "OneTrust",
"value": "oneTrust"
},
"required": true
},
{
"type": "singleSelect",
"label": "the required consent logic",
"value": "resolutionStrategy",
"options": [
{
"name": "AND",
"value": "and"
},
{
"name": "OR",
"value": "or"
}
],
"required": true,
"variant": "badge",
"preRequisites": {
"fields": [
{
"configKey": "provider",
"value": "custom"
}
]
}
},
{
"type": "dynamicCustomForm",
"value": "consents",
"label": "Enter consent category ID’s",
"customFields": [
{
"type": "textInput",
"placeholder": "Marketing",
"value": "consent",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"required": false
}
]
}
],
"preRequisites": {
"featureFlags": [
{
"configKey": "AMP_enable-gcm",
"value": true
}
]
}
}
]
}
Expand Down
18 changes: 15 additions & 3 deletions src/configurations/destinations/posthog/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"oneTrustCookieCategories",
"enableLocalStoragePersistence",
"eventFilteringOption",
"useV2Group"
"useV2Group",
"consentManagement"
],
"transformAtV1": "processor",
"saveDestinationResponse": true,
Expand Down Expand Up @@ -67,8 +68,19 @@
"disableSessionRecording",
"propertyBlackList",
"xhrHeaders",
"enableLocalStoragePersistence"
]
"enableLocalStoragePersistence",
"consentManagement"
],
"android": ["consentManagement"],
"ios": ["consentManagement"],
"unity": ["consentManagement"],
"amp": ["consentManagement"],
"cloud": ["consentManagement"],
"reactnative": ["consentManagement"],
"flutter": ["consentManagement"],
"cordova": ["consentManagement"],
"shopify": ["consentManagement"],
"warehouse": ["consentManagement"]
},
"secretKeys": ["teamApiKey"]
}
Expand Down
Loading

0 comments on commit 16078cf

Please sign in to comment.