From 288a7cc3a668d363092cfbb775371a03470e08b1 Mon Sep 17 00:00:00 2001
From: Jacob Bare <jacob@parameter1.com>
Date: Wed, 3 Mar 2021 15:32:40 -0600
Subject: [PATCH 1/4] Move P1 leaders tracking into leaders

No longer need to use an emitter either
---
 .../browser/click-emitter.vue                 | 50 -------------------
 packages/marko-web-leaders/browser/index.js   |  8 ++-
 .../browser/p1events-tracker.vue}             |  3 +-
 .../components/click-emitter.marko            |  1 -
 .../marko-web-leaders/components/marko.json   |  6 +--
 .../components/p1events-tracker.marko         |  1 +
 packages/marko-web-leaders/package.json       |  1 -
 .../marko-web-leaders/utils/event-attrs.js    |  8 ---
 .../utils/event-link-attrs.js                 | 16 ------
 .../marko-web-p1-events/browser/.eslintrc.js  | 21 --------
 packages/marko-web-p1-events/browser/index.js |  6 ---
 .../marko-web-p1-events/components/marko.json |  5 --
 .../components/track-leaders.marko            | 11 ----
 yarn.lock                                     |  5 --
 14 files changed, 9 insertions(+), 133 deletions(-)
 delete mode 100644 packages/marko-web-leaders/browser/click-emitter.vue
 rename packages/{marko-web-p1-events/browser/track-leaders.vue => marko-web-leaders/browser/p1events-tracker.vue} (95%)
 delete mode 100644 packages/marko-web-leaders/components/click-emitter.marko
 create mode 100644 packages/marko-web-leaders/components/p1events-tracker.marko
 delete mode 100644 packages/marko-web-leaders/utils/event-attrs.js
 delete mode 100644 packages/marko-web-leaders/utils/event-link-attrs.js
 delete mode 100644 packages/marko-web-p1-events/browser/.eslintrc.js
 delete mode 100644 packages/marko-web-p1-events/browser/index.js
 delete mode 100644 packages/marko-web-p1-events/components/track-leaders.marko

diff --git a/packages/marko-web-leaders/browser/click-emitter.vue b/packages/marko-web-leaders/browser/click-emitter.vue
deleted file mode 100644
index 553c4b69b..000000000
--- a/packages/marko-web-leaders/browser/click-emitter.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-  <div class="marko-web-leaders-click-emitter" style="display: none;" />
-</template>
-
-<script>
-import { delegate } from 'dom-utils';
-
-export default {
-  data: () => ({
-    listener: null,
-  }),
-
-  created() {
-    this.listener = delegate(
-      document,
-      'click',
-      'a[data-leaders-action]',
-      this.emit.bind(this),
-    );
-  },
-
-  beforeDestroy() {
-    if (this.listener) this.listener.destroy();
-  },
-
-  methods: {
-    emit(_, link) {
-      const event = {
-        type: link.getAttribute('data-leaders-action'),
-        category: link.getAttribute('data-leaders-category'),
-        label: link.getAttribute('data-leaders-label'),
-      };
-
-      const payload = {
-        ...this.parseJSON(link.getAttribute('data-leaders-payload')),
-        href: link.getAttribute('href'),
-      };
-      this.$emit('action', event, payload);
-    },
-
-    parseJSON(value) {
-      try {
-        return JSON.parse(value) || {};
-      } catch (e) {
-        return {};
-      }
-    },
-  },
-};
-</script>
diff --git a/packages/marko-web-leaders/browser/index.js b/packages/marko-web-leaders/browser/index.js
index 6df79cd27..70117ac1a 100644
--- a/packages/marko-web-leaders/browser/index.js
+++ b/packages/marko-web-leaders/browser/index.js
@@ -1,13 +1,14 @@
 const LeadersProgram = () => import(/* webpackChunkName: "leaders-program" */ '@parameter1/base-cms-leaders-program');
-const LeadersClickEmitter = () => import(/* webpackChunkName: "leaders-click-emitter" */ './click-emitter.vue');
 const LeadersCompanyWebsiteLink = () => import(/* webpackChunkName: "leaders-company-website-link" */ './company-website-link.vue');
 const LeadersCompanySocialLink = () => import(/* webpackChunkName: "leaders-company-social-link" */ './company-social-link.vue');
 const LeadersGTMTracker = () => import(/* webpackChunkName: "leaders-gtm-tracker" */ './gtm-tracker.vue');
