From 09d49774956c4093bb0883b4ed4bc4d1b78ef236 Mon Sep 17 00:00:00 2001 From: Utsab Chowdhury Date: Fri, 10 Jan 2025 11:47:46 +0530 Subject: [PATCH 01/16] chore: update config for klaviyo and ga4 v2 --- src/configurations/destinations/ga4_v2/db-config.json | 6 +++++- src/configurations/destinations/klaviyo/ui-config.json | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/configurations/destinations/ga4_v2/db-config.json b/src/configurations/destinations/ga4_v2/db-config.json index db5859802..d7ada1104 100644 --- a/src/configurations/destinations/ga4_v2/db-config.json +++ b/src/configurations/destinations/ga4_v2/db-config.json @@ -154,6 +154,10 @@ }, "options": { "isBeta": false, - "supportsCustomMappings": true + "supportsCustomMappings": true, + "hidden": { + "featureFlagName": "AMP_ga4_v2", + "featureFlagValue": false + } } } diff --git a/src/configurations/destinations/klaviyo/ui-config.json b/src/configurations/destinations/klaviyo/ui-config.json index c97ac449d..353a75987 100644 --- a/src/configurations/destinations/klaviyo/ui-config.json +++ b/src/configurations/destinations/klaviyo/ui-config.json @@ -38,7 +38,7 @@ "configKey": "apiVersion", "options": [ { - "label": "2023-02-22 (Will be removed by H2'2025)", + "label": "2023-02-22 (Will be removed by Feb 2025)", "value": "v1" }, { @@ -46,7 +46,7 @@ "value": "v2" } ], - "default": "v1", + "default": "v2", "footerNote": "Please Select the API version to use" } ] From 4ba0df7dc0694e6469b6aa9fa6db427b54b5dc90 Mon Sep 17 00:00:00 2001 From: Utsab Chowdhury Date: Tue, 14 Jan 2025 13:08:10 +0530 Subject: [PATCH 02/16] chore: enable ga4 v2 as beta (#1862) --- src/configurations/destinations/ga4_v2/db-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configurations/destinations/ga4_v2/db-config.json b/src/configurations/destinations/ga4_v2/db-config.json index d7ada1104..a63572ae4 100644 --- a/src/configurations/destinations/ga4_v2/db-config.json +++ b/src/configurations/destinations/ga4_v2/db-config.json @@ -153,7 +153,7 @@ "secretKeys": ["apiSecret"] }, "options": { - "isBeta": false, + "isBeta": true, "supportsCustomMappings": true, "hidden": { "featureFlagName": "AMP_ga4_v2", From f5837e98eeb6d538730bab92a73f067d60790f2c Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 14 Jan 2025 07:38:50 +0000 Subject: [PATCH 03/16] chore(release): 1.101.0 --- CHANGELOG.md | 18 ++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec3e4f1b4..100094f32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ 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.101.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.100.0...v1.101.0) (2025-01-14) + + +### Features + +* add config for hash to bingads offline conversions ([#1843](https://github.com/rudderlabs/rudder-config-schema/issues/1843)) ([49356fe](https://github.com/rudderlabs/rudder-config-schema/commit/49356feee94e355e5d1c3f0f83139770eaf12ea4)) +* add tags for sdk source types ([#1841](https://github.com/rudderlabs/rudder-config-schema/issues/1841)) ([1f4e1c5](https://github.com/rudderlabs/rudder-config-schema/commit/1f4e1c5edb6fb95be21e62d5671427a91a371a50)) +* **http:** added pathParams field and renamed the tab ro URL params ([#1831](https://github.com/rudderlabs/rudder-config-schema/issues/1831)) ([04797e9](https://github.com/rudderlabs/rudder-config-schema/commit/04797e99f87200d550b39016812cab0969a8f5ce)) +* onboard topsort destination ([#1842](https://github.com/rudderlabs/rudder-config-schema/issues/1842)) ([2c683fe](https://github.com/rudderlabs/rudder-config-schema/commit/2c683fec0ac8d8518096413c6d2b018a1e7b4d1e)) + + +### Bug Fixes + +* javascript source display name ([#1854](https://github.com/rudderlabs/rudder-config-schema/issues/1854)) ([ac0f867](https://github.com/rudderlabs/rudder-config-schema/commit/ac0f8674eb860ebc3bf2e2f75aa736066ad9b385)) +* pr body in constants pr workflow ([83d7b26](https://github.com/rudderlabs/rudder-config-schema/commit/83d7b2674f2b4bc209331d1dcd2b3c3bacafb4ab)) +* pr body in constants pr workflow ([3d227f7](https://github.com/rudderlabs/rudder-config-schema/commit/3d227f7126c96df9bf64fbd9587ac5d8f19fe17c)) +* pr labels in constants pr workflow ([e8c5167](https://github.com/rudderlabs/rudder-config-schema/commit/e8c5167cad5f9792e2621ddc7695fe85b7aa8fb4)) + ## [1.100.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.99.1...v1.100.0) (2024-12-18) diff --git a/package-lock.json b/package-lock.json index e90a786ba..44c8ae739 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudder-config-schema", - "version": "1.100.0", + "version": "1.101.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rudder-config-schema", - "version": "1.100.0", + "version": "1.101.0", "license": "MIT", "dependencies": { "ajv": "^8.12.0", diff --git a/package.json b/package.json index ccff979d9..183ea451f 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rudder-config-schema", - "version": "1.100.0", + "version": "1.101.0", "description": "", "main": "src/index.ts", "private": true, From c93e01422e45a0212e58b0beb807d62c033ac579 Mon Sep 17 00:00:00 2001 From: Yashasvi Bajpai <33063622+yashasvibajpai@users.noreply.github.com> Date: Tue, 14 Jan 2025 13:20:18 +0530 Subject: [PATCH 04/16] chore: update changelog --- CHANGELOG.md | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 100094f32..bfc20d2d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,21 +4,10 @@ All notable changes to this project will be documented in this file. See [standa ## [1.101.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.100.0...v1.101.0) (2025-01-14) - -### Features - -* add config for hash to bingads offline conversions ([#1843](https://github.com/rudderlabs/rudder-config-schema/issues/1843)) ([49356fe](https://github.com/rudderlabs/rudder-config-schema/commit/49356feee94e355e5d1c3f0f83139770eaf12ea4)) -* add tags for sdk source types ([#1841](https://github.com/rudderlabs/rudder-config-schema/issues/1841)) ([1f4e1c5](https://github.com/rudderlabs/rudder-config-schema/commit/1f4e1c5edb6fb95be21e62d5671427a91a371a50)) -* **http:** added pathParams field and renamed the tab ro URL params ([#1831](https://github.com/rudderlabs/rudder-config-schema/issues/1831)) ([04797e9](https://github.com/rudderlabs/rudder-config-schema/commit/04797e99f87200d550b39016812cab0969a8f5ce)) -* onboard topsort destination ([#1842](https://github.com/rudderlabs/rudder-config-schema/issues/1842)) ([2c683fe](https://github.com/rudderlabs/rudder-config-schema/commit/2c683fec0ac8d8518096413c6d2b018a1e7b4d1e)) - - ### Bug Fixes -* javascript source display name ([#1854](https://github.com/rudderlabs/rudder-config-schema/issues/1854)) ([ac0f867](https://github.com/rudderlabs/rudder-config-schema/commit/ac0f8674eb860ebc3bf2e2f75aa736066ad9b385)) -* pr body in constants pr workflow ([83d7b26](https://github.com/rudderlabs/rudder-config-schema/commit/83d7b2674f2b4bc209331d1dcd2b3c3bacafb4ab)) -* pr body in constants pr workflow ([3d227f7](https://github.com/rudderlabs/rudder-config-schema/commit/3d227f7126c96df9bf64fbd9587ac5d8f19fe17c)) -* pr labels in constants pr workflow ([e8c5167](https://github.com/rudderlabs/rudder-config-schema/commit/e8c5167cad5f9792e2621ddc7695fe85b7aa8fb4)) +* enable ga4 v2 as beta ([4ba0df7](https://github.com/rudderlabs/rudder-config-schema/pull/1863/commits/4ba0df7dc0694e6469b6aa9fa6db427b54b5dc90)) +* update config for klaviyo and ga4 v2 ([09d4977](https://github.com/rudderlabs/rudder-config-schema/pull/1863/commits/7efcfd1c017a5608710babb40a28d3c145cd8c85)) ## [1.100.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.99.1...v1.100.0) (2024-12-18) From 93396f8ed98f7ab3ebea5ee87bbc0892fbb5722d Mon Sep 17 00:00:00 2001 From: Yashasvi Bajpai <33063622+yashasvibajpai@users.noreply.github.com> Date: Tue, 14 Jan 2025 13:45:26 +0530 Subject: [PATCH 05/16] chore: update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfc20d2d3..758a314d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,6 @@ All notable changes to this project will be documented in this file. See [standa ### Bug Fixes -* enable ga4 v2 as beta ([4ba0df7](https://github.com/rudderlabs/rudder-config-schema/pull/1863/commits/4ba0df7dc0694e6469b6aa9fa6db427b54b5dc90)) * update config for klaviyo and ga4 v2 ([09d4977](https://github.com/rudderlabs/rudder-config-schema/pull/1863/commits/7efcfd1c017a5608710babb40a28d3c145cd8c85)) ## [1.100.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.99.1...v1.100.0) (2024-12-18) @@ -19,6 +18,7 @@ All notable changes to this project will be documented in this file. See [standa ### Bug Fixes +* enable ga4 v2 as beta ([4ba0df7](https://github.com/rudderlabs/rudder-config-schema/pull/1863/commits/4ba0df7dc0694e6469b6aa9fa6db427b54b5dc90)) * pr body in constants pr workflow ([83d7b26](https://github.com/rudderlabs/rudder-config-schema/commit/83d7b2674f2b4bc209331d1dcd2b3c3bacafb4ab)) * pr body in constants pr workflow ([3d227f7](https://github.com/rudderlabs/rudder-config-schema/commit/3d227f7126c96df9bf64fbd9587ac5d8f19fe17c)) * pr labels in constants pr workflow ([e8c5167](https://github.com/rudderlabs/rudder-config-schema/commit/e8c5167cad5f9792e2621ddc7695fe85b7aa8fb4)) From b2e3571bb38955d45b07f85ab37c708c30c264c1 Mon Sep 17 00:00:00 2001 From: Yashasvi Bajpai <33063622+yashasvibajpai@users.noreply.github.com> Date: Tue, 14 Jan 2025 18:09:52 +0530 Subject: [PATCH 06/16] chore: remove beta from klaviyo api version label --- src/configurations/destinations/klaviyo/ui-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configurations/destinations/klaviyo/ui-config.json b/src/configurations/destinations/klaviyo/ui-config.json index 353a75987..79c4f2107 100644 --- a/src/configurations/destinations/klaviyo/ui-config.json +++ b/src/configurations/destinations/klaviyo/ui-config.json @@ -42,7 +42,7 @@ "value": "v1" }, { - "label": "2024-06-15 (Beta)", + "label": "2024-06-15", "value": "v2" } ], From 5da6f8b0a1403a1b8c22f7a47c3aa96cc9356775 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 14 Jan 2025 12:42:44 +0000 Subject: [PATCH 07/16] chore(release): 1.101.1 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 758a314d9..d271b7cf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ 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.101.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.101.0...v1.101.1) (2025-01-14) + ## [1.101.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.100.0...v1.101.0) (2025-01-14) ### Bug Fixes diff --git a/package-lock.json b/package-lock.json index 44c8ae739..2d278bffc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudder-config-schema", - "version": "1.101.0", + "version": "1.101.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rudder-config-schema", - "version": "1.101.0", + "version": "1.101.1", "license": "MIT", "dependencies": { "ajv": "^8.12.0", diff --git a/package.json b/package.json index 183ea451f..69320a282 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rudder-config-schema", - "version": "1.101.0", + "version": "1.101.1", "description": "", "main": "src/index.ts", "private": true, From d3c4587fc806a513240f7e0bf1c8e0461ad1ebc8 Mon Sep 17 00:00:00 2001 From: Sudip Paul <67197965+ItsSudip@users.noreply.github.com> Date: Fri, 17 Jan 2025 15:33:03 +0530 Subject: [PATCH 08/16] chore: remove hidden flag from linkedin audience (#1871) --- .../destinations/linkedin_audience/db-config.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/configurations/destinations/linkedin_audience/db-config.json b/src/configurations/destinations/linkedin_audience/db-config.json index 544b93069..48433f976 100644 --- a/src/configurations/destinations/linkedin_audience/db-config.json +++ b/src/configurations/destinations/linkedin_audience/db-config.json @@ -31,9 +31,6 @@ }, "options": { "isBeta": true, - "hidden": { - "featureFlagName": "AMP_linkedin_audience", - "featureFlagValue": false - } + "hidden": false } } From 474cde545d8d2786e49dfe18ef656209e1c31b67 Mon Sep 17 00:00:00 2001 From: Manish Kumar <144022547+manish339k@users.noreply.github.com> Date: Mon, 20 Jan 2025 08:53:30 +0530 Subject: [PATCH 09/16] feat: added drop traits in track call feature for mixpanel (#1870) --- .../destinations/mp/db-config.json | 3 ++- .../destinations/mp/schema.json | 4 ++++ .../destinations/mp/ui-config.json | 22 ++++++++++++++++++ test/data/validation/destinations/mp.json | 23 +++++++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/configurations/destinations/mp/db-config.json b/src/configurations/destinations/mp/db-config.json index 298fadbe9..b0b7ff7fb 100644 --- a/src/configurations/destinations/mp/db-config.json +++ b/src/configurations/destinations/mp/db-config.json @@ -109,7 +109,8 @@ "useUserDefinedPageEventName", "userDefinedPageEventTemplate", "useUserDefinedScreenEventName", - "userDefinedScreenEventTemplate" + "userDefinedScreenEventTemplate", + "dropTraitsInTrackEvent" ], "android": [ "consentManagement", diff --git a/src/configurations/destinations/mp/schema.json b/src/configurations/destinations/mp/schema.json index eabd4e256..1ef77ae95 100644 --- a/src/configurations/destinations/mp/schema.json +++ b/src/configurations/destinations/mp/schema.json @@ -39,6 +39,10 @@ "type": "boolean", "default": false }, + "dropTraitsInTrackEvent": { + "type": "boolean", + "default": false + }, "people": { "type": "boolean", "default": false diff --git a/src/configurations/destinations/mp/ui-config.json b/src/configurations/destinations/mp/ui-config.json index 6960a5dd5..09f2604dd 100644 --- a/src/configurations/destinations/mp/ui-config.json +++ b/src/configurations/destinations/mp/ui-config.json @@ -162,6 +162,28 @@ } ] }, + { + "title": "Track Settings", + "note": "Set how you want to send your track calls to Mixpanel", + "icon": "file", + "fields": [ + { + "type": "checkbox", + "label": "Drop Traits", + "configKey": "dropTraitsInTrackEvent", + "note": "Drop traits from event property in track call", + "default": false, + "preRequisites": { + "fields": [ + { + "configKey": "connectionModes.cloud", + "value": true + } + ] + } + } + ] + }, { "title": "Mixpanel Configuration Settings", "fields": [ diff --git a/test/data/validation/destinations/mp.json b/test/data/validation/destinations/mp.json index 34054629c..93294b00f 100644 --- a/test/data/validation/destinations/mp.json +++ b/test/data/validation/destinations/mp.json @@ -741,5 +741,28 @@ "ketchConsentPurposes.web must be array", "ketchConsentPurposes.unity.0 must be object" ] + }, + { + "config": { + "token": "dummy-token", + "dataResidency": "us", + "people": false, + "setAllTraitsByDefault": false, + "consolidatedPageCalls": true, + "trackCategorizedPages": false, + "trackNamedPages": false, + "crossSubdomainCookie": false, + "persistence": "localStorage", + "secureCookie": false, + "eventFilteringOption": "disable", + "useNativeSDK": { + "web": false + }, + "strictMode": false, + "ignoreDnt": true, + "dropTraitsInTrackEvent": "inValid" + }, + "result": false, + "err": ["dropTraitsInTrackEvent must be boolean"] } ] From 41be20376268251ebe06c6dd909f0e8752006647 Mon Sep 17 00:00:00 2001 From: Sandeep Digumarty Date: Mon, 20 Jan 2025 11:26:51 +0530 Subject: [PATCH 10/16] feat(http): add urlPreview custom field to ui-config (#1869) --- src/configurations/destinations/http/ui-config.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/configurations/destinations/http/ui-config.json b/src/configurations/destinations/http/ui-config.json index 7e2f28824..46e0e6069 100644 --- a/src/configurations/destinations/http/ui-config.json +++ b/src/configurations/destinations/http/ui-config.json @@ -487,6 +487,10 @@ { "name": "Request URL", "fields": [ + { + "type": "customComponent", + "componentId": "urlPreview" + }, { "type": "mapping", "label": "Enter your path parameters in sequence", @@ -508,7 +512,7 @@ "label": "Map your query parameters", "configKey": "queryParams", "default": [], - "hideKeysJsonView": true, + "separatorIcon": "colon", "columns": [ { "type": "textInput", @@ -538,7 +542,7 @@ "label": "Map your headers", "configKey": "headers", "default": [], - "hideKeysJsonView": true, + "separatorIcon": "colon", "columns": [ { "type": "textInput", From d87bd4e06607eaf00e763d34478842245c05ebfa Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 20 Jan 2025 10:13:17 +0000 Subject: [PATCH 11/16] chore(release): 1.102.0 --- CHANGELOG.md | 8 ++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d271b7cf8..7c71398c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 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.102.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.101.1...v1.102.0) (2025-01-20) + + +### Features + +* added drop traits in track call feature for mixpanel ([#1870](https://github.com/rudderlabs/rudder-config-schema/issues/1870)) ([474cde5](https://github.com/rudderlabs/rudder-config-schema/commit/474cde545d8d2786e49dfe18ef656209e1c31b67)) +* **http:** add urlPreview custom field to ui-config ([#1869](https://github.com/rudderlabs/rudder-config-schema/issues/1869)) ([41be203](https://github.com/rudderlabs/rudder-config-schema/commit/41be20376268251ebe06c6dd909f0e8752006647)) + ### [1.101.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.101.0...v1.101.1) (2025-01-14) ## [1.101.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.100.0...v1.101.0) (2025-01-14) diff --git a/package-lock.json b/package-lock.json index 2d278bffc..118bf7f78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudder-config-schema", - "version": "1.101.1", + "version": "1.102.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rudder-config-schema", - "version": "1.101.1", + "version": "1.102.0", "license": "MIT", "dependencies": { "ajv": "^8.12.0", diff --git a/package.json b/package.json index 69320a282..556216481 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rudder-config-schema", - "version": "1.101.1", + "version": "1.102.0", "description": "", "main": "src/index.ts", "private": true, From 7edb0f42c6e7a3ddec97de2320d68472ab790cc1 Mon Sep 17 00:00:00 2001 From: Manish Kumar <144022547+manish339k@users.noreply.github.com> Date: Wed, 22 Jan 2025 14:21:36 +0530 Subject: [PATCH 12/16] revert: feat added drop traits in track call feature for mixpanel (#1874) --- .../destinations/mp/db-config.json | 3 +-- .../destinations/mp/schema.json | 4 ---- .../destinations/mp/ui-config.json | 22 ------------------ test/data/validation/destinations/mp.json | 23 ------------------- 4 files changed, 1 insertion(+), 51 deletions(-) diff --git a/src/configurations/destinations/mp/db-config.json b/src/configurations/destinations/mp/db-config.json index b0b7ff7fb..298fadbe9 100644 --- a/src/configurations/destinations/mp/db-config.json +++ b/src/configurations/destinations/mp/db-config.json @@ -109,8 +109,7 @@ "useUserDefinedPageEventName", "userDefinedPageEventTemplate", "useUserDefinedScreenEventName", - "userDefinedScreenEventTemplate", - "dropTraitsInTrackEvent" + "userDefinedScreenEventTemplate" ], "android": [ "consentManagement", diff --git a/src/configurations/destinations/mp/schema.json b/src/configurations/destinations/mp/schema.json index 1ef77ae95..eabd4e256 100644 --- a/src/configurations/destinations/mp/schema.json +++ b/src/configurations/destinations/mp/schema.json @@ -39,10 +39,6 @@ "type": "boolean", "default": false }, - "dropTraitsInTrackEvent": { - "type": "boolean", - "default": false - }, "people": { "type": "boolean", "default": false diff --git a/src/configurations/destinations/mp/ui-config.json b/src/configurations/destinations/mp/ui-config.json index 09f2604dd..6960a5dd5 100644 --- a/src/configurations/destinations/mp/ui-config.json +++ b/src/configurations/destinations/mp/ui-config.json @@ -162,28 +162,6 @@ } ] }, - { - "title": "Track Settings", - "note": "Set how you want to send your track calls to Mixpanel", - "icon": "file", - "fields": [ - { - "type": "checkbox", - "label": "Drop Traits", - "configKey": "dropTraitsInTrackEvent", - "note": "Drop traits from event property in track call", - "default": false, - "preRequisites": { - "fields": [ - { - "configKey": "connectionModes.cloud", - "value": true - } - ] - } - } - ] - }, { "title": "Mixpanel Configuration Settings", "fields": [ diff --git a/test/data/validation/destinations/mp.json b/test/data/validation/destinations/mp.json index 93294b00f..34054629c 100644 --- a/test/data/validation/destinations/mp.json +++ b/test/data/validation/destinations/mp.json @@ -741,28 +741,5 @@ "ketchConsentPurposes.web must be array", "ketchConsentPurposes.unity.0 must be object" ] - }, - { - "config": { - "token": "dummy-token", - "dataResidency": "us", - "people": false, - "setAllTraitsByDefault": false, - "consolidatedPageCalls": true, - "trackCategorizedPages": false, - "trackNamedPages": false, - "crossSubdomainCookie": false, - "persistence": "localStorage", - "secureCookie": false, - "eventFilteringOption": "disable", - "useNativeSDK": { - "web": false - }, - "strictMode": false, - "ignoreDnt": true, - "dropTraitsInTrackEvent": "inValid" - }, - "result": false, - "err": ["dropTraitsInTrackEvent must be boolean"] } ] From 264a5bff18f11245ce0e1ce0d13712182856d758 Mon Sep 17 00:00:00 2001 From: Sai Sankeerth Date: Wed, 22 Jan 2025 16:10:21 +0530 Subject: [PATCH 13/16] chore: remove reverted changelog info --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c71398c7..e02c2e9c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ All notable changes to this project will be documented in this file. See [standa ### Features -* added drop traits in track call feature for mixpanel ([#1870](https://github.com/rudderlabs/rudder-config-schema/issues/1870)) ([474cde5](https://github.com/rudderlabs/rudder-config-schema/commit/474cde545d8d2786e49dfe18ef656209e1c31b67)) * **http:** add urlPreview custom field to ui-config ([#1869](https://github.com/rudderlabs/rudder-config-schema/issues/1869)) ([41be203](https://github.com/rudderlabs/rudder-config-schema/commit/41be20376268251ebe06c6dd909f0e8752006647)) ### [1.101.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.101.0...v1.101.1) (2025-01-14) From fed05faaf99472c31c413b17502ca498ae9b6acf Mon Sep 17 00:00:00 2001 From: Sankeerth Date: Thu, 23 Jan 2025 13:21:07 +0530 Subject: [PATCH 14/16] fix: clean up adobe analytics dynamic config support (#1857) Co-authored-by: Sai Sankeerth --- scripts/schemaGenerator.py | 43 +++++- .../adobe_analytics/db-config.json | 1 + .../destinations/adobe_analytics/schema.json | 127 +++++++++--------- .../adobe_analytics/ui-config.json | 8 +- .../destinations/db-config-schema.json | 9 ++ .../update_schema_dest/schema.json | 12 +- .../update_schema_dest_legacy_ui/schema.json | 12 +- .../destinations/adobe_analytics.json | 4 +- 8 files changed, 136 insertions(+), 80 deletions(-) diff --git a/scripts/schemaGenerator.py b/scripts/schemaGenerator.py index bf9b57b2e..22d892baf 100644 --- a/scripts/schemaGenerator.py +++ b/scripts/schemaGenerator.py @@ -55,6 +55,33 @@ def get_options_list_for_enum(field): return options_list +def generate_uiconfig_pattern(field, dbConfig=None) -> str: + """ + Generates the pattern for schema based on the type of field. + + Cases: + If dynamicConfigSupported is present in dbConfig: + - Regex is present in ui-config for the field + - Use the regex mentioned in ui-config. + - Regex is not present in ui-config for the field + - Use the regex ^(.{0,100})$. + If dynamicConfigSupported is not present in dbConfig: + - Regex is present in ui-config for the field + - Use the regex mentioned in ui-config & includes dynamic config regex & env regex(if not already present). + - Regex is not present in ui-config for the field + - Use the regex ^(.{0,100})$ & includes dynamic config regex & env regex(if not already present). + """ + # TODO: remove this once all the destinations have been updated with dynamicConfigSupported field + if "dynamicConfigSupported" not in dbConfig: + return generalize_regex_pattern(field) # old way + + # regex from ui-config + if "regex" in field: + return field["regex"] + else: + return "^(.{0,100})$" + + def generalize_regex_pattern(field): """Generates the pattern for schema based on the type of field. - For type : singleSelect and dynamicSelectForm, the pattern is generated by iterating over options. @@ -269,12 +296,12 @@ def generate_schema_for_textinput(field, dbConfig, schema_field_name): } if "regex" in field: textInputSchemaObj["properties"][sourceType]["pattern"] = ( - generalize_regex_pattern(field) + generate_uiconfig_pattern(field, dbConfig) ) else: textInputSchemaObj = {"type": FieldTypeEnum.STRING.value} if "regex" in field: - textInputSchemaObj["pattern"] = generalize_regex_pattern(field) + textInputSchemaObj["pattern"] = generate_uiconfig_pattern(field, dbConfig) return textInputSchemaObj @@ -292,7 +319,7 @@ def generate_schema_for_textarea_input(field, dbConfig, schema_field_name): """ textareaInputObj = {"type": FieldTypeEnum.STRING.value} if "regex" in field: - textareaInputObj["pattern"] = generalize_regex_pattern(field) + textareaInputObj["pattern"] = generate_uiconfig_pattern(field, dbConfig) return textareaInputObj @@ -394,7 +421,9 @@ def generate_schema_for_dynamic_custom_form(field, dbConfig, schema_field_name): and customField["type"] != "singleSelect" and customField["type"] != "dynamicSelectForm" ): - customFieldSchemaObj["pattern"] = generalize_regex_pattern(customField) + customFieldSchemaObj["pattern"] = generate_uiconfig_pattern( + customField, dbConfig + ) # If the custom field is source dependent, we remove the source keys as it's not required inside custom fields, rather they need to be moved to top. if isCustomFieldDependentOnSource: @@ -510,13 +539,13 @@ def generate_key(forFieldWithTo): } if field["type"] == "dynamicSelectForm": if forFieldWithTo != (field.get("reverse", False) == False): - obj["pattern"] = generalize_regex_pattern(field) + obj["pattern"] = generate_uiconfig_pattern(field, dbConfig) else: if "defaultOption" in field: obj["default"] = field["defaultOption"]["value"] obj["enum"] = get_options_list_for_enum(field) else: - obj["pattern"] = generalize_regex_pattern(field) + obj["pattern"] = generate_uiconfig_pattern(field, dbConfig) return obj dynamicFormSchemaObject = {} @@ -602,7 +631,7 @@ def generate_schema_for_tag_input(field, dbConfig, schema_field_name): tagItemProps = { str(field["tagKey"]): { "type": FieldTypeEnum.STRING.value, - "pattern": generalize_regex_pattern(field), + "pattern": generate_uiconfig_pattern(field, dbConfig), } } tagItem["properties"] = tagItemProps diff --git a/src/configurations/destinations/adobe_analytics/db-config.json b/src/configurations/destinations/adobe_analytics/db-config.json index 2717c48cb..3d63bb531 100644 --- a/src/configurations/destinations/adobe_analytics/db-config.json +++ b/src/configurations/destinations/adobe_analytics/db-config.json @@ -4,6 +4,7 @@ "config": { "transformAtV1": "processor", "saveDestinationResponse": true, + "dynamicConfigSupported": ["trackingServerUrl", "reportSuiteIds", "trackingServerSecureUrl"], "includeKeys": [ "trackingServerUrl", "reportSuiteIds", diff --git a/src/configurations/destinations/adobe_analytics/schema.json b/src/configurations/destinations/adobe_analytics/schema.json index ef02af6a5..e3fc14f0c 100644 --- a/src/configurations/destinations/adobe_analytics/schema.json +++ b/src/configurations/destinations/adobe_analytics/schema.json @@ -22,15 +22,15 @@ }, "heartbeatTrackingServerUrl": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$" + "pattern": "(?!.*\\.ngrok\\.io)^(.{0,100})$" }, "proxyNormalUrl": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$" + "pattern": "(?!.*\\.ngrok\\.io)^(.{0,100})$" }, "proxyHeartbeatUrl": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$" + "pattern": "(?!.*\\.ngrok\\.io)^(.{0,100})$" }, "eventsToTypes": { "type": "array", @@ -39,7 +39,7 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "to": { "type": "string", @@ -71,7 +71,7 @@ }, "marketingCloudOrgId": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "dropVisitorId": { "type": "boolean", @@ -101,11 +101,11 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -121,18 +121,18 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } }, "contextDataPrefix": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "mobileEventMapping": { "type": "array", @@ -141,11 +141,11 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -157,11 +157,11 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -173,11 +173,11 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -189,11 +189,11 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "delimiter": { "type": "string", @@ -209,11 +209,11 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "delimiter": { "type": "string", @@ -229,11 +229,11 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -245,7 +245,7 @@ "properties": { "eventMerchProperties": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -257,11 +257,11 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -273,7 +273,7 @@ "properties": { "productMerchProperties": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -285,11 +285,11 @@ "properties": { "from": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" }, "to": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -374,7 +374,7 @@ "properties": { "eventName": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -386,7 +386,7 @@ "properties": { "eventName": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -401,7 +401,7 @@ "properties": { "oneTrustCookieCategory": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -413,7 +413,7 @@ "properties": { "oneTrustCookieCategory": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -425,7 +425,7 @@ "properties": { "oneTrustCookieCategory": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -437,7 +437,7 @@ "properties": { "oneTrustCookieCategory": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -449,7 +449,7 @@ "properties": { "oneTrustCookieCategory": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -461,7 +461,7 @@ "properties": { "oneTrustCookieCategory": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -473,7 +473,7 @@ "properties": { "oneTrustCookieCategory": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -485,7 +485,7 @@ "properties": { "oneTrustCookieCategory": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -497,7 +497,7 @@ "properties": { "oneTrustCookieCategory": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -509,7 +509,7 @@ "properties": { "oneTrustCookieCategory": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -521,7 +521,7 @@ "properties": { "oneTrustCookieCategory": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -548,7 +548,7 @@ "properties": { "consent": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -594,7 +594,7 @@ "properties": { "consent": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -640,7 +640,7 @@ "properties": { "consent": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -686,7 +686,7 @@ "properties": { "consent": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -732,7 +732,7 @@ "properties": { "consent": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -778,7 +778,7 @@ "properties": { "consent": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -824,7 +824,7 @@ "properties": { "consent": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -870,7 +870,7 @@ "properties": { "consent": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -916,7 +916,7 @@ "properties": { "consent": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -962,7 +962,7 @@ "properties": { "consent": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1008,7 +1008,7 @@ "properties": { "consent": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1039,6 +1039,7 @@ } } }, + "ketchConsentPurposes": { "type": "object", "properties": { @@ -1049,7 +1050,7 @@ "properties": { "purpose": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1061,7 +1062,7 @@ "properties": { "purpose": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1073,7 +1074,7 @@ "properties": { "purpose": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1085,7 +1086,7 @@ "properties": { "purpose": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1097,7 +1098,7 @@ "properties": { "purpose": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1109,7 +1110,7 @@ "properties": { "purpose": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1121,7 +1122,7 @@ "properties": { "purpose": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1133,7 +1134,7 @@ "properties": { "purpose": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1145,7 +1146,7 @@ "properties": { "purpose": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1157,7 +1158,7 @@ "properties": { "purpose": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } @@ -1169,7 +1170,7 @@ "properties": { "purpose": { "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" + "pattern": "^(.{0,100})$" } } } diff --git a/src/configurations/destinations/adobe_analytics/ui-config.json b/src/configurations/destinations/adobe_analytics/ui-config.json index 23c05aa56..3946455a0 100644 --- a/src/configurations/destinations/adobe_analytics/ui-config.json +++ b/src/configurations/destinations/adobe_analytics/ui-config.json @@ -61,7 +61,7 @@ "label": "Marketing Cloud Organization Id", "note": "Enter the Marketing Cloud Organization ID to use visitorAPI.js. It can be located on the Marketing Cloud administration page.", "configKey": "marketingCloudOrgId", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$", + "regex": "^(.{0,100})$", "placeholder": "e.g: marketing_cloud_org_id" }, { @@ -186,7 +186,7 @@ "type": "textInput", "label": "Heartbeat Tracking Server URL", "configKey": "heartbeatTrackingServerUrl", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{0,100})$", "regexErrorMessage": "Please put a valid url", "note": "This is the URL of your Adobe Heartbeat server. Please reach out to Adobe for this URL." }, @@ -194,7 +194,7 @@ "type": "textInput", "label": "Adobe Analytics Javascript SDK Proxy URL", "configKey": "proxyNormalUrl", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{0,100})$", "regexErrorMessage": "Please put a valid url", "note": "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" }, @@ -202,7 +202,7 @@ "type": "textInput", "label": "Adobe Analytics Hearbeat SDK Proxy URL", "configKey": "proxyHeartbeatUrl", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(.{0,100})$", + "regex": "(?!.*\\.ngrok\\.io)^(.{0,100})$", "regexErrorMessage": "Please put a valid url", "note": "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" } diff --git a/src/schemas/destinations/db-config-schema.json b/src/schemas/destinations/db-config-schema.json index 35a0306f2..02dfb33c8 100644 --- a/src/schemas/destinations/db-config-schema.json +++ b/src/schemas/destinations/db-config-schema.json @@ -48,6 +48,15 @@ "enum": ["processor", "router", "none"], "default": "processor" }, + "dynamicConfigSupported": { + "type": "array", + "title": "Dynamic Config Supported", + "description": "The list of dynamic config supported fields by the destination.", + "items": { + "type": "string" + }, + "uniqueItems": true + }, "features": { "type": "array", "title": "list of destination features", diff --git a/test/component_tests/configurations/destinations/update_schema_dest/schema.json b/test/component_tests/configurations/destinations/update_schema_dest/schema.json index aea615f1b..892890796 100644 --- a/test/component_tests/configurations/destinations/update_schema_dest/schema.json +++ b/test/component_tests/configurations/destinations/update_schema_dest/schema.json @@ -1,7 +1,7 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["secretTextInputField"], + "required": ["secretTextInputField", "singleSelectField"], "type": "object", "properties": { "secretTextInputField": { @@ -26,7 +26,8 @@ "type": "object", "properties": { "android": { - "type": "string" + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^([0-9]{0,100})$" } } }, @@ -35,6 +36,9 @@ "properties": { "android": { "type": "boolean" + }, + "web": { + "type": "boolean" } } }, @@ -86,6 +90,10 @@ "enum": ["cloud"] } } + }, + "checkboxField": { + "type": "boolean", + "default": true } } } diff --git a/test/component_tests/configurations/destinations/update_schema_dest_legacy_ui/schema.json b/test/component_tests/configurations/destinations/update_schema_dest_legacy_ui/schema.json index 9790d9ff6..13e84c732 100644 --- a/test/component_tests/configurations/destinations/update_schema_dest_legacy_ui/schema.json +++ b/test/component_tests/configurations/destinations/update_schema_dest_legacy_ui/schema.json @@ -1,7 +1,7 @@ { "configSchema": { "$schema": "http://json-schema.org/draft-07/schema#", - "required": ["secretTextInputField"], + "required": ["secretTextInputField", "textareaInputField"], "type": "object", "properties": { "secretTextInputField": { @@ -21,7 +21,8 @@ "type": "object", "properties": { "android": { - "type": "string" + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^([0-9]{0,100})$" } } }, @@ -30,6 +31,9 @@ "properties": { "web": { "type": "boolean" + }, + "android": { + "type": "boolean" } } }, @@ -100,6 +104,10 @@ }, "timePickerField": { "type": "string" + }, + "checkboxField": { + "type": "boolean", + "default": true } } } diff --git a/test/data/validation/destinations/adobe_analytics.json b/test/data/validation/destinations/adobe_analytics.json index 17c1ff170..7cf872439 100644 --- a/test/data/validation/destinations/adobe_analytics.json +++ b/test/data/validation/destinations/adobe_analytics.json @@ -1237,11 +1237,11 @@ }, "result": false, "err": [ - "oneTrustCookieCategories.android.0.oneTrustCookieCategory must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$\"", + "oneTrustCookieCategories.android.0.oneTrustCookieCategory must match pattern \"^(.{0,100})$\"", "oneTrustCookieCategories.ios.0.oneTrustCookieCategory must be string", "oneTrustCookieCategories.web must be array", "oneTrustCookieCategories.unity.0 must be object", - "ketchConsentPurposes.android.0.purpose must match pattern \"(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$\"", + "ketchConsentPurposes.android.0.purpose must match pattern \"^(.{0,100})$\"", "ketchConsentPurposes.ios.0.purpose must be string", "ketchConsentPurposes.web must be array", "ketchConsentPurposes.unity.0 must be object" From f570d038bbc0bb9dd66e4b204e5ba53080315981 Mon Sep 17 00:00:00 2001 From: Yashasvi Bajpai <33063622+yashasvibajpai@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:30:50 +0530 Subject: [PATCH 15/16] chore: add custom domain url labels for gtm and ga4 (#1867) --- src/configurations/destinations/ga4/ui-config.json | 4 ++-- src/configurations/destinations/gtm/ui-config.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/configurations/destinations/ga4/ui-config.json b/src/configurations/destinations/ga4/ui-config.json index d5b0ac730..8c6125625 100644 --- a/src/configurations/destinations/ga4/ui-config.json +++ b/src/configurations/destinations/ga4/ui-config.json @@ -123,11 +123,11 @@ ], "condition": "or" }, - "label": "SDK Base URL", + "label": "Custom Domain URL", "configKey": "sdkBaseUrl", "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]*|^$", "regexErrorMessage": "Please input a valid URL.", - "note": "Enter your GA4 SDK base URL, https://{SDK Base URL}/gtag/js. By default, it is https://www.googletagmanager.com.", + "note": "Enter your GA4 Custom Domain URL, https://{Custom Domain URL}/gtag/js. By default, it is https://www.googletagmanager.com.", "placeholder": "e.g: https://www.example.com", "default": "https://www.googletagmanager.com", "secret": false diff --git a/src/configurations/destinations/gtm/ui-config.json b/src/configurations/destinations/gtm/ui-config.json index 0fe1d3b44..71e65d708 100644 --- a/src/configurations/destinations/gtm/ui-config.json +++ b/src/configurations/destinations/gtm/ui-config.json @@ -14,7 +14,7 @@ }, { "type": "textInput", - "label": "Server Container URL", + "label": "Custom Domain URL", "value": "serverUrl", "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]*|^$", "regexErrorMessage": "Invalid URL", From 10ebbd9e66c07f88c6798182e1f91242d11a2408 Mon Sep 17 00:00:00 2001 From: Sandeep Digumarty Date: Mon, 27 Jan 2025 10:49:17 +0530 Subject: [PATCH 16/16] feat(http): add support for form format (#1876) --- src/configurations/destinations/http/schema.json | 2 +- src/configurations/destinations/http/ui-config.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/configurations/destinations/http/schema.json b/src/configurations/destinations/http/schema.json index 761c1b0d4..25cf23547 100644 --- a/src/configurations/destinations/http/schema.json +++ b/src/configurations/destinations/http/schema.json @@ -20,7 +20,7 @@ }, "format": { "type": "string", - "enum": ["JSON", "XML"], + "enum": ["JSON", "XML", "FORM"], "default": "JSON" }, "isBatchingEnabled": { diff --git a/src/configurations/destinations/http/ui-config.json b/src/configurations/destinations/http/ui-config.json index 46e0e6069..de70b1c1d 100644 --- a/src/configurations/destinations/http/ui-config.json +++ b/src/configurations/destinations/http/ui-config.json @@ -169,6 +169,10 @@ { "label": "XML", "value": "XML" + }, + { + "label": "FORM", + "value": "FORM" } ], "default": "JSON"