Skip to content

Commit

Permalink
Merge branch 'develop' into feat.hs-newUI
Browse files Browse the repository at this point in the history
  • Loading branch information
ujjwal-ab authored Jul 21, 2023
2 parents bb4e149 + 34bb15f commit 3f241e5
Show file tree
Hide file tree
Showing 60 changed files with 570 additions and 404 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

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.42.2](https://github.com/rudderlabs/rudder-config-schema/compare/v1.42.1...v1.42.2) (2023-07-19)

### [1.42.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.42.0...v1.42.1) (2023-07-14)


### Bug Fixes

* updates klaviyo image ([812ff8a](https://github.com/rudderlabs/rudder-config-schema/commit/812ff8a76f5b0d9bafe60e8e01dcb16fe7b1d06a))

## [1.42.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.41.0...v1.42.0) (2023-07-13)


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.42.0",
"version": "1.42.2",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
"excludeKeys": [],
"supportedSourceTypes": ["cloud", "warehouse"],
"supportedMessageTypes": ["audiencelist"],
"syncBehaviours": [
"mirror"
],
"disableJsonMapper": true,
"isAudienceSupported": true,
"destConfig": {
"defaultConfig": [
"rudderAccountId",
Expand Down
37 changes: 28 additions & 9 deletions src/configurations/destinations/engage/schema.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,40 @@
{
"configSchema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"required": ["publicKey", "privateKey"],
"type": "object",
"properties": {
"publicKey": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$"
"publicKey": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" },
"privateKey": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*" },
"listIds": {
"type": "array",
"items": {
"type": "object",
"properties": {
"listID": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
}
}
},
"privateKey": {
"useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } },
"eventFilteringOption": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$"
"enum": ["disable", "whitelistedEvents", "blacklistedEvents"],
"default": "disable"
},
"listIds": {
"whitelistedEvents": {
"type": "array",
"items": { "type": "object", "properties": { "listID": { "type": "string" } } }
"items": {
"type": "object",
"properties": {
"eventName": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
}
}
},
"blacklistedEvents": {
"type": "array",
Expand All @@ -28,7 +48,6 @@
}
}
},
"useNativeSDK": { "type": "object", "properties": { "web": { "type": "boolean" } } },
"oneTrustCookieCategories": {
"type": "array",
"items": {
Expand Down
8 changes: 6 additions & 2 deletions src/configurations/destinations/engage/ui-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"label": "Public Key",
"value": "publicKey",
"required": true,
"regex": ".*",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*",
"placeholder": "e.g: kjwehfr8734rtg43bf34ty849rhf98",
"footerNote": "Enter Public Key which will be used as username for authentication."
},
Expand All @@ -17,7 +17,7 @@
"label": "Private Key",
"value": "privateKey",
"required": true,
"regex": ".*",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*",
"secret": true,
"placeholder": "e.g. b4a29aba5e75dkjc8a18acd921e2e",
"footerNote": "Enter the Private Key which will be used as Password for authentication. It is set as required to access the API's such as user deletion and update user's email."
Expand All @@ -36,6 +36,7 @@
"type": "textInput",
"placeholder": "893bt6dg93n5t5v45t43c",
"value": "listID",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"label": "List ID",
"required": false
}
Expand Down Expand Up @@ -90,6 +91,7 @@
{
"type": "textInput",
"value": "eventName",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"required": false,
"placeholder": "e.g: Anonymous Page Visit"
}
Expand All @@ -103,6 +105,7 @@
{
"type": "textInput",
"value": "eventName",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"required": false,
"placeholder": "e.g: Credit Card Added"
}
Expand All @@ -122,6 +125,7 @@
"type": "textInput",
"placeholder": "Marketing",
"value": "oneTrustCookieCategory",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"label": "Category Name/ID",
"required": false
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"configSchema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"required": ["accessToken", "eventsToStandard", "eventsToIds"],
"type": "object",
"required": ["accessToken"],
"properties": {
"accessToken": {
"type": "string",
Expand All @@ -19,7 +19,18 @@
},
"to": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
"enum": [
"ViewContent",
"Search",
"AddToCart",
"AddToWishlist",
"InitiateCheckout",
"AddPaymentInfo",
"Purchase",
"Lead",
"CompleteRegistration",
"Other"
]
}
}
}
Expand All @@ -31,7 +42,18 @@
"properties": {
"from": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
"enum": [
"ViewContent",
"Search",
"AddToCart",
"AddToWishlist",
"InitiateCheckout",
"AddPaymentInfo",
"Purchase",
"Lead",
"CompleteRegistration",
"Other"
]
},
"to": {
"type": "string",
Expand Down Expand Up @@ -60,7 +82,8 @@
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
},
"isHashRequired": { "type": "boolean" },
"limitedDataUSage": { "type": "boolean" },
"isHashRequired": { "type": "boolean", "default": true },
"oneTrustCookieCategories": {
"type": "array",
"items": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "textInput",
"label": "System User Access Token",
"value": "accessToken",
"regex": "^(.{0,220})$",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,220})$",
"regexErrorMessage": "Invalid Business Access Token",
"required": true,
"secret": true,
Expand Down Expand Up @@ -84,6 +84,7 @@
"label": "Value Field Identifier",
"value": "valueFieldIdentifier",
"required": false,
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"placeholder": "e.g: properties.value",
"default": "properties.value"
}
Expand Down
7 changes: 2 additions & 5 deletions src/configurations/destinations/freshmarketer/schema.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"configSchema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"required": ["apiKey", "domain"],
"type": "object",
"properties": {
"apiKey": {
"type": "string",
Expand All @@ -21,10 +21,7 @@
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
},
"to": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
"to": { "type": "string", "enum": ["sales_activity", "lifecycle_stage", ""] }
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/configurations/destinations/freshmarketer/ui-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "textInput",
"label": "API Key",
"value": "apiKey",
"regex": ".*",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"required": true,
"placeholder": "e.g. b4a29aba5e75dkjc8a18acd921e2e",
"secret": true
Expand All @@ -16,7 +16,7 @@
"type": "textInput",
"label": "Domain",
"value": "domain",
"regex": ".*",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"required": true,
"placeholder": "e.g. mycompany-1234",
"secret": false
Expand Down
7 changes: 2 additions & 5 deletions src/configurations/destinations/freshsales/schema.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"configSchema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"required": ["apiKey", "domain"],
"type": "object",
"properties": {
"apiKey": {
"type": "string",
Expand All @@ -21,10 +21,7 @@
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
},
"to": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
"to": { "type": "string", "enum": ["sales_activity", "lifecycle_stage", ""] }
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/configurations/destinations/freshsales/ui-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "textInput",
"label": "API Key",
"value": "apiKey",
"regex": ".*",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"required": true,
"placeholder": "e.g. b4a29aba5e75dkjc8a18acd921e2e",
"secret": true
Expand All @@ -16,7 +16,7 @@
"type": "textInput",
"label": "Domain",
"value": "domain",
"regex": ".*",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"required": true,
"placeholder": "e.g. mycompany-1234",
"secret": false
Expand Down
Loading

0 comments on commit 3f241e5

Please sign in to comment.