Skip to content

Commit

Permalink
Merge pull request #885 from rudderlabs/release/v1.48.0
Browse files Browse the repository at this point in the history
chore(release): pull release/v1.48.0 into main
  • Loading branch information
mihir-4116 authored Sep 5, 2023
2 parents f5bd627 + 31cf6ce commit 3f626d7
Show file tree
Hide file tree
Showing 23 changed files with 662 additions and 368 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ git

reports
.eslintcache
.vscode
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

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.48.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.47.2...v1.48.0) (2023-09-04)


### Features

* active campaign new UI ([#805](https://github.com/rudderlabs/rudder-config-schema/issues/805)) ([624d535](https://github.com/rudderlabs/rudder-config-schema/commit/624d53589e53d9674511623c0ab5f678c09504ca))
* add eu instance support to kustomer destination ([#863](https://github.com/rudderlabs/rudder-config-schema/issues/863)) ([6c3a9df](https://github.com/rudderlabs/rudder-config-schema/commit/6c3a9df54e39a610b1e7ebf85edf51888f51b5d3))
* adding trino config to UI ([#853](https://github.com/rudderlabs/rudder-config-schema/issues/853)) ([c74ecf2](https://github.com/rudderlabs/rudder-config-schema/commit/c74ecf20f7889f43b1ed25013b440602ca267955))
* google ads black audeince feature ([#846](https://github.com/rudderlabs/rudder-config-schema/issues/846)) ([c294c50](https://github.com/rudderlabs/rudder-config-schema/commit/c294c50b09a924b534c5a9210e2d6621e1bc544d))
* onboard hubspot to new UI ([#770](https://github.com/rudderlabs/rudder-config-schema/issues/770)) ([d40041a](https://github.com/rudderlabs/rudder-config-schema/commit/d40041a0b30e1e38564feaa32b6c408d496959be))
* trino UI config - update ([#876](https://github.com/rudderlabs/rudder-config-schema/issues/876)) ([9c6d5b4](https://github.com/rudderlabs/rudder-config-schema/commit/9c6d5b4cecf1cec326a00d01457bb0a29d3a3d75))


### Bug Fixes

* ac script schema ([#882](https://github.com/rudderlabs/rudder-config-schema/issues/882)) ([3efb3c7](https://github.com/rudderlabs/rudder-config-schema/commit/3efb3c7d8475391b0e4bdccc926aa263ff88569f))

### [1.47.2](https://github.com/rudderlabs/rudder-config-schema/compare/v1.47.1...v1.47.2) (2023-09-01)


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.47.2",
"version": "1.48.0",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion scripts/schemaGenerator.py
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ def generate_schema_properties(uiConfig, dbConfig, schemaObject, properties, nam
if generateFunction:
properties[field['configKey']] = generateFunction(
field, dbConfig, 'configKey')
if template.get('title', "") == "Initial setup" and is_field_present_in_default_config(field, dbConfig, "configKey"):
if template.get('title', "") == "Initial setup" and is_field_present_in_default_config(field, dbConfig, "configKey") and 'preRequisites' not in field:
schemaObject['required'].append(
field['configKey'])

Expand Down
13 changes: 11 additions & 2 deletions src/configurations/destinations/active_campaign/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"transformAtV1": "router",
"saveDestinationResponse": true,
"isAudienceSupported": true,
"includeKeys": ["oneTrustCookieCategories"],
"includeKeys": ["oneTrustCookieCategories", "connectionMode", "actid"],
"excludeKeys": [],
"supportedSourceTypes": [
"android",
Expand All @@ -22,8 +22,17 @@
"shopify"
],
"supportedMessageTypes": ["identify", "page", "screen", "track"],
"supportedConnectionModes": {
"web": ["cloud", "device", "hybrid"]
},
"hybridModeCloudEventsFilter": {
"web": {
"messageType": ["track", "screen", "identify"]
}
},
"destConfig": {
"defaultConfig": ["apiUrl", "apiKey", "eventKey", "actid", "oneTrustCookieCategories"]
"defaultConfig": ["apiUrl", "apiKey", "eventKey", "actid", "oneTrustCookieCategories"],
"web": ["useNativeSDK", "connectionMode"]
},
"secretKeys": ["apiKey", "eventKey", "actid"]
}
Expand Down
20 changes: 18 additions & 2 deletions src/configurations/destinations/active_campaign/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$"
},
"apiKey": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" },
"apiKey": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*"
},
"actid": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
Expand All @@ -28,7 +31,20 @@
}
}
}
},
"useNativeSDK": {
"type": "object",
"properties": {
"web": { "type": "boolean" }
}
},
"connectionMode": {
"type": "object",
"properties": {
"web": { "type": "string", "enum": ["cloud", "device", "hybrid"] }
}
}
}
},
"additionalProperties": true
}
}
200 changes: 135 additions & 65 deletions src/configurations/destinations/active_campaign/ui-config.json
Original file line number Diff line number Diff line change
@@ -1,70 +1,140 @@
{
"uiConfig": [
{
"title": "Connection Settings",
"uiConfig": {
"baseTemplate": [
{
"title": "Initial setup",
"note": "Review how this destination is set up",
"sections": [
{
"groups": [
{
"title": "Connection settings",
"note": "Update your connection settings here",
"icon": "settings",
"fields": [
{
"type": "textInput",
"label": "API Url",
"configKey": "apiUrl",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$",
"regexErrorMessage": "Invalid URL",
"required": true,
"placeholder": "e.g. https://accountname.api-us1.com",
"note": "Your API Access URL"
},
{
"type": "textInput",
"label": "API Key",
"configKey": "apiKey",
"regex": ".*",
"required": true,
"placeholder": "e.g. c59e3838caa934b535c1fd342dfds23452dfcccf95c16787304e7a0c0e8051b326451bb2",
"secret": true,
"footerNote": "Your API Access Key"
}
]
}
]
},
{
"groups": [
{
"title": "Connection mode",
"note": [
"Update how you want to route events from your source to destination. ",
{
"text": "Get help deciding",
"link": "https://www.rudderstack.com/docs/destinations/rudderstack-connection-modes/"
}
],
"icon": "sliders",
"fields": []
}
]
}
]
},
{
"title": "Configuration settings",
"note": "Manage the settings for your destination",
"sections": [
{
"title": "Destination settings",
"note": "Configure advanced destination-specific settings here",
"icon": "settings",
"groups": [
{
"title": "Event Settings",
"icon": "file",
"fields": [
{
"type": "textInput",
"label": "Event Key",
"configKey": "eventKey",
"regex": "^(.{0,100})$",
"regexErrorMessage": "Invalid Event Key",
"required": false,
"placeholder": "e.g. c2a856fddc721350dec4fbbc2e5c43a7ddfaaa03",
"secret": true,
"note": "Your Event Key"
},
{
"type": "textInput",
"label": "ActID",
"configKey": "actid",
"regex": "^(.{0,100})$",
"regexErrorMessage": "Invalid ActID",
"required": false,
"placeholder": "e.g. 276450567",
"secret": true,
"note": "Your ActId"
}
]
}
]
},
{
"title": "Other settings",
"note": "Configure advanced RudderStack features here",
"icon": "otherSettings",
"groups": [
{
"title": "OneTrust cookie consent settings",
"note": [
"Enter your OneTrust category names if you have them configured. ",
{
"text": "Learn more ",
"link": "https://www.rudderstack.com/docs/sources/event-streams/sdks/rudderstack-javascript-sdk/onetrust-consent-manager/"
},
"about RudderStack’s OneTrust Consent Manager feature."
],
"fields": [
{
"type": "tagInput",
"label": "Cookie category name",
"note": "Input your OneTrust category names by pressing ‘Enter’ after each entry",
"configKey": "oneTrustCookieCategories",
"tagKey": "oneTrustCookieCategory",
"placeholder": "e.g: Credit card visit",
"default": [
{
"oneTrustCookieCategory": ""
}
]
}
]
}
]
}
]
}
],
"sdkTemplate": {
"title": "SDK settings",
"note": "not visible in the ui",
"fields": [
{
"type": "textInput",
"label": "API Url",
"value": "apiUrl",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|(?!.*\\.ngrok\\.io)^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$",
"regexErrorMessage": "Invalid URL",
"required": true,
"placeholder": "e.g. https://accountname.api-us1.com",
"footerNote": "Your API Access URL"
},
{
"type": "textInput",
"label": "API Key",
"value": "apiKey",
"regex": ".*",
"required": true,
"placeholder": "e.g. c59e3838caa934b535c1fd342dfds23452dfcccf95c16787304e7a0c0e8051b326451bb2",
"secret": true,
"footerNote": "Your API Access Key"
},
{
"type": "textInput",
"label": "Event Key",
"value": "eventKey",
"regex": "^(.{0,100})$",
"regexErrorMessage": "Invalid Event Key",
"required": false,
"placeholder": "e.g. c2a856fddc721350dec4fbbc2e5c43a7ddfaaa03",
"secret": true,
"footerNote": "Your Event Key"
},
{
"type": "textInput",
"label": "ActID",
"value": "actid",
"regex": "^(.{0,100})$",
"regexErrorMessage": "Invalid ActID",
"required": false,
"placeholder": "e.g. 276450567",
"secret": true,
"footerNote": "Your ActId"
}
]
},
{
"title": "Consent Settings",
"fields": [
{
"type": "dynamicCustomForm",
"value": "oneTrustCookieCategories",
"label": "OneTrust Cookie Categories",
"customFields": [
{
"type": "textInput",
"placeholder": "Marketing",
"value": "oneTrustCookieCategory",
"label": "Category Name/ID",
"required": false
}
]
}
]
}
]
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"supportsVisualMapper": true,
"supportedMessageTypes": ["audiencelist"],
"isAudienceSupported": true,
"supportsBlankAudienceCreation": true,
"destConfig": {
"defaultConfig": [
"rudderAccountId",
Expand All @@ -30,6 +31,9 @@
"isHashRequired",
"typeOfList",
"oneTrustCookieCategories"
],
"cloud": [
"audienceId"
]
},
"secretKeys": []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
"type": "textInput",
"label": "List ID",
"value": "listId",
"value": "audienceId",
"regex": "^(.{1,100})$",
"regexErrorMessage": "Invalid Google remarketing list ID",
"required": true,
Expand Down
5 changes: 4 additions & 1 deletion src/configurations/destinations/hs/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
"cordova",
"shopify"
],
"supportedConnectionModes": {
"web": ["cloud", "device"]
},
"supportedMessageTypes": ["identify", "track"],
"destConfig": {
"defaultConfig": [
Expand All @@ -47,7 +50,7 @@
"doAssociation",
"oneTrustCookieCategories"
],
"web": ["useNativeSDK"]
"web": ["useNativeSDK", "connectionMode"]
},
"secretKeys": []
}
Expand Down
2 changes: 1 addition & 1 deletion src/configurations/destinations/hs/schema.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"configSchema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"required": [],
"required": ["authorizationType", "apiVersion"],
"type": "object",
"properties": {
"hubID": {
Expand Down
Loading

0 comments on commit 3f626d7

Please sign in to comment.