+const LeadersP1EventsTracker = () => import(/* webpackChunkName: "leaders-p1-event-tracker" */ './p1events-tracker.vue');
 
 
-export default (Browser, { withGTM = true } = {}) => {
+export default (Browser, { withGTM = true, withP1Events = true } = {}) => {
   const { EventBus } = Browser;
   if (withGTM) Browser.register('LeadersGTMTracker', LeadersGTMTracker, { provide: { EventBus } });
+  if (withP1Events) Browser.register('LeadersP1EventsTracker', LeadersP1EventsTracker, { provide: { EventBus } });
   Browser.register('LeadersProgram', LeadersProgram, {
     withApollo: true,
     on: { action: (...args) => EventBus.$emit('leaders-action', ...args) },
@@ -18,7 +19,4 @@ export default (Browser, { withGTM = true } = {}) => {
   Browser.register('LeadersCompanySocialLink', LeadersCompanySocialLink, {
     on: { action: (...args) => EventBus.$emit('leaders-action', ...args) },
   });
-  Browser.register('LeadersClickEmitter', LeadersClickEmitter, {
-    on: { action: (...args) => EventBus.$emit('leaders-action', ...args) },
-  });
 };
diff --git a/packages/marko-web-p1-events/browser/track-leaders.vue b/packages/marko-web-leaders/browser/p1events-tracker.vue
similarity index 95%
rename from packages/marko-web-p1-events/browser/track-leaders.vue
rename to packages/marko-web-leaders/browser/p1events-tracker.vue
index 60939bca8..6f564b4e0 100644
--- a/packages/marko-web-p1-events/browser/track-leaders.vue
+++ b/packages/marko-web-leaders/browser/p1events-tracker.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="p1-events-track-leaders" />
+  <div class="marko-web-leaders-p1events-tracker" style="display: none;" />
 </template>
 
 <script>
@@ -60,6 +60,7 @@ export default {
         const matches = /^Company Social - (.+)$/.exec(label);
         queue.push({
           ...baseEvent,
+          category: 'Company Profile Page',
           ...(matches && { label: 'Company Social Link' }),
           action: 'Click',
           entity: { id: payload.companyId, ns: this.ns('content-company') },
diff --git a/packages/marko-web-leaders/components/click-emitter.marko b/packages/marko-web-leaders/components/click-emitter.marko
deleted file mode 100644
index 7f928f1f0..000000000
--- a/packages/marko-web-leaders/components/click-emitter.marko
+++ /dev/null
@@ -1 +0,0 @@
-<marko-web-browser-component name="LeadersClickEmitter" />
diff --git a/packages/marko-web-leaders/components/marko.json b/packages/marko-web-leaders/components/marko.json
index 20d253901..5d31f866f 100644
--- a/packages/marko-web-leaders/components/marko.json
+++ b/packages/marko-web-leaders/components/marko.json
@@ -2,9 +2,6 @@
   "<marko-web-leaders>": {
     "template": "./index.marko"
   },
-  "<marko-web-leaders-click-emitter>": {
-    "template": "./click-emitter.marko"
-  },
   "<marko-web-leaders-company-social-link>": {
     "template": "./company-social-link.marko",
     "@company": "object",
@@ -19,5 +16,8 @@
   },
   "<marko-web-leaders-gtm-tracker>": {
     "template": "./gtm-tracker.marko"
+  },
+  "<marko-web-leaders-p1events-tracker>": {
+    "template": "./p1events-tracker.marko"
   }
 }
diff --git a/packages/marko-web-leaders/components/p1events-tracker.marko b/packages/marko-web-leaders/components/p1events-tracker.marko
new file mode 100644
index 000000000..01530e4d8
--- /dev/null
+++ b/packages/marko-web-leaders/components/p1events-tracker.marko
@@ -0,0 +1 @@
+<marko-web-browser-component name="LeadersP1EventsTracker" props={ baseTenantKey: process.env.TENANT_KEY } />
diff --git a/packages/marko-web-leaders/package.json b/packages/marko-web-leaders/package.json
index ec756ddf3..bd1ee093a 100644
--- a/packages/marko-web-leaders/package.json
+++ b/packages/marko-web-leaders/package.json
@@ -16,7 +16,6 @@
     "@parameter1/base-cms-leaders-program": "^2.5.0",
     "@parameter1/base-cms-marko-web-icons": "^2.0.0",
     "@parameter1/base-cms-object-path": "^2.5.0",
-    "dom-utils": "^0.9.0",
     "graphql": "^14.7.0",
     "graphql-tag": "^2.11.0",
     "object-path": "^0.11.5"
diff --git a/packages/marko-web-leaders/utils/event-attrs.js b/packages/marko-web-leaders/utils/event-attrs.js
deleted file mode 100644
index 9f87c1520..000000000
--- a/packages/marko-web-leaders/utils/event-attrs.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = (params = {}) => {
-  const keys = ['action', 'category', 'label', 'payload'];
-  return keys.reduce((o, key) => {
-    const value = key === 'payload' ? JSON.stringify(params[key]) : params[key];
-    if (!value) return o;
-    return { ...o, [`data-leaders-${key}`]: value };
-  }, {});
-};
diff --git a/packages/marko-web-leaders/utils/event-link-attrs.js b/packages/marko-web-leaders/utils/event-link-attrs.js
deleted file mode 100644
index b8c9d52a9..000000000
--- a/packages/marko-web-leaders/utils/event-link-attrs.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const leadersAttrs = require('./event-attrs');
-
-module.exports = ({
-  category,
-  label,
-  companyId,
-  linkAttrs,
-} = {}) => ({
-  ...linkAttrs,
-  ...leadersAttrs({
-    action: 'click',
-    category,
-    label,
-    payload: { companyId },
-  }),
-});
diff --git a/packages/marko-web-p1-events/browser/.eslintrc.js b/packages/marko-web-p1-events/browser/.eslintrc.js
deleted file mode 100644
index 2eb0b8d9c..000000000
--- a/packages/marko-web-p1-events/browser/.eslintrc.js
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = {
-  extends: [
-    'airbnb-base',
-    'plugin:vue/recommended',
-  ],
-  env: {
-    browser: true,
-  },
-  rules: {
-    'vue/max-attributes-per-line': ['error', {
-      singleline: 3,
-      multiline: {
-        max: 1,
-        allowFirstLine: false,
-      },
-    }],
-  },
-  parserOptions: {
-    parser: 'babel-eslint',
-  },
-};
diff --git a/packages/marko-web-p1-events/browser/index.js b/packages/marko-web-p1-events/browser/index.js
deleted file mode 100644
index 80872aabf..000000000
--- a/packages/marko-web-p1-events/browser/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const TrackLeaders = () => import(/* webpackChunkName: "p1-events-track-leaders" */ './track-leaders.vue');
-
-export default (Browser, { withLeaders = true } = {}) => {
-  const { EventBus } = Browser;
-  if (withLeaders) Browser.register('P1EventsTrackLeaders', TrackLeaders, { provide: { EventBus } });
-};
diff --git a/packages/marko-web-p1-events/components/marko.json b/packages/marko-web-p1-events/components/marko.json
index 7f65075a5..f4f9a7d0a 100644
--- a/packages/marko-web-p1-events/components/marko.json
+++ b/packages/marko-web-p1-events/components/marko.json
@@ -9,11 +9,6 @@
     "template": "./track-content.marko",
     "@node": "object"
   },
-  "<marko-web-p1-events-track-leaders>": {
-    "template": "./track-leaders.marko",
-    "@base-tenant-key": "string",
-    "@event-name": "string"
-  },
   "<marko-web-p1-events-track-website-section>": {
     "template": "./track-website-section.marko",
     "@node": "object"
diff --git a/packages/marko-web-p1-events/components/track-leaders.marko b/packages/marko-web-p1-events/components/track-leaders.marko
deleted file mode 100644
index 1916c4752..000000000
--- a/packages/marko-web-p1-events/components/track-leaders.marko
+++ /dev/null
@@ -1,11 +0,0 @@
-import defaultValue from "@parameter1/base-cms-marko-core/utils/default-value";
-
-$ const { site } = out.global;
-$ const config = site.getAsObject("p1events");
-
-$ const baseTenantKey = defaultValue(input.baseTenantKey, process.env.TENANT_KEY);
-$ const props = { baseTenantKey, eventName: input.eventName };
-
-<if(config.enabled)>
-  <marko-web-browser-component name="P1EventsTrackLeaders" props=props />
-</if>
diff --git a/yarn.lock b/yarn.lock
index d0d8e2a23..c7ec340a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6733,11 +6733,6 @@ dom-serializer@^1.0.1, dom-serializer@~1.2.0:
     domhandler "^4.0.0"
     entities "^2.0.0"
 
-dom-utils@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/dom-utils/-/dom-utils-0.9.0.tgz#e615a5af15ac4505e55ef612c72b5b5d176121f3"
-  integrity sha1-5hWlrxWsRQXlXvYSxytbXRdhIfM=
-
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"

From 05bb1a3dc3f8286230651616d3ecc51d004e64bb Mon Sep 17 00:00:00 2001
From: Jacob Bare <jacob@parameter1.com>
Date: Wed, 3 Mar 2021 15:32:57 -0600
Subject: [PATCH 2/4] Update P1 events script version

---
 packages/marko-web-p1-events/components/init.marko | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/marko-web-p1-events/components/init.marko b/packages/marko-web-p1-events/components/init.marko
index cf85b7a87..1bcdcc7d1 100644
--- a/packages/marko-web-p1-events/components/init.marko
+++ b/packages/marko-web-p1-events/components/init.marko
@@ -5,7 +5,7 @@ $ const { enabled, tenant, cookieDomain } = site.getAsObject("p1events");
 $ const realm = core.website("id");
 $ const { NODE_ENV } = process.env;
 
-$ const scriptSrc = defaultValue(input.scriptSrc, "https://de3t5rrdmy18m.cloudfront.net/p1-events.b47b524e.js");
+$ const scriptSrc = defaultValue(input.scriptSrc, "https://de3t5rrdmy18m.cloudfront.net/p1-events.1ed2a30f.js");
 $ const uri = defaultValue(input.uri, "https://db0y8smio0.execute-api.us-east-2.amazonaws.com/default/p1-website-events-enqueue");
 $ const identityQueryBuilder = `
   identityQueryBuilder: function(query) {

From e0936af6efbb9edd454dce0ac351ac91c3e3f46f Mon Sep 17 00:00:00 2001
From: Jacob Bare <jacob@parameter1.com>
Date: Wed, 3 Mar 2021 15:33:12 -0600
Subject: [PATCH 3/4] Create P1 link tracking and entity utils

---
 packages/marko-web-p1-events/package.json             |  1 +
 .../marko-web-p1-events/utils/base-content-entity.js  |  4 ++++
 packages/marko-web-p1-events/utils/base-entity.js     |  4 ++++
 packages/marko-web-p1-events/utils/link-attrs.js      | 11 +++++++++++
 4 files changed, 20 insertions(+)
 create mode 100644 packages/marko-web-p1-events/utils/base-content-entity.js
 create mode 100644 packages/marko-web-p1-events/utils/base-entity.js
 create mode 100644 packages/marko-web-p1-events/utils/link-attrs.js

diff --git a/packages/marko-web-p1-events/package.json b/packages/marko-web-p1-events/package.json
index deef90716..7481848d3 100644
--- a/packages/marko-web-p1-events/package.json
+++ b/packages/marko-web-p1-events/package.json
@@ -11,6 +11,7 @@
     "test": "yarn compile && yarn lint"
   },
   "dependencies": {
+    "@parameter1/base-cms-inflector": "^2.0.0",
     "@parameter1/base-cms-object-path": "^2.5.0"
   },
   "peerDependencies": {
diff --git a/packages/marko-web-p1-events/utils/base-content-entity.js b/packages/marko-web-p1-events/utils/base-content-entity.js
new file mode 100644
index 000000000..4dab278ed
--- /dev/null
+++ b/packages/marko-web-p1-events/utils/base-content-entity.js
@@ -0,0 +1,4 @@
+const { dasherize } = require('@parameter1/base-cms-inflector');
+const entity = require('./base-entity');
+
+module.exports = (id, type) => entity(id, `content-${dasherize(type)}`);
diff --git a/packages/marko-web-p1-events/utils/base-entity.js b/packages/marko-web-p1-events/utils/base-entity.js
new file mode 100644
index 000000000..d1b6022da
--- /dev/null
+++ b/packages/marko-web-p1-events/utils/base-entity.js
@@ -0,0 +1,4 @@
+const { dasherize } = require('@parameter1/base-cms-inflector');
+const ns = require('./create-namespace');
+
+module.exports = (id, type) => `${ns(dasherize(type))}*${id}`;
diff --git a/packages/marko-web-p1-events/utils/link-attrs.js b/packages/marko-web-p1-events/utils/link-attrs.js
new file mode 100644
index 000000000..6cdc63b0e
--- /dev/null
+++ b/packages/marko-web-p1-events/utils/link-attrs.js
@@ -0,0 +1,11 @@
+const PREFIX = 'data-p1';
+
+module.exports = (params = {}) => {
+  const keys = ['action', 'category', 'label', 'entity', 'context', 'props'];
+  return keys.reduce((o, key) => {
+    let value = key === 'props' ? JSON.stringify(params[key]) : params[key];
+    if (key === 'action' && !value) value = 'Click'; // assume click when not set
+    if (!value) return o;
+    return { ...o, [`${PREFIX}-${key}`]: value };
+  }, {});
+};

From c04d10e70ddace6ea38b7ae80046a9693f9bc1e2 Mon Sep 17 00:00:00 2001
From: Jacob Bare <jacob@parameter1.com>
Date: Wed, 3 Mar 2021 15:33:30 -0600
Subject: [PATCH 4/4] Pass link attributes to social icons

---
 .../components/content/contact-details/index.marko        | 2 ++
 .../components/content/contact-details/marko.json         | 3 ++-
 .../components/social/icon-link.marko                     | 8 +++++++-
 .../marko-web-theme-default/components/social/marko.json  | 3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/marko-web-theme-default/components/content/contact-details/index.marko b/packages/marko-web-theme-default/components/content/contact-details/index.marko
index 3f24e64ad..15bc826b8 100644
--- a/packages/marko-web-theme-default/components/content/contact-details/index.marko
+++ b/packages/marko-web-theme-default/components/content/contact-details/index.marko
@@ -17,6 +17,7 @@ $ if (showEmail) fields.push("publicEmail");
 $ const showFields = fields.some(k => content[k]);
 
 $ const websiteLinkAttrs = getAsObject(input, "websiteLinkAttrs");
+$ const socialLinkAttrs = getAsObject(input, "socialLinkAttrs");
 
 <default-theme-page-contact-details|{ blockName }|
   tag=input.tag
@@ -53,6 +54,7 @@ $ const websiteLinkAttrs = getAsObject(input, "websiteLinkAttrs");
           provider=item.provider
           href=item.url
           modifiers=["dark", "lg"]
+          attrs=socialLinkAttrs
         />
       </for>
     </default-theme-content-contact-details-section>
diff --git a/packages/marko-web-theme-default/components/content/contact-details/marko.json b/packages/marko-web-theme-default/components/content/contact-details/marko.json
index 2e7e1ba03..0067368c4 100644
--- a/packages/marko-web-theme-default/components/content/contact-details/marko.json
+++ b/packages/marko-web-theme-default/components/content/contact-details/marko.json
@@ -13,7 +13,8 @@
     "@class": "string",
     "@modifiers": "array",
     "@attrs": "object",
-    "@website-link-attrs": "object"
+    "@website-link-attrs": "object",
+    "@social-link-attrs": "object"
   },
   "<default-theme-content-contact-details-section>": {
     "template": "./section.marko",
diff --git a/packages/marko-web-theme-default/components/social/icon-link.marko b/packages/marko-web-theme-default/components/social/icon-link.marko
index 8396d5391..8b7d739c9 100644
--- a/packages/marko-web-theme-default/components/social/icon-link.marko
+++ b/packages/marko-web-theme-default/components/social/icon-link.marko
@@ -10,7 +10,13 @@ $ const name = label || provider;
 $ const title = name ? `Visit us on ${name.charAt(0).toUpperCase()}${name.slice(1)}` : null;
 
 <if(formatted && input.href)>
-  <marko-web-link class=classNames href=input.href target=input.target title=title>
+  <marko-web-link
+    class=classNames
+    href=input.href
+    target=input.target
+    title=title
+    attrs=input.attrs
+  >
     <marko-web-icon name=provider modifiers=input.modifiers />
   </marko-web-link>
 </if>
diff --git a/packages/marko-web-theme-default/components/social/marko.json b/packages/marko-web-theme-default/components/social/marko.json
index f9c90959b..879af2be3 100644
--- a/packages/marko-web-theme-default/components/social/marko.json
+++ b/packages/marko-web-theme-default/components/social/marko.json
@@ -6,7 +6,8 @@
     "@href": "string",
     "@target": "string",
     "@modifiers": "array",
-    "@class": "string"
+    "@class": "string",
+    "@attrs": "object"
   },
   "<default-theme-social-icons>": {
     "template": "./icons.marko"