fix merge conflct

yext · Feb 28, 2024 · f4c66a1 · f4c66a1
1 parent fd5a26d
commit f4c66a1
Showing 1 changed file with 7 additions and 16 deletions.
diff --git a/src/EventPayload.ts b/src/EventPayload.ts
@@ -106,20 +106,22 @@ export interface EventPayload {
    * or the value of the `ip` property if specified.
    */
   location?: Coordinates | string;
+  /** The URL of the page where the event occurred.
+   *
+   * If not specified the system will automatically
+   * use the `Referrer` header from the autogenerated request headers.
+   */
   /** Fields specific to reporting Yext Pages Analytics Events */
   pages?: {
     /** The scope of an action. Applies to Pages events. */
     scope?: string;
+    /** The Event name as it was used in previous analytics implementations. */
+    originalEventName?: string;
     /* The UID of the site an event was tied to. */
     siteUid?: number;
     /* The ID of the template from which a site was generated. */
     template?: string;
   };
-  /** The URL of the page where the event occurred.
-   *
-   * If not specified the system will automatically
-   * use the `Referrer` header from the autogenerated request headers.
-   */
   pageUrl?: string;
   /** The URL of the page which the visitor came from prior to the event.
    *
@@ -148,17 +150,6 @@ export interface EventPayload {
   searchTerm?: string;
   /** Unique identifier to tie together events in a single browsing session */
   sessionId?: string | null;
-  /** Fields specific to reporting Yext Pages Analytics Events */
-  pages?: {
-    /** The scope of an action. Applies to Pages events. */
-    scope?: string;
-    /** The Event name as it was used in previous analytics implementations. */
-    originalEventName?: string;
-    /* The UID of the site an event was tied to. */
-    siteUid?: number;
-    /* The ID of the template from which a site was generated. */
-    template?: string;
-  };
   /** The timestamp at which the event occurred, in ISO format.
    * For example, September 27, 2022 at 6 p.m. is represented as
    * 2022-09-27 18:00:00.000.