Skip to content

Commit beac220

Browse files
Merge branch 'develop' into jfoskin-patch-2
2 parents 1d72cbf + a2fefa4 commit beac220

File tree

236 files changed

+11466
-3815
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+11466
-3815
lines changed

.github/styles/Vocab/Docs/accept.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Aampe
2222
adset
2323
Adwords
2424
Aircall
25+
Airdat(?:e|es)
2526
Algolia
2627
allowlist
2728
Amberflo
@@ -38,17 +39,21 @@ blocklist
3839
Bluedot
3940
bool
4041
boolean
42+
Braze's
4143
Breyta
4244
Chargebee
4345
chatbot
4446
cli
4547
CloudFront
4648
Cocoapods
49+
comScore
4750
Contentful
51+
Cordova
4852
Criteo
4953
csv
5054
Databricks
5155
datetime
56+
debouncing
5257
deeplink
5358
Dev
5459
Doubleclick
@@ -99,6 +104,7 @@ Marketo
99104
Matcha
100105
matchers
101106
measurability
107+
Metrix
102108
middleware
103109
Middleware
104110
Mixpanel
@@ -122,6 +128,7 @@ performant
122128
Pinterest
123129
Pipedrive
124130
Preact
131+
Proguard
125132
Qualtrics
126133
reformat(:?s)
127134
remarket

CODEOWNERS

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,48 +25,26 @@ CODEOWNERS @segmentio/segment-doc-team
2525

2626

2727
# Destinations owners
28-
/src/connections/destinations @stayseesong @markzegarelli
28+
# /src/connections/destinations @stayseesong @markzegarelli
2929

3030
# Stratconn
3131
## Adobe
32-
/src/connections/destinations/catalog/adobe-analytics/ @kdaswani
33-
/src/connections/destinations/catalog/actions-adobe-target-web/ @kdaswani
34-
/src/connections/destinations/catalog/actions-adobe-target-cloud/ @kdaswani
35-
/src/connections/destinations/catalog/marketo-v2/ @kdaswani
36-
/src/connections/destinations/catalog/marketo-static-lists/ @kdaswani
32+
3733

3834
## Facebook
39-
/src/connections/destinations/catalog/facebook-pixel/ @kdaswani
40-
/src/connections/destinations/catalog/actions-facebook-conversions-api/ @kdaswani
41-
/src/connections/destinations/catalog/facebook-app-events/ @kdaswani
42-
/src/connections/destinations/catalog/facebook-offline-conversions/ @kdaswani
43-
/src/connections/destinations/catalog/personas-facebook-custom-audiences/ @kdaswani
35+
4436

4537
## Google
46-
/src/connections/destinations/catalog/firebase/ @kdaswani
47-
/src/connections/destinations/catalog/google-analytics/ @kdaswani
48-
/src/connections/destinations/catalog/actions-google-analytics-4/ @kdaswani
49-
/src/connections/destinations/catalog/google-tag-manager/ @kdaswani
50-
/src/connections/destinations/catalog/actions-google-enhanced-conversions/ @kdaswani
51-
/src/connections/destinations/catalog/doubleclick-floodlight/ @kdaswani
52-
/src/connections/destinations/catalog/google-ads-classic/ @kdaswani
53-
/src/connections/destinations/catalog/google-ads-gtag/ @kdaswani
54-
/src/connections/destinations/catalog/google-cloud-function/ @kdaswani
55-
/src/connections/destinations/catalog/google-cloud-pubsub/ @kdaswani
56-
/src/connections/destinations/catalog/adwords-remarketing-lists/ @kdaswani
57-
/src/connections/destinations/catalog/personas-display-video-360/ @kdaswani
38+
5839

5940
## Salesforce
60-
/src/connections/destinations/catalog/salesforce/ @kdaswani
61-
/src/connections/destinations/catalog/actions-salesforce/ @kdaswani
62-
/src/connections/destinations/catalog/salesforce-marketing-cloud/ @kdaswani
63-
/src/connections/destinations/catalog/pardot/ @kdaswani
41+
6442

6543
# Engage
6644
/src/engage/ @markzegarelli @pwseg @rchinn-segment
6745

68-
# Personas owners
69-
/src/personas @pwseg @rchinn-segent
46+
# Unify
47+
/src/unify @rchinn-segment
7048

7149
# Protocols owners
7250
/src/protocols @forstisabella

scripts/catalog_papi.js

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const regionalSupport = yaml.load(fs.readFileSync(path.resolve(__dirname, `../sr
1515
const slugOverrides = yaml.load(fs.readFileSync(path.resolve(__dirname, `../src/_data/catalog/slugs.yml`)))
1616

1717

18-
const slugify = (displayName) => {
18+
const slugify = (displayName, type) => {
1919
let slug = displayName
2020
.toLowerCase()
2121
.replace(/\s+/g, '-')
@@ -24,16 +24,24 @@ const slugify = (displayName) => {
2424
.replace(/[\(\)]/g, '')
2525
.replace('.', '-')
2626

27-
for (key in slugOverrides) {
28-
let original = slugOverrides[key].original
29-
let override = slugOverrides[key].override
27+
let overrides = ""
28+
if (type == "sources") {
29+
overrides = slugOverrides.sources
30+
}
31+
32+
if (type == "destinations") {
33+
overrides = slugOverrides.destinations
34+
}
35+
36+
for (key in overrides) {
37+
let original = overrides[key].original
38+
let override = overrides[key].override
3039

3140
if (slug == original) {
3241
console.log(original + " -> " + override)
3342
slug = override
3443
}
3544
}
36-
3745
return slug
3846
}
3947

@@ -120,7 +128,7 @@ const getConnectionModes = (destination) => {
120128
connectionModes.cloud.server = true
121129
}
122130
}
123-
131+
124132
return connectionModes
125133
}
126134

@@ -208,7 +216,7 @@ const updateSources = async () => {
208216
const regionalSourceRegion = regionalSupport.sources.region
209217

210218
sources.forEach(source => {
211-
let slug = slugify(source.name)
219+
let slug = slugify(source.name, "sources")
212220
let settings = source.options
213221
let hidden = false
214222
let regions = ['us']
@@ -274,6 +282,7 @@ const updateSources = async () => {
274282
let updatedRegional = {
275283
id: source.id,
276284
display_name: source.name,
285+
hidden: isCatalogItemHidden(url),
277286
slug,
278287
url,
279288
regions,
@@ -361,14 +370,14 @@ const updateDestinations = async () => {
361370
let endpoints = []
362371
let regions = []
363372

364-
let slug = slugify(destination.name)
365-
373+
let slug = slugify(destination.name, "destinations")
374+
366375
if (typeof destination.supportedRegions != "undefined") {
367376
regions = destination.supportedRegions
368377
} else {
369-
regions.push('us-west-2','eu-west-1')
378+
regions.push('us-west-2', 'eu-west-1')
370379
}
371-
if (typeof destination.regionEndpoints != "undefined"){
380+
if (typeof destination.regionEndpoints != "undefined") {
372381
endpoints = destination.regionEndpoints
373382
} else {
374383
endpoints.push('US')
@@ -417,7 +426,7 @@ const updateDestinations = async () => {
417426
return clonedObj;
418427
};
419428

420-
429+
421430
// Force screen method into supportedMethods object
422431
destination.supportedMethods.screen = false
423432
// Set it true for LiveLike, per request

scripts/private-destination.js

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const getCatalog = async (url, page_token = "MA==") => {
4747
}
4848
}
4949

50-
const slugify = (displayName) => {
50+
const slugify = (displayName, type) => {
5151
let slug = displayName
5252
.toLowerCase()
5353
.replace(/\s+/g, '-')
@@ -56,15 +56,24 @@ const slugify = (displayName) => {
5656
.replace(/[\(\)]/g, '')
5757
.replace('.', '-')
5858

59-
for (key in slugOverrides) {
60-
let original = slugOverrides[key].original
61-
let override = slugOverrides[key].override
59+
let overrides = ""
60+
if (type == "sources") {
61+
overrides = slugOverrides.sources
62+
}
63+
64+
if (type == "destinations") {
65+
overrides = slugOverrides.destinations
66+
}
67+
68+
for (key in overrides) {
69+
let original = overrides[key].original
70+
let override = overrides[key].override
6271

6372
if (slug == original) {
73+
console.log(original + " -> " + override)
6474
slug = override
6575
}
6676
}
67-
6877
return slug
6978
}
7079

@@ -111,7 +120,7 @@ const getDestinationData = async (id) => {
111120
})
112121
let actions = destination.actions
113122
let presets = destination.presets
114-
let slug = slugify(destination.name)
123+
let slug = slugify(destination.name, "destinations")
115124
let url = `connections/destinations/catalog/${slug}`
116125

117126
// Force screen method into supportedMethods object
@@ -137,7 +146,7 @@ const getDestinationData = async (id) => {
137146
id: destination.id,
138147
display_name: destination.name,
139148
name: destination.name,
140-
slug: slugify(destination.name),
149+
slug: slugify(destination.name, "destinations"),
141150
previous_names: destination.previousNames,
142151
url,
143152
website: destination.website,
@@ -194,7 +203,7 @@ const checkExistingStatus = async () => {
194203
let id = existingIds[i]
195204
let destination = await checkDestinationStatus(id)
196205
let status = destination.status
197-
let slug = slugify(destination.name)
206+
let slug = slugify(destination.name, "destinations")
198207
let url = `connections/destinations/catalog/${slug}`
199208

200209

src/_data/catalog/destination_categories.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
2-
# destination categories last updated 2023-04-13
2+
# destination categories last updated 2023-05-09
33
items:
44
- display_name: A/B Testing
55
slug: a-b-testing

0 commit comments

Comments
 (0)