From 1581331260b80fb93abf539b769ffdebe3312c84 Mon Sep 17 00:00:00 2001 From: Utsab Chowdhury Date: Mon, 4 Mar 2024 15:32:18 +0530 Subject: [PATCH 1/2] fix: amplitude fix for user operations (#1249) --- .../destinations/am/db-config.json | 3 +- .../destinations/am/schema.json | 4 + .../destinations/am/ui-config.json | 21 ++++ test/data/validation/destinations/am.json | 114 ++++++++++++++++++ 4 files changed, 141 insertions(+), 1 deletion(-) diff --git a/src/configurations/destinations/am/db-config.json b/src/configurations/destinations/am/db-config.json index 27bac822d..156f15917 100644 --- a/src/configurations/destinations/am/db-config.json +++ b/src/configurations/destinations/am/db-config.json @@ -101,7 +101,8 @@ "userProvidedPageEventString", "useUserDefinedPageEventName", "userProvidedScreenEventString", - "useUserDefinedScreenEventName" + "useUserDefinedScreenEventName", + "enableEnhancedUserOperations" ], "web": [ "useNativeSDK", diff --git a/src/configurations/destinations/am/schema.json b/src/configurations/destinations/am/schema.json index fe02ce807..f62ced761 100644 --- a/src/configurations/destinations/am/schema.json +++ b/src/configurations/destinations/am/schema.json @@ -98,6 +98,10 @@ } } }, + "enableEnhancedUserOperations": { + "type": "boolean", + "default": false + }, "apiSecret": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" diff --git a/src/configurations/destinations/am/ui-config.json b/src/configurations/destinations/am/ui-config.json index 94524d683..3f7ad1659 100644 --- a/src/configurations/destinations/am/ui-config.json +++ b/src/configurations/destinations/am/ui-config.json @@ -329,6 +329,27 @@ ], "condition": "or" } + }, + { + "type": "checkbox", + "label": "Enbale Support for enhanced user operations", + "configKey": "enableEnhancedUserOperations", + "note": "Enable support for enhanced user operations like set, setOnce, unset, increment, append, prepend, and remove for user traits in all flows", + "default": false, + "preRequisites": { + "fields": [ + { + "configKey": "connectionModes.cloud", + "value": true + } + ], + "featureFlags": [ + { + "configKey": "AMP_amplitude-enable-enhanced-user-operations", + "value": true + } + ] + } } ] } diff --git a/test/data/validation/destinations/am.json b/test/data/validation/destinations/am.json index 8b0147706..9a1861acb 100644 --- a/test/data/validation/destinations/am.json +++ b/test/data/validation/destinations/am.json @@ -686,5 +686,119 @@ "err": [ "proxyServerUrl.web must match pattern \"^(?!http://)(?:(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(?!.*\\.ngrok\\.io).*)$\"" ] + }, + { + "config": { + "apiKey": "8559811e41334c6d22b5c4b5f6s7gb70", + "apiSecret": "a41d5bc768831f083e3dacwecfgf7398", + "groupTypeTrait": "company_id", + "groupValueTrait": "company_name", + "trackAllPages": false, + "trackCategorizedPages": true, + "trackNamedPages": true, + "trackProductsOnce": false, + "trackRevenuePerProduct": false, + "versionName": "1.11.3", + "residencyServer": "standard", + "connectionMode": { + "web": "cloud" + }, + "traitsToIncrement": [], + "traitsToPrepend": [], + "traitsToSetOnce": [], + "enableEnhancedUserOperations": true, + "useNativeSDK": { + "web": false + }, + "preferAnonymousIdForDeviceId": { + "web": false + }, + "trackNewCampaigns": { + "web": true + }, + "eventUploadPeriodMillis": { + "web": "30000" + }, + "eventUploadThreshold": { + "web": "30" + }, + "attribution": { + "web": true + }, + "blacklistedEvents": [ + { + "eventName": "AM sample removed" + } + ], + "whitelistedEvents": [ + { + "eventName": "AM allowed customer check" + } + ], + "oneTrustCookieCategories": [ + { + "oneTrustCookieCategory": "Marketing" + } + ] + }, + "result": true + }, + { + "config": { + "apiKey": "8559811e41334c6d22b5c4b5f6s7gb70", + "apiSecret": "a41d5bc768831f083e3dacwecfgf7398", + "groupTypeTrait": "company_id", + "groupValueTrait": "company_name", + "trackAllPages": false, + "trackCategorizedPages": true, + "trackNamedPages": true, + "trackProductsOnce": false, + "trackRevenuePerProduct": false, + "versionName": "1.11.3", + "residencyServer": "standard", + "connectionMode": { + "web": "cloud" + }, + "traitsToIncrement": [], + "traitsToPrepend": [], + "traitsToSetOnce": [], + "enableEnhancedUserOperations": { + "web": true + }, + "useNativeSDK": { + "web": false + }, + "preferAnonymousIdForDeviceId": { + "web": false + }, + "trackNewCampaigns": { + "web": true + }, + "eventUploadPeriodMillis": { + "web": "30000" + }, + "eventUploadThreshold": { + "web": "30" + }, + "attribution": { + "web": true + }, + "blacklistedEvents": [ + { + "eventName": "AM sample removed" + } + ], + "whitelistedEvents": [ + { + "eventName": "AM allowed customer check" + } + ], + "oneTrustCookieCategories": [ + { + "oneTrustCookieCategory": "Marketing" + } + ] + }, + "result": false } ] From 3fcaa58b2661905e77ffe446832a384f09ae69fe Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 4 Mar 2024 10:15:27 +0000 Subject: [PATCH 2/2] chore(release): 1.66.1 --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8f02f820..e0e442400 100644 --- 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.66.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.66.0...v1.66.1) (2024-03-04) + + +### Bug Fixes + +* amplitude fix for user operations ([#1249](https://github.com/rudderlabs/rudder-config-schema/issues/1249)) ([1581331](https://github.com/rudderlabs/rudder-config-schema/commit/1581331260b80fb93abf539b769ffdebe3312c84)) + ## [1.66.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.65.0...v1.66.0) (2024-02-27) diff --git a/package-lock.json b/package-lock.json index 5e72fa902..ba4907554 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudder-config-schema", - "version": "1.66.0", + "version": "1.66.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rudder-config-schema", - "version": "1.66.0", + "version": "1.66.1", "license": "MIT", "dependencies": { "ajv": "^8.12.0", diff --git a/package.json b/package.json index 7fc6c8376..a1da55ef6 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rudder-config-schema", - "version": "1.66.0", + "version": "1.66.1", "description": "", "main": "src/index.ts", "private": true,