Skip to content

Commit

Permalink
Merge pull request #1250 from rudderlabs/hotfix-release/v1.66.1
Browse files Browse the repository at this point in the history
chore(release): pull hotfix-release/v1.66.1 into main
  • Loading branch information
ItsSudip authored Mar 4, 2024
2 parents 4393f99 + 3fcaa58 commit 8bcbb7f
Show file tree
Hide file tree
Showing 7 changed files with 151 additions and 4 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.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)


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.66.0",
"version": "1.66.1",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
3 changes: 2 additions & 1 deletion src/configurations/destinations/am/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@
"userProvidedPageEventString",
"useUserDefinedPageEventName",
"userProvidedScreenEventString",
"useUserDefinedScreenEventName"
"useUserDefinedScreenEventName",
"enableEnhancedUserOperations"
],
"web": [
"useNativeSDK",
Expand Down
4 changes: 4 additions & 0 deletions src/configurations/destinations/am/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@
}
}
},
"enableEnhancedUserOperations": {
"type": "boolean",
"default": false
},
"apiSecret": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
Expand Down
21 changes: 21 additions & 0 deletions src/configurations/destinations/am/ui-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]
}
}
]
}
Expand Down
114 changes: 114 additions & 0 deletions test/data/validation/destinations/am.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]

0 comments on commit 8bcbb7f

Please sign in to comment.