fix conflict

markzegarelli · markzegarelli · commit b08d3a40a10e · 2022-12-14T15:21:09.000-08:00
diff --git a/scripts/private-destination.js b/scripts/private-destination.js
@@ -20,8 +20,9 @@ const PRIVATE_DESTINATIONS = yaml.load(fs.readFileSync(path.resolve(__dirname, `
 const privateDests = PRIVATE_DESTINATIONS.items
 let private = []
 const getCatalog = async (url, page_token = "MA==") => {
+  let res = null
   try {
-    const res = await axios.get(url, {
+    res = await axios.get(url, {
       headers: {
         'Content-Type': 'application/json',
         'Authorization': `Bearer ${process.env.PAPI_TOKEN}`
@@ -33,10 +34,14 @@ const getCatalog = async (url, page_token = "MA==") => {
         }
       }
     });
-
     return res.data
-  } catch (error) {
-    console.log(error)
+  } catch (err) {
+    console.error("Error response:");
+    console.error(err.response.data);    // ***
+    console.error(err.response.status);  // ***
+    console.error(err.response.headers); // ***
+  } finally {
+    
   }
 }
 
@@ -48,6 +53,9 @@ const checkDestinationStatus = async (id) => {
 }
 const getDestinationData = async (id) => {
   const res = await getCatalog(`${PAPI_URL}/catalog/destinations/${id}`)
+  if (res == null) {
+    return
+  } 
   let destination = res.data.destinationMetadata
   let settings = destination.options
   settings.sort((a, b) => {
diff --git a/src/_data/catalog/destinations_private.yml b/src/_data/catalog/destinations_private.yml
@@ -1998,6 +1998,180 @@ items:
         name: Track Page
         fields: {}
         trigger: type = "page"
+  - id: 638f843c4520d424f63c9e51
+    display_name: CommandBar
+    name: CommandBar
+    slug: actions-commandbar
+    previous_names:
+      - CommandBar
+    website: http://www.commandbar.com
+    status: PRIVATE_BETA
+    logo:
+      url: https://cdn.filepicker.io/api/file/Df2gL4P0Tb6FOBaH7MPg
+    mark:
+      url: https://cdn.filepicker.io/api/file/dB22XUsaSX2Afop9R1vk
+    methods:
+      track: true
+      pageview: true
+      identify: true
+      group: true
+      alias: true
+    platforms:
+      browser: true
+      mobile: false
+      server: false
+      warehouse: false
+    components: []
+    browserUnbundlingSupported: false
+    browserUnbundlingPublic: false
+    replay: false
+    settings:
+      - name: deploy
+        type: boolean
+        defaultValue: false
+        description: >-
+          If enabled, CommandBar will be deployed to your site automatically and
+          you can remove the snippet from your source code.
+        required: true
+        label: Deploy via Segment
+      - name: orgId
+        type: string
+        defaultValue: ''
+        description: The ID of your CommandBar organization.
+        required: true
+        label: Organization ID
+    actions:
+      - id: 5cVhYfBJYs4sCSvLLoahGc
+        name: Track Event
+        slug: trackEvent
+        description: Submit an event's properties as CommandBar metaData.
+        platform: WEB
+        hidden: false
+        defaultTrigger: type = "track"
+        fields:
+          - id: 9pmubBefRct4eJvnSqTJHR
+            sortOrder: 0
+            fieldKey: event_name
+            label: Event Name
+            type: STRING
+            description: The name of the event.
+            placeholder: ''
+            defaultValue:
+              '@path': $.event
+            required: true
+            multiple: false
+            choices: null
+            dynamic: false
+            allowNull: false
+          - id: 7qr1J7XrvSFGcH9zLXwbpZ
+            sortOrder: 1
+            fieldKey: event_metadata
+            label: Event Metadata
+            type: OBJECT
+            description: Optional metadata describing the event.
+            placeholder: ''
+            defaultValue:
+              '@path': $.properties
+            required: false
+            multiple: false
+            choices: null
+            dynamic: false
+            allowNull: false
+      - id: pvLKevrkEtiUZX3ej5FX8j
+        name: Identify User
+        slug: identifyUser
+        description: >-
+          Set attributes for the user in CommandBar. If "Deploy via Segment" is
+          enabled, then also boot CommandBar for the user, which makes
+          CommandBar available to the user.
+        platform: WEB
+        hidden: false
+        defaultTrigger: type = "identify"
+        fields:
+          - id: hKTrpnhQGq971DN41bTxwo
+            sortOrder: 0
+            fieldKey: userId
+            label: User ID
+            type: STRING
+            description: The user's id
+            placeholder: ''
+            defaultValue:
+              '@path': $.userId
+            required: true
+            multiple: false
+            choices: null
+            dynamic: false
+            allowNull: false
+          - id: 5s6K64KCtWEicWtPLNEHLC
+            sortOrder: 1
+            fieldKey: hmac
+            label: HMAC
+            type: STRING
+            description: >-
+              Identify users with an HMAC of their user ID; this enables end
+              user customizable shortcuts and other features. [Learn about
+              identity
+              verification](https://app.commandbar.com/identity-verification).
+            placeholder: ''
+            defaultValue:
+              '@path': $.context.CommandBar.hmac
+            required: false
+            multiple: false
+            choices: null
+            dynamic: false
+            allowNull: false
+          - id: vxinbjJzUTff8CgP6nsdFk
+            sortOrder: 2
+            fieldKey: formFactor
+            label: Event Metadata
+            type: OBJECT
+            description: >-
+              Configures the way the bar is displayed. An 'inline' bar is always
+              visible and hosted within an element on your page. A 'modal' bar
+              will display in a modal dialog when open.
+            placeholder: ''
+            defaultValue:
+              '@path': $.context.CommandBar.formFactor
+            required: false
+            multiple: false
+            choices: null
+            dynamic: false
+            allowNull: false
+          - id: 3s9a5HaavqtKeaBzrmUE49
+            sortOrder: 3
+            fieldKey: traits
+            label: Traits
+            type: OBJECT
+            description: The Segment traits to be forwarded to CommandBar
+            placeholder: ''
+            defaultValue:
+              '@path': $.traits
+            required: false
+            multiple: false
+            choices: null
+            dynamic: false
+            allowNull: false
+    presets:
+      - actionId: 5cVhYfBJYs4sCSvLLoahGc
+        name: Track Event
+        fields:
+          event_name:
+            '@path': $.event
+          event_metadata:
+            '@path': $.properties
+        trigger: type = "track"
+      - actionId: pvLKevrkEtiUZX3ej5FX8j
+        name: Identify User
+        fields:
+          userId:
+            '@path': $.userId
+          hmac:
+            '@path': $.context.CommandBar.hmac
+          formFactor:
+            '@path': $.context.CommandBar.formFactor
+          traits:
+            '@path': $.traits
+        trigger: type = "identify"
   - id: 63913b2bf906ea939f153851
     display_name: Ripe
     name: Ripe
diff --git a/src/connections/destinations/catalog/actions-commandbar/index.md b/src/connections/destinations/catalog/actions-commandbar/index.md
@@ -0,0 +1,31 @@
+---
+title: CommandBar Destination
+hide-boilerplate: true
+hide-dossier: true
+private: true
+hidden: true
+id: 638f843c4520d424f63c9e51
+---
+
+[CommandBar](https://www.commandbar.com){:target="_blank"} gives your users a searchable index of your app's features and content, as well as customizable in-app components, like onboarding nudges. This helps you to better understand user intent and deliver step-change improvements in UX, for new and power users alike. By connecting Segment to CommandBar as a destination, you can trigger nudges and customize CommandBar functionality based on user events and user attributes. The integration also allows you to deploy CommandBar to your users.
+
+To configure CommandBar as an Event Source to get data into your warehouse or other downstream tools, see the [CommandBar Source](/docs/connections/sources/catalog/cloud-apps/commandbar/) documentation.
+
+{% include content/ajs-upgrade.md %}
+
+
+## Getting started
+
+1. From the Segment web app, navigate to **Connections > Catalog**, then select the **Destinations** tab at the top of the catalog.
+2. Search for *CommandBar* and select it.
+3. Click **Configure CommandBar**.
+4. Sign in to [CommandBar](app.commandbar.com/login){:target="_blank"}, click on your organization name in the top right, and copy the `Org ID` into **Organization ID** field.
+5. If you want to deploy CommandBar to your users through Segment, check **Deploy via Segment**.
+6. Select an existing Source to connect to CommandBar.
+7. Once connected, remove the CommandBar snippet or `init` call from your code (if you have one).
+
+<!-- The line below renders a table of connection settings (if applicable), Pre-built Mappings, and available actions. -->
+
+{% include components/actions-fields.html %}
+
+
diff --git a/src/connections/destinations/catalog/actions-google-analytics-4/index.md b/src/connections/destinations/catalog/actions-google-analytics-4/index.md
@@ -77,31 +77,38 @@ To send parameters to Google Analytics 4, use the Event Parameters or User Prope
 To achieve parity with Universal Analytics, you should create the same custom dimensions that you defined in Universal Analytics. Additionally, in Google Analytics 4, you should recreate many of the values that you tracked as event dimensions in Universal Analytics, particularly event category and event label.  For more information, see [Google Analytics 4 Custom dimensions and metrics](https://support.google.com/analytics/answer/10075209){:target='_blank'}.
 
 #### Tracking Active Users and Sessions
+
+##### Server-side Implementation using Google Analytics 4 Destination
+
 The Google Analytics 4 reports only display active users who engage with your site for a non-zero amount of time. To ensure users are rendered in reports, Segment sets the `engagement_time_msec` parameter to 1 by default. If you track engagement time on your Segment events, you can use the **Engagement Time in Milliseconds** field mapping to set `engagement_time_msec` to a different value.
 
-If you choose to integrate with Google Analytics 4 client-side (using Gtag outside of Segment) _and_ also use Segment's Google Analytics 4 destination to send events through the API, you can track sessions server-side. When using Gtag, [Google generates a `session_id` and `session_number` when a session begins](https://support.google.com/analytics/answer/9191807?hl=en){:target='_blank'}. The `session_id` and `session_number` generated on the client can be passed as Event Parameters to stitch events sent through the API with the same session that was collected client-side.
+Besides Engagement Time in Milliseconds, you can also generate your own `session_id` and `session_number` and pass them as event properties to Segment. These properties can then be mapped to their corresponding parameters in Segment's Google Analytics 4 destination.
+
+> info "Session tracking limitations"
+> Session tracking server-side only supports a subset of user dimensions. Certain reserved fields such as location, demographics, other [predefined user dimensions](https://support.google.com/analytics/answer/9268042?hl=en&ref_topic=11151952){:target='_blank'} and device-specific information are not supported by Google's Measurement Protocol API.
+
+##### Using Gtag.js and Google Analytics 4 Destination
+
+If you choose to integrate with Google Analytics 4 client-side (using Gtag outside of Segment) _and_ also use Segment's Google Analytics 4 destination to send events through the API, you will have all the reserved parameters and sessions tracking information available in Google Analytics 4 reports.
+
+When using Gtag, [Google generates a `session_id` and `session_number` when a session begins](https://support.google.com/analytics/answer/9191807?hl=en){:target='_blank'}. The `session_id` and `session_number` generated on the client can be passed as Event Parameters to stitch events sent through the API with the same session that was collected client-side. For events to stitch properly, server-side events must arrive within a 48 hour window of when the client-side events arrive.
 
 You can check your `session_id` and `session_number` with the [Google Site Tag function](https://developers.google.com/tag-platform/gtagjs/reference){:target='_blank'} or by running this script in your JavaScript console and replacing `G-xxxxxxxxxx` with your Google Analytics 4 Measurement ID:
 
 ```java
-const sessionIdPromise = new Promise(resolve => {
-  gtag('get', 'G-xxxxxxxxxx', 'session_id', resolve)
+const sessionIdPromise =  new  Promise(resolve => {
+	gtag('get', 'G-xxxxxxxxxx', 'session_id', resolve)
 });
-const sessionNumPromise = new Promise(resolve => {
-  gtag('get', 'G-xxxxxxxxxx', 'session_number', resolve)
+const sessionNumPromise =  new  Promise(resolve => {
+	gtag('get', 'G-xxxxxxxxxx', 'session_number', resolve)
 });
 
 Promise.all([sessionIdPromise, sessionNumPromise]).then(function(session_data) {
-  console.log("session ID: "+session_data[0]);
-  console.log("session Number: "+session_data[1]);
+	console.log("session ID: "+session_data[0]);
+	console.log("session Number: "+session_data[1]);
 });
 ```
 
-> info "Session tracking limitations"
-> Session tracking server-side only works if you're also sending data to Google Analytics 4 client-side. This is because the `session_id` must match a value that was previously collected on the client. For events to stitch properly, they must arrive within a 48 hour window of when the client-side events arrived.
->
-> Google doesn't currently support passing other reserved fields, such as [predefined user dimensions](https://support.google.com/analytics/answer/9268042?hl=en&ref_topic=11151952){:target='_blank'} or device-specific information, to the Measurement Protocol API.
-
 #### User Identification
 Segment requires a Client ID to send data to Google Analytics 4. The Client ID is the web equivalent of a device identifier and uniquely identifies a given user instance of a web client. By default, Segment sets Client ID to the Segment `userId`, falling back on `anonymousId`. This mapping can be changed within each action if you prefer to map a different field to Client ID.
 
diff --git a/src/connections/destinations/catalog/actions-salesforce/index.md b/src/connections/destinations/catalog/actions-salesforce/index.md
@@ -103,3 +103,9 @@ To check how many API calls you have left in Salesforce, go to **Setup > Company
 When using the `create` operation, it's possible for duplicate records to be created in Salesforce. This is because Segment retries records once they hit the internal timeout. It's possible Salesforce's REST API eventually processes the original record in addition to the retried record, resulting in duplicates. You may encounter this behavior if Salesforce's REST API throttles your records (for example, due to hitting API limits or complex workflow automation). To prevent duplicates, you can use [Duplicate Rules](https://help.salesforce.com/s/articleView?id=duplicate_rules_map_of_reference.htm&language=en_US){:target="_blank"} in Salesforce. See set up information in [Resolve and Prevent Duplicate Data in Salesforce](https://trailhead.salesforce.com/content/learn/modules/sales_admin_duplicate_management/sales_admin_duplicate_management_unit_2){:target="_blank"}.
 
 Please note this is only a concern when using the `create` operation. You can use the `upsert` operation instead to avoid duplicates if `upsert` meets your needs.
+
+### How does Salesforce Bulk API work?
+When **Use Salesforce Bulk API** is enabled for your mapping, events are sent to [Salesforce’s Bulk API 2.0](https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/asynch_api_intro.htm){:target="_blank"} rather than their streaming REST API. If enabled, Segment will collect events into batches of 1000 before sending to Salesforce. Bulk support can be used for the `upsert` or `update` operations only.
+
+For bulk `update`, if a record in a batch is missing a Bulk Update Record ID, Segment will still send it to Salesforce. Salesforce will reject the individual record because it will be unable to find a record to update. Other records in the batch that are valid will still be processed. Please note that Segment's Event Delivery tab will show the entire batch as successful as Segment cannot currently break down Event Delivery stats into individual failed/passed events.
+
diff --git a/src/connections/destinations/catalog/google-ads-conversions/index.md b/src/connections/destinations/catalog/google-ads-conversions/index.md
@@ -0,0 +1,6 @@
+---
+title: 'Google Ads Conversions Destination'
+hidden: true
+id: 60ae8b97dcb6cc52d5d0d5ab
+published: false
+---
