Merge branch 'master' into Remove-beta-note

Author: rchinn1

scripts/catalog_papi.js

@@ -15,7 +15,7 @@ const regionalSupport = yaml.load(fs.readFileSync(path.resolve(__dirname, `../sr
 const slugOverrides = yaml.load(fs.readFileSync(path.resolve(__dirname, `../src/_data/catalog/slugs.yml`)))
 
 
-const slugify = (displayName) => {
+const slugify = (displayName, type) => {
   let slug = displayName
     .toLowerCase()
     .replace(/\s+/g, '-')
@@ -24,16 +24,24 @@ const slugify = (displayName) => {
     .replace(/[\(\)]/g, '')
     .replace('.', '-')
 
-  for (key in slugOverrides) {
-    let original = slugOverrides[key].original
-    let override = slugOverrides[key].override
+  let overrides = ""
+  if (type == "sources") {
+    overrides = slugOverrides.sources
+  } 
+
+  if (type == "destinations") {
+    overrides = slugOverrides.destinations
+  } 
+
+  for (key in overrides) {
+    let original = overrides[key].original
+    let override = overrides[key].override
 
     if (slug == original) {
       console.log(original + " -> " + override)
       slug = override
     }
   }
-
   return slug
 }
 
@@ -120,7 +128,7 @@ const getConnectionModes = (destination) => {
       connectionModes.cloud.server = true
     }
   }
- 
+
   return connectionModes
 }
 
@@ -208,7 +216,7 @@ const updateSources = async () => {
   const regionalSourceRegion = regionalSupport.sources.region
 
   sources.forEach(source => {
-    let slug = slugify(source.name)
+    let slug = slugify(source.name, "sources")
     let settings = source.options
     let hidden = false
     let regions = ['us']
@@ -362,14 +370,14 @@ const updateDestinations = async () => {
     let endpoints = []
     let regions = []
 
-    let slug = slugify(destination.name)
-    
+    let slug = slugify(destination.name, "destinations")
+
     if (typeof destination.supportedRegions != "undefined") {
       regions = destination.supportedRegions
     } else {
-      regions.push('us-west-2','eu-west-1')
+      regions.push('us-west-2', 'eu-west-1')
     }
-    if (typeof destination.regionEndpoints != "undefined"){
+    if (typeof destination.regionEndpoints != "undefined") {
       endpoints = destination.regionEndpoints
     } else {
       endpoints.push('US')
@@ -418,7 +426,7 @@ const updateDestinations = async () => {
       return clonedObj;
     };
 
-    
+
     // Force screen method into supportedMethods object
     destination.supportedMethods.screen = false
     // Set it true for LiveLike, per request

scripts/private-destination.js

@@ -47,7 +47,7 @@ const getCatalog = async (url, page_token = "MA==") => {
   }
 }
 
-const slugify = (displayName) => {
+const slugify = (displayName, type) => {
   let slug = displayName
     .toLowerCase()
     .replace(/\s+/g, '-')
@@ -56,15 +56,24 @@ const slugify = (displayName) => {
     .replace(/[\(\)]/g, '')
     .replace('.', '-')
 
-  for (key in slugOverrides) {
-    let original = slugOverrides[key].original
-    let override = slugOverrides[key].override
+  let overrides = ""
+  if (type == "sources") {
+    overrides = slugOverrides.sources
+  } 
+
+  if (type == "destinations") {
+    overrides = slugOverrides.destinations
+  } 
+
+  for (key in overrides) {
+    let original = overrides[key].original
+    let override = overrides[key].override
 
     if (slug == original) {
+      console.log(original + " -> " + override)
       slug = override
     }
   }
-
   return slug
 }
 
@@ -111,7 +120,7 @@ const getDestinationData = async (id) => {
   })
   let actions = destination.actions
   let presets = destination.presets
-  let slug = slugify(destination.name)
+  let slug = slugify(destination.name, "destinations")
   let url = `connections/destinations/catalog/${slug}`
 
   // Force screen method into supportedMethods object
@@ -137,7 +146,7 @@ const getDestinationData = async (id) => {
     id: destination.id,
     display_name: destination.name,
     name: destination.name,
-    slug: slugify(destination.name),
+    slug: slugify(destination.name, "destinations"),
     previous_names: destination.previousNames,
     url,
     website: destination.website,
@@ -194,7 +203,7 @@ const checkExistingStatus = async () => {
     let id = existingIds[i]
     let destination = await checkDestinationStatus(id)
     let status = destination.status
-    let slug = slugify(destination.name)
+    let slug = slugify(destination.name, "destinations")
     let url = `connections/destinations/catalog/${slug}`
 
 

src/_data/catalog/destination_categories.yml

@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
-# destination categories last updated 2023-04-25 
+# destination categories last updated 2023-04-27 
 items:
 - display_name: A/B Testing
   slug: a-b-testing