Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(INT-649): move intercom to new ui #907

Closed
wants to merge 8 commits into from
Closed

feat(INT-649): move intercom to new ui #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
784f34a
feat(intercom): move intercom to new ui
mihir-4116 Sep 15, 2023
e821758
Merge branch 'develop' into feat.intercom_new_ui
mihir-4116 Sep 19, 2023
5e1ba0c
Merge branch 'develop' into feat.intercom_new_ui
mihir-4116 Sep 22, 2023
9114b6a
Merge branch 'develop' into feat.intercom_new_ui
mihir-4116 Sep 25, 2023
508baf2
chore: pr conflicts resolved
mihir-4116 Sep 26, 2023
968af36
chore: code review changes
mihir-4116 Sep 26, 2023
da2fa1d
fix(intercom): test cases
mihir-4116 Sep 26, 2023
3567fec
Merge branch 'develop' into feat.intercom_new_ui
mihir-4116 Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions src/configurations/destinations/intercom/db-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"blacklistedEvents",
"whitelistedEvents",
"oneTrustCookieCategories",
"eventFilteringOption",
"updateLastRequestAt"
"eventFilteringOption"
],
"excludeKeys": [],
"supportedSourceTypes": [
Expand All @@ -32,21 +31,36 @@
"shopify"
],
"supportedMessageTypes": ["identify", "track", "group"],
"supportedConnectionModes": {
"web": [
"cloud",
"device"
],
"android": [
"cloud",
"device"
],
"ios": [
"cloud",
"device"
]
},
"destConfig": {
"defaultConfig": [
"apiKey",
"accessToken",
"appId",
"collectContext",
"apiServer",
"sendAnonymousId",
"mobileApiKeyIOS",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need mobileApiKeyAndroid and mobileApiKeyIOS in cloud mode?

Also updateLastRequestAt is removed is it not needed anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it's not needed anymore in new version

"blacklistedEvents",
"whitelistedEvents",
"mobileApiKeyAndroid",
"eventFilteringOption",
"oneTrustCookieCategories",
"updateLastRequestAt"
"oneTrustCookieCategories"
],
"android": ["useNativeSDK", "mobileApiKeyAndroid"],
"ios": ["useNativeSDK", "mobileApiKeyIOS"],
"web": ["useNativeSDK"]
"android": ["useNativeSDK", "mobileApiKeyAndroid", "connectionMode"],
"ios": ["useNativeSDK", "mobileApiKeyIOS", "connectionMode"],
"web": ["useNativeSDK","appId", "connectionMode"]
},
"secretKeys": []
}
Expand Down
73 changes: 46 additions & 27 deletions src/configurations/destinations/intercom/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,34 @@
{
"configSchema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"required": ["apiKey", "appId"],
"required": ["accessToken", "apiServer"],
"type": "object",
"properties": {
"apiKey": {
"accessToken": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$"
},
"apiServer": {
"type": "string",
"enum": ["standard", "eu", "au"],
"default": "standard"
},
"appId": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
},
"mobileApiKeyAndroid": {
"type": "object",
"properties": {
"android": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
}
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
},
"mobileApiKeyIOS": {
"type": "object",
"properties": {
"ios": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
}
}
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
},
"useNativeSDK": {
"type": "object",
"properties": {
"android": { "type": "boolean" },
"ios": { "type": "boolean" },
"web": { "type": "boolean" }
}
"sendAnonymousId": {
"type": "boolean",
"default": false
},
"collectContext": { "type": "boolean", "default": false },
"sendAnonymousId": { "type": "boolean", "default": false },
"updateLastRequestAt": { "type": "boolean", "default": true },
"eventFilteringOption": {
"type": "string",
"enum": ["disable", "whitelistedEvents", "blacklistedEvents"],
Expand Down Expand Up @@ -81,6 +69,37 @@
}
}
}
},
"useNativeSDK": {
"type": "object",
"properties": {
"android": {
"type": "boolean"
},
"ios": {
"type": "boolean"
},
"web": {
"type": "boolean"
}
}
},
"connectionMode": {
"type": "object",
"properties": {
"android": {
"type": "string",
"enum": ["cloud", "device"]
},
"ios": {
"type": "string",
"enum": ["cloud", "device"]
},
"web": {
"type": "string",
"enum": ["cloud", "device"]
}
}
}
}
}
Expand Down
Loading
Loading