Skip to content

Commit bc3bfda

Browse files
committed
Merge branch 'develop' into sarahrudy-patch-6
2 parents 6994305 + c4d4ff4 commit bc3bfda

File tree

140 files changed

+7858
-31100
lines changed

Some content is hidden

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

140 files changed

+7858
-31100
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
(?:P|p)endo
1313
(?:P|p)odfile
1414
(?:P|p)ostgres
15+
(?:R|r)ealtime
1516
(?:R|r)emarketing
1617
(?:U|u)nlinks?\b
1718
(?:U|u)nmaps?\b

scripts/catalog_papi.js

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const slugify = (displayName) => {
2929
let override = slugOverrides[key].override
3030

3131
if (slug == original) {
32-
console.log(original+" -> "+override)
32+
console.log(original + " -> " + override)
3333
slug = override
3434
}
3535
}
@@ -144,6 +144,11 @@ const isCatalogItemHidden = (itemURL) => {
144144
}
145145
}
146146

147+
const sanitize = (text) => {
148+
const regex = /(<[^\/a].*?>)/ig;
149+
result = text.replace(regex, "`$1`")
150+
return result
151+
}
147152

148153
const updateSources = async () => {
149154
let sources = []
@@ -303,7 +308,7 @@ const updateSources = async () => {
303308
}, options);
304309
fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/source_categories.yml`), output);
305310

306-
311+
307312
// output = "# AUTOGENERATED LIST OF CONNECTIONS THAT SUPPORT REGIONAL\n"
308313
// output += "# Last updated " + todayDate + " \n";
309314
output = yaml.dump({
@@ -337,8 +342,8 @@ const updateDestinations = async () => {
337342
return 0;
338343
})
339344

340-
const regionalDestinationEndpoints= regionalSupport.destinations.endpoint
341-
const regionalDestinationRegions= regionalSupport.destinations.region
345+
const regionalDestinationEndpoints = regionalSupport.destinations.endpoint
346+
const regionalDestinationRegions = regionalSupport.destinations.region
342347

343348

344349
destinations.forEach(destination => {
@@ -354,7 +359,7 @@ const updateDestinations = async () => {
354359
if (regionalDestinationRegions.includes(slug)) {
355360
regions.push('eu')
356361
}
357-
362+
358363

359364
let url = `connections/destinations/catalog/${slug}`
360365

@@ -381,6 +386,12 @@ const updateDestinations = async () => {
381386
}
382387
return 0;
383388
})
389+
390+
settings.forEach(setting => {
391+
setting.description = sanitize(setting.description)
392+
});
393+
394+
384395
let actions = destination.actions
385396
let presets = destination.presets
386397

@@ -394,6 +405,13 @@ const updateDestinations = async () => {
394405
return clonedObj;
395406
};
396407

408+
409+
// Force screen method into supportedMethods object
410+
destination.supportedMethods.screen = false
411+
// Set it true for LiveLike, per request
412+
if (destination.id == '63e42b47479274407b671071') {
413+
destination.supportedMethods.screen = true
414+
}
397415
destination.supportedMethods = renameKey(destination.supportedMethods, 'pageview', 'page')
398416

399417
let updatedDestination = {
@@ -487,7 +505,7 @@ const updateDestinations = async () => {
487505
}, {
488506
noArrayIndent: false
489507
})
490-
fs.appendFileSync(path.resolve(__dirname,`../src/_data/catalog/regional-supported.yml`),output);
508+
fs.appendFileSync(path.resolve(__dirname, `../src/_data/catalog/regional-supported.yml`), output);
491509
console.log("destinations done")
492510
}
493511

@@ -574,10 +592,9 @@ const updateWarehouses = async () => {
574592
}, {
575593
noArrayIndent: false
576594
})
577-
fs.writeFileSync(path.resolve(__dirname,`../src/_data/catalog/regional-supported.yml`),output);
595+
fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/regional-supported.yml`), output);
578596
console.log("warehouses done")
579597
}
580598
updateWarehouses()
581599
updateSources()
582600
updateDestinations()
583-

scripts/private-destination.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,24 @@ const getDestinationData = async (id) => {
7070
let actions = destination.actions
7171
let presets = destination.presets
7272

73+
// Force screen method into supportedMethods object
74+
destination.supportedMethods.screen = false
75+
// Set it true for LiveLike, per request
76+
if (destination.id == '63e42b47479274407b671071'){
77+
destination.supportedMethods.screen = true
78+
}
79+
80+
const clone = (obj) => Object.assign({}, obj)
81+
const renameKey = (object, key, newKey) => {
82+
const clonedObj = clone(object);
83+
const targetKey = clonedObj[key];
84+
delete clonedObj[key];
85+
86+
clonedObj[newKey] = targetKey;
87+
return clonedObj;
88+
};
7389

90+
destination.supportedMethods = renameKey(destination.supportedMethods, 'pageview', 'page')
7491

7592
let updatePrivateDest = {
7693
id: destination.id,

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-01-19
2+
# destination categories last updated 2023-02-23
33
items:
44
- display_name: A/B Testing
55
slug: a-b-testing

0 commit comments

Comments
 (0)