Merge pull request #801 from brandonbk/nx-story-track

Add tenantKey to native-x config
parameter1 · Sep 26, 2023 · e3422f2 · e3422f2
2 parents 5e30a1d + 104937e
commit e3422f2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/packages/marko-web-native-x/config.js b/packages/marko-web-native-x/config.js
@@ -10,11 +10,12 @@ class NativeXConfiguration {
    * @param {boolean} [params.enabled=true]
    * @param {string} [params.defaultAlias=default]
    */
-  constructor(uri, { enabled = true, defaultAlias = 'default' } = {}) {
+  constructor(uri, { enabled = true, defaultAlias = 'default', tenantKey } = {}) {
     if (!uri) throw new Error('Unable to configure NativeX: no URI was provided.');
     this.uri = uri;
     this.enabled = enabled;
     this.defaultAlias = defaultAlias;
+    this.tenantKey = tenantKey;
 
     this.client = createClient(this.getGraphQLUri());
     this.placements = {};
@@ -76,6 +77,18 @@ class NativeXConfiguration {
   isEnabled() {
     return this.enabled;
   }
+
+  getTenantKey() {
+    const { tenantKey } = this;
+    if (tenantKey) return tenantKey;
+    const [, key] = this.uri.match(/\/\/(\w+)\.native-x/i);
+    return key;
+  }
+
+  getEntityFor(type) {
+    const tenantKey = this.getTenantKey();
+    return `native-x.${tenantKey}.${type}`;
+  }
 }
 
 module.exports = NativeXConfiguration;
diff --git a/packages/marko-web-p1-events/components/track-native-story.marko b/packages/marko-web-p1-events/components/track-native-story.marko
@@ -3,25 +3,22 @@ import { get } from "@parameter1/base-cms-object-path";
 $ const { site } = out.global;
 $ const { story } = input;
 $ const config = site.getAsObject("p1events");
-$ const ns = (type) => {
-  const [,tenantKey] = site.get('nativeX.uri').match(/\/\/(\w+)\.native-x/i);
-  return `native-x.${tenantKey}.${type}`;
-};
+$ const nxConfig = site.get("nativeX");
 
-<if(config.enabled)>
+<if(config.enabled && nxConfig && nxConfig.enabled)>
   $ const { advertiser } = story;
   $ const entity = {
     id: story.id,
-    ns: ns(`story`),
+    ns: nxConfig.getEntityFor("story"),
     name: story.title,
-    props: { type: 'story', published: get(story, 'publishedAt') },
+    props: { type: "story", published: get(story, "publishedAt") },
     ...(advertiser && advertiser.id && {
-      refs: { advertiser: { id: advertiser.id, ns: ns("advertiser"), name: advertiser.name } },
+      refs: { advertiser: { id: advertiser.id, ns: nxConfig.getEntityFor("advertiser"), name: advertiser.name } },
     }),
   };
   $ const data = {
-    action: 'View',
-    category: 'Content',
+    action: "View",
+    category: "Content",
     entity,
   };
   <script>