Skip to content

Commit

Permalink
Merge pull request #975 from rudderlabs/release/v1.55.0
Browse files Browse the repository at this point in the history
chore(release): pull release/v1.55.0 into main
  • Loading branch information
mihir-4116 authored Oct 12, 2023
2 parents 36b4b50 + cfd18bd commit d2605c0
Show file tree
Hide file tree
Showing 11 changed files with 81 additions and 78 deletions.
16 changes: 14 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

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.55.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.54.0...v1.55.0) (2023-10-11)


### Features

* ketch config added for ga4 ([#963](https://github.com/rudderlabs/rudder-config-schema/issues/963)) ([89faa0e](https://github.com/rudderlabs/rudder-config-schema/commit/89faa0e3e411a8b0fde99fa140d1a199cded6c4b))
* record event msl ([#968](https://github.com/rudderlabs/rudder-config-schema/issues/968)) ([7026ada](https://github.com/rudderlabs/rudder-config-schema/commit/7026ada8fad0c9a1909c6208c6f448a0b73a9c7d))
* support page call in snapchat conversion ([#969](https://github.com/rudderlabs/rudder-config-schema/issues/969)) ([b0ea3f3](https://github.com/rudderlabs/rudder-config-schema/commit/b0ea3f31ddbebea63c296609b6ce636938902847))


### Bug Fixes

* remove shopify source specific config for ga4 ([#967](https://github.com/rudderlabs/rudder-config-schema/issues/967)) ([3bd29ea](https://github.com/rudderlabs/rudder-config-schema/commit/3bd29eab9f3fad8f7b6779cbafb086f9824e14db))

## [1.54.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.53.1...v1.54.0) (2023-09-29)


Expand All @@ -12,8 +26,6 @@ All notable changes to this project will be documented in this file. See [standa
* amplitude sdk update ([#796](https://github.com/rudderlabs/rudder-config-schema/issues/796)) ([4e94260](https://github.com/rudderlabs/rudder-config-schema/commit/4e94260f4e071ff0c64dced856f363226b9f624e))
* **mixpanel:** add support of ignoreDnt ([#917](https://github.com/rudderlabs/rudder-config-schema/issues/917)) ([ef678bd](https://github.com/rudderlabs/rudder-config-schema/commit/ef678bdd8eaac5954c59d9fd408dc1914e77c428))
* **ga4:** support of filter PII user properties ([a196fca](https://github.com/rudderlabs/rudder-config-schema/commit/a196fca71a3b0dc37bc11573c90ba6cab8518fcc))
* **ga4:** support of filter PII user properties ([e5c673d](https://github.com/rudderlabs/rudder-config-schema/commit/e5c673d6ef11c8a7493ec7b56ccf8fdff91d6f7c))
* **ga4:** support of filter PII user properties ([2ce312b](https://github.com/rudderlabs/rudder-config-schema/commit/2ce312bf1de50fe86419f5d94f92bd19ed93e970))
* **ga4:** support of sending user_properties as part of init call ([0b2ca93](https://github.com/rudderlabs/rudder-config-schema/commit/0b2ca937f6cad8cd7e3688126f1f82cb1f4c3885))


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.54.0",
"version": "1.55.0",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
12 changes: 3 additions & 9 deletions src/configurations/destinations/ga4/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"extendPageViewParams",
"piiPropertiesToIgnore",
"oneTrustCookieCategories",
"overrideClientAndSessionId"
"overrideClientAndSessionId",
"ketchConsentPurposes"
],
"excludeKeys": [],
"supportedSourceTypes": [
Expand Down Expand Up @@ -72,6 +73,7 @@
"blacklistedEvents",
"eventFilteringOption",
"piiPropertiesToIgnore",
"ketchConsentPurposes",
"oneTrustCookieCategories"
],
"web": [
Expand All @@ -87,14 +89,6 @@
"useNativeSDK",
"connectionMode"
],
"shopify": [
"useNativeSDK",
"connectionMode",
"capturePageView",
"useNativeSDKToSend",
"extendPageViewParams",
"overrideClientAndSessionId"
],
"ios": [
"useNativeSDK",
"connectionMode"
Expand Down
78 changes: 24 additions & 54 deletions src/configurations/destinations/ga4/schema.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{
"configSchema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"required": [
"apiSecret",
"typesOfClient"
],
"required": ["apiSecret", "typesOfClient"],
"type": "object",
"properties": {
"apiSecret": {
Expand All @@ -13,10 +10,7 @@
},
"typesOfClient": {
"type": "string",
"enum": [
"gtag",
"firebase"
],
"enum": ["gtag", "firebase"],
"default": "gtag"
},
"debugMode": {
Expand All @@ -25,11 +19,7 @@
},
"eventFilteringOption": {
"type": "string",
"enum": [
"disable",
"whitelistedEvents",
"blacklistedEvents"
],
"enum": ["disable", "whitelistedEvents", "blacklistedEvents"],
"default": "disable"
},
"piiPropertiesToIgnore": {
Expand Down Expand Up @@ -80,23 +70,24 @@
}
}
},
"ketchConsentPurposes": {
"type": "array",
"items": {
"type": "object",
"properties": {
"purpose": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
}
}
},
"capturePageView": {
"type": "object",
"properties": {
"web": {
"type": "string",
"enum": [
"rs",
"gtag"
],
"default": "rs"
},
"shopify": {
"type": "string",
"enum": [
"rs",
"gtag"
],
"enum": ["rs", "gtag"],
"default": "rs"
}
}
Expand All @@ -114,9 +105,6 @@
"properties": {
"web": {
"type": "boolean"
},
"shopify": {
"type": "boolean"
}
}
},
Expand Down Expand Up @@ -147,25 +135,15 @@
"properties": {
"android": {
"type": "string",
"enum": [
"cloud",
"device"
]
"enum": ["cloud", "device"]
},
"ios": {
"type": "string",
"enum": [
"cloud",
"device"
]
"enum": ["cloud", "device"]
},
"web": {
"type": "string",
"enum": [
"cloud",
"device",
"hybrid"
]
"enum": ["cloud", "device", "hybrid"]
}
}
}
Expand All @@ -178,9 +156,7 @@
"const": "gtag"
}
},
"required": [
"typesOfClient"
]
"required": ["typesOfClient"]
},
"then": {
"properties": {
Expand All @@ -189,9 +165,7 @@
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(G-.{1,100})$|^$"
}
},
"required": [
"measurementId"
]
"required": ["measurementId"]
}
},
{
Expand All @@ -201,9 +175,7 @@
"const": "firebase"
}
},
"required": [
"typesOfClient"
]
"required": ["typesOfClient"]
},
"then": {
"properties": {
Expand All @@ -212,11 +184,9 @@
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$"
}
},
"required": [
"firebaseAppId"
]
"required": ["firebaseAppId"]
}
}
]
}
}
}
28 changes: 27 additions & 1 deletion src/configurations/destinations/ga4/ui-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,40 @@
"note": "Input your OneTrust category names by pressing ‘Enter’ after each entry",
"configKey": "oneTrustCookieCategories",
"tagKey": "oneTrustCookieCategory",
"placeholder": "e.g: Credit card visit",
"placeholder": "e.g: Marketing",
"default": [
{
"oneTrustCookieCategory": ""
}
]
}
]
},
{
"title": "Ketch consent purpose settings",
"note": [
"Enter your Ketch purpose Id if you have them configured. ",
{
"text": "Learn more ",
"link": "https://www.rudderstack.com/docs/sources/event-streams/sdks/consent-manager/ketch/"
},
"about RudderStack and Ketch Consent Manager integration."
],
"fields": [
{
"type": "tagInput",
"label": "Purpose ID",
"note": "Input your Ketch purpose Id by pressing ‘Enter’ after each entry",
"configKey": "ketchConsentPurposes",
"tagKey": "purpose",
"placeholder": "e.g: Marketing",
"default": [
{
"purpose": ""
}
]
}
]
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"shopify"
],
"supportedMessageTypes": [
"record",
"audiencelist"
],
"syncBehaviours": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"cordova",
"shopify"
],
"supportedMessageTypes": ["track"],
"supportedMessageTypes": ["track", "page"],
"destConfig": {
"defaultConfig": [
"apiKey",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"category": "singer-protocol",
"displayName": "Zendesk Support",
"options": {
"image": "rudderstack/source-zendesk-support:v8.1.4-alpha.dd4e92c7d8"
"image": "rudderstack/source-zendesk-support:v8.2.1-alpha.466603a56a"
},
"type": "cloudSource"
}
2 changes: 1 addition & 1 deletion src/configurations/sources/trino/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"mirror"
],
"isSqlModelSupported": true,
"isAudienceSupported": false
"isAudienceSupported": true
},
"type": "warehouse"
}
12 changes: 6 additions & 6 deletions test/data/validation/destinations/ga4.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"connectionMode": {
"web": "device"
},
"piiProperties": [
"piiPropertiesToIgnore": [
{
"piiProperty": ""
}
Expand Down Expand Up @@ -108,7 +108,7 @@
"connectionMode": {
"web": "cloud"
},
"piiProperties": [
"piiPropertiesToIgnore": [
{
"piiProperty": ""
}
Expand Down Expand Up @@ -154,7 +154,7 @@
"connectionMode": {
"web": "device"
},
"piiProperties": [
"piiPropertiesToIgnore": [
{
"piiProperty": ""
}
Expand Down Expand Up @@ -206,7 +206,7 @@
"eventName": ""
}
],
"piiProperties": [
"piiPropertiesToIgnore": [
{
"piiProperty": ""
}
Expand Down Expand Up @@ -247,7 +247,7 @@
"android": "cloud",
"web": "cloud"
},
"piiProperties": [
"piiPropertiesToIgnore": [
{
"piiProperty": ""
}
Expand Down Expand Up @@ -295,7 +295,7 @@
"connectionMode": {
"web": "hybrid"
},
"piiProperties": [
"piiPropertiesToIgnore": [
{
"piiProperty": ""
}
Expand Down

0 comments on commit d2605c0

Please sign in to comment